diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/AddGrantForm.java b/ccm-portalworkspace/doc/unused/admin-ui/AddGrantForm.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/AddGrantForm.java
rename to ccm-portalworkspace/doc/unused/admin-ui/AddGrantForm.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ErrorMessageDisplay.java b/ccm-portalworkspace/doc/unused/admin-ui/ErrorMessageDisplay.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ErrorMessageDisplay.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ErrorMessageDisplay.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/Grant.java b/ccm-portalworkspace/doc/unused/admin-ui/Grant.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/Grant.java
rename to ccm-portalworkspace/doc/unused/admin-ui/Grant.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/GrantsTable.java b/ccm-portalworkspace/doc/unused/admin-ui/GrantsTable.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/GrantsTable.java
rename to ccm-portalworkspace/doc/unused/admin-ui/GrantsTable.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/Icons.java b/ccm-portalworkspace/doc/unused/admin-ui/Icons.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/Icons.java
rename to ccm-portalworkspace/doc/unused/admin-ui/Icons.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantBrowsePane.java b/ccm-portalworkspace/doc/unused/admin-ui/ParticipantBrowsePane.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantBrowsePane.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ParticipantBrowsePane.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantDisplay.java b/ccm-portalworkspace/doc/unused/admin-ui/ParticipantDisplay.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantDisplay.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ParticipantDisplay.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantEdit.java b/ccm-portalworkspace/doc/unused/admin-ui/ParticipantEdit.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantEdit.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ParticipantEdit.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantListModel.java b/ccm-portalworkspace/doc/unused/admin-ui/ParticipantListModel.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantListModel.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ParticipantListModel.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantModel.java b/ccm-portalworkspace/doc/unused/admin-ui/ParticipantModel.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/ParticipantModel.java
rename to ccm-portalworkspace/doc/unused/admin-ui/ParticipantModel.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/PartyPermissionEdit.java b/ccm-portalworkspace/doc/unused/admin-ui/PartyPermissionEdit.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/PartyPermissionEdit.java
rename to ccm-portalworkspace/doc/unused/admin-ui/PartyPermissionEdit.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/PeoplePane.java b/ccm-portalworkspace/doc/unused/admin-ui/PeoplePane.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/PeoplePane.java
rename to ccm-portalworkspace/doc/unused/admin-ui/PeoplePane.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/PrivilegeSingleSelect.java b/ccm-portalworkspace/doc/unused/admin-ui/PrivilegeSingleSelect.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/PrivilegeSingleSelect.java
rename to ccm-portalworkspace/doc/unused/admin-ui/PrivilegeSingleSelect.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/WorkspacePermissionsPane.java b/ccm-portalworkspace/doc/unused/admin-ui/WorkspacePermissionsPane.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/WorkspacePermissionsPane.java
rename to ccm-portalworkspace/doc/unused/admin-ui/WorkspacePermissionsPane.java
diff --git a/ccm-portalworkspace/doc/unsupported/admin-ui/edit.jsp b/ccm-portalworkspace/doc/unused/admin-ui/edit.jsp
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/admin-ui/edit.jsp
rename to ccm-portalworkspace/doc/unused/admin-ui/edit.jsp
diff --git a/ccm-portalworkspace/doc/unsupported/portlets/MyWorkspacesPortlet.java b/ccm-portalworkspace/doc/unused/portlets/MyWorkspacesPortlet.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/portlets/MyWorkspacesPortlet.java
rename to ccm-portalworkspace/doc/unused/portlets/MyWorkspacesPortlet.java
diff --git a/ccm-portalworkspace/doc/unsupported/portlets/README b/ccm-portalworkspace/doc/unused/portlets/README
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/portlets/README
rename to ccm-portalworkspace/doc/unused/portlets/README
diff --git a/ccm-portalworkspace/doc/unsupported/portlets/WorkspaceNavigatorPortlet.java b/ccm-portalworkspace/doc/unused/portlets/WorkspaceNavigatorPortlet.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/portlets/WorkspaceNavigatorPortlet.java
rename to ccm-portalworkspace/doc/unused/portlets/WorkspaceNavigatorPortlet.java
diff --git a/ccm-portalworkspace/doc/unsupported/portlets/WorkspaceSummaryPortlet.java b/ccm-portalworkspace/doc/unused/portlets/WorkspaceSummaryPortlet.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/portlets/WorkspaceSummaryPortlet.java
rename to ccm-portalworkspace/doc/unused/portlets/WorkspaceSummaryPortlet.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-generic/DefaultWorkspace.java b/ccm-portalworkspace/doc/unused/ui-generic/DefaultWorkspace.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-generic/DefaultWorkspace.java
rename to ccm-portalworkspace/doc/unused/ui-generic/DefaultWorkspace.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-generic/PackageWorkspace.java b/ccm-portalworkspace/doc/unused/ui-generic/PackageWorkspace.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-generic/PackageWorkspace.java
rename to ccm-portalworkspace/doc/unused/ui-generic/PackageWorkspace.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-generic/UserWorkspace.java b/ccm-portalworkspace/doc/unused/ui-generic/UserWorkspace.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-generic/UserWorkspace.java
rename to ccm-portalworkspace/doc/unused/ui-generic/UserWorkspace.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-generic/WorkspaceComponent.java b/ccm-portalworkspace/doc/unused/ui-generic/WorkspaceComponent.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-generic/WorkspaceComponent.java
rename to ccm-portalworkspace/doc/unused/ui-generic/WorkspaceComponent.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-theme/ColorPicker.java b/ccm-portalworkspace/doc/unused/ui-theme/ColorPicker.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-theme/ColorPicker.java
rename to ccm-portalworkspace/doc/unused/ui-theme/ColorPicker.java
diff --git a/ccm-portalworkspace/doc/unused/ui-theme/README b/ccm-portalworkspace/doc/unused/ui-theme/README
new file mode 100644
index 000000000..77b7fe12d
--- /dev/null
+++ b/ccm-portalworkspace/doc/unused/ui-theme/README
@@ -0,0 +1,2 @@
+Portalworkspace used to provide functionality for admins / users to modify 
+part of the theme. This is no longer desirable and removed with revision 2062hb.
diff --git a/ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceTheme.java b/ccm-portalworkspace/doc/unused/ui-theme/WorkspaceTheme.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceTheme.java
rename to ccm-portalworkspace/doc/unused/ui-theme/WorkspaceTheme.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceTheme.pdl b/ccm-portalworkspace/doc/unused/ui-theme/WorkspaceTheme.pdl
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceTheme.pdl
rename to ccm-portalworkspace/doc/unused/ui-theme/WorkspaceTheme.pdl
diff --git a/ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceThemeCollection.java b/ccm-portalworkspace/doc/unused/ui-theme/WorkspaceThemeCollection.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceThemeCollection.java
rename to ccm-portalworkspace/doc/unused/ui-theme/WorkspaceThemeCollection.java
diff --git a/ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceThemes.java b/ccm-portalworkspace/doc/unused/ui-theme/WorkspaceThemes.java
similarity index 100%
rename from ccm-portalworkspace/doc/unsupported/ui-theme/WorkspaceThemes.java
rename to ccm-portalworkspace/doc/unused/ui-theme/WorkspaceThemes.java
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/package.html b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/package.html
index 6a740029a..93b1126e0 100644
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/package.html
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/package.html
@@ -7,7 +7,7 @@
 
 <p>
     Classes to compose the PortalWorkspaceuser interface for 
-    their  visitors .
+    their  visitors.
 </p>
 
 <p>
@@ -26,14 +26,17 @@
 <p>
     The class WorkspaceViewer is the jsp's entry point in view
     mode for readers.
-</p>
 
-<p>
     The class WorkspaceEditor is the jsp's entry point for users
     permitted to style the portal page (add, delete, and modify
     portlets).
 </p>
 
+<p>
+    In either mode a subclass of WorkspaceSelectionAbstractModel
+    determines which workspace (instance of type portalworkspace)
+    is displayed.
+</p>
 <p>
     Package <code>com/arsdigita/portalworkspace/ui/admin</code>
     contains classes for additional administrative tasks (add and
diff --git a/ccm-portalworkspace/web/templates/ccm-portalworkspace/navigation/portal-categorized.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/navigation/portal-categorized.jsp
index 3d430c037..cd9013473 100644
--- a/ccm-portalworkspace/web/templates/ccm-portalworkspace/navigation/portal-categorized.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/navigation/portal-categorized.jsp
@@ -27,7 +27,7 @@
     <define:component name="categoryMenu"
       classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.portalworkspace.ui.jsp.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
       ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>