diff --git a/packages/component-app/README.md b/packages/components/packages/xpub-app/README.md
similarity index 100%
rename from packages/component-app/README.md
rename to packages/components/packages/xpub-app/README.md
diff --git a/packages/component-app/package.json b/packages/components/packages/xpub-app/package.json
similarity index 93%
rename from packages/component-app/package.json
rename to packages/components/packages/xpub-app/package.json
index c1b3ef6014307c8142f20232cb8adbd277d00339..678ea13b8f82b58fcbcd61a1bbe481b70f6e8523 100644
--- a/packages/component-app/package.json
+++ b/packages/components/packages/xpub-app/package.json
@@ -1,5 +1,5 @@
{
- "name": "pubsweet-component-xpub-app",
+ "name": "@pubsweet/xpub-app",
"version": "0.0.2",
"main": "src",
"author": "Collaborative Knowledge Foundation",
diff --git a/packages/component-app/src/components/App.js b/packages/components/packages/xpub-app/src/components/App.js
similarity index 100%
rename from packages/component-app/src/components/App.js
rename to packages/components/packages/xpub-app/src/components/App.js
diff --git a/packages/component-app/src/components/index.js b/packages/components/packages/xpub-app/src/components/index.js
similarity index 100%
rename from packages/component-app/src/components/index.js
rename to packages/components/packages/xpub-app/src/components/index.js
diff --git a/packages/component-app/src/index.js b/packages/components/packages/xpub-app/src/index.js
similarity index 100%
rename from packages/component-app/src/index.js
rename to packages/components/packages/xpub-app/src/index.js
diff --git a/packages/xpub-connect/README.md b/packages/components/packages/xpub-connect/README.md
similarity index 100%
rename from packages/xpub-connect/README.md
rename to packages/components/packages/xpub-connect/README.md
diff --git a/packages/xpub-connect/package.json b/packages/components/packages/xpub-connect/package.json
similarity index 100%
rename from packages/xpub-connect/package.json
rename to packages/components/packages/xpub-connect/package.json
diff --git a/packages/xpub-connect/src/components/ConnectPage.js b/packages/components/packages/xpub-connect/src/components/ConnectPage.js
similarity index 100%
rename from packages/xpub-connect/src/components/ConnectPage.js
rename to packages/components/packages/xpub-connect/src/components/ConnectPage.js
diff --git a/packages/xpub-connect/src/components/index.js b/packages/components/packages/xpub-connect/src/components/index.js
similarity index 100%
rename from packages/xpub-connect/src/components/index.js
rename to packages/components/packages/xpub-connect/src/components/index.js
diff --git a/packages/xpub-connect/src/index.js b/packages/components/packages/xpub-connect/src/index.js
similarity index 100%
rename from packages/xpub-connect/src/index.js
rename to packages/components/packages/xpub-connect/src/index.js
diff --git a/packages/component-dashboard/README.md b/packages/components/packages/xpub-dashboard/README.md
similarity index 100%
rename from packages/component-dashboard/README.md
rename to packages/components/packages/xpub-dashboard/README.md
diff --git a/packages/component-dashboard/package.json b/packages/components/packages/xpub-dashboard/package.json
similarity index 100%
rename from packages/component-dashboard/package.json
rename to packages/components/packages/xpub-dashboard/package.json
diff --git a/packages/component-dashboard/src/components/AssignEditor.js b/packages/components/packages/xpub-dashboard/src/components/AssignEditor.js
similarity index 100%
rename from packages/component-dashboard/src/components/AssignEditor.js
rename to packages/components/packages/xpub-dashboard/src/components/AssignEditor.js
diff --git a/packages/component-dashboard/src/components/AssignEditor.md b/packages/components/packages/xpub-dashboard/src/components/AssignEditor.md
similarity index 100%
rename from packages/component-dashboard/src/components/AssignEditor.md
rename to packages/components/packages/xpub-dashboard/src/components/AssignEditor.md
diff --git a/packages/component-dashboard/src/components/AssignEditorContainer.js b/packages/components/packages/xpub-dashboard/src/components/AssignEditorContainer.js
similarity index 100%
rename from packages/component-dashboard/src/components/AssignEditorContainer.js
rename to packages/components/packages/xpub-dashboard/src/components/AssignEditorContainer.js
diff --git a/packages/component-dashboard/src/components/Dashboard.js b/packages/components/packages/xpub-dashboard/src/components/Dashboard.js
similarity index 100%
rename from packages/component-dashboard/src/components/Dashboard.js
rename to packages/components/packages/xpub-dashboard/src/components/Dashboard.js
diff --git a/packages/component-dashboard/src/components/Dashboard.test.js b/packages/components/packages/xpub-dashboard/src/components/Dashboard.test.js
similarity index 100%
rename from packages/component-dashboard/src/components/Dashboard.test.js
rename to packages/components/packages/xpub-dashboard/src/components/Dashboard.test.js
diff --git a/packages/component-dashboard/src/components/DashboardPage.integration.test.js b/packages/components/packages/xpub-dashboard/src/components/DashboardPage.integration.test.js
similarity index 100%
rename from packages/component-dashboard/src/components/DashboardPage.integration.test.js
rename to packages/components/packages/xpub-dashboard/src/components/DashboardPage.integration.test.js
diff --git a/packages/component-dashboard/src/components/DashboardPage.js b/packages/components/packages/xpub-dashboard/src/components/DashboardPage.js
similarity index 100%
rename from packages/component-dashboard/src/components/DashboardPage.js
rename to packages/components/packages/xpub-dashboard/src/components/DashboardPage.js
diff --git a/packages/component-dashboard/src/components/ProjectLink.js b/packages/components/packages/xpub-dashboard/src/components/ProjectLink.js
similarity index 100%
rename from packages/component-dashboard/src/components/ProjectLink.js
rename to packages/components/packages/xpub-dashboard/src/components/ProjectLink.js
diff --git a/packages/component-dashboard/src/components/ProjectLink.md b/packages/components/packages/xpub-dashboard/src/components/ProjectLink.md
similarity index 100%
rename from packages/component-dashboard/src/components/ProjectLink.md
rename to packages/components/packages/xpub-dashboard/src/components/ProjectLink.md
diff --git a/packages/component-dashboard/src/components/Reviews.js b/packages/components/packages/xpub-dashboard/src/components/Reviews.js
similarity index 100%
rename from packages/component-dashboard/src/components/Reviews.js
rename to packages/components/packages/xpub-dashboard/src/components/Reviews.js
diff --git a/packages/component-dashboard/src/components/Status.js b/packages/components/packages/xpub-dashboard/src/components/Status.js
similarity index 100%
rename from packages/component-dashboard/src/components/Status.js
rename to packages/components/packages/xpub-dashboard/src/components/Status.js
diff --git a/packages/component-dashboard/src/components/UploadManuscript.js b/packages/components/packages/xpub-dashboard/src/components/UploadManuscript.js
similarity index 100%
rename from packages/component-dashboard/src/components/UploadManuscript.js
rename to packages/components/packages/xpub-dashboard/src/components/UploadManuscript.js
diff --git a/packages/component-dashboard/src/components/UploadManuscript.md b/packages/components/packages/xpub-dashboard/src/components/UploadManuscript.md
similarity index 100%
rename from packages/component-dashboard/src/components/UploadManuscript.md
rename to packages/components/packages/xpub-dashboard/src/components/UploadManuscript.md
diff --git a/packages/component-dashboard/src/components/index.js b/packages/components/packages/xpub-dashboard/src/components/index.js
similarity index 100%
rename from packages/component-dashboard/src/components/index.js
rename to packages/components/packages/xpub-dashboard/src/components/index.js
diff --git a/packages/component-dashboard/src/components/metadata/Meta.js b/packages/components/packages/xpub-dashboard/src/components/metadata/Meta.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/Meta.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/Meta.js
diff --git a/packages/component-dashboard/src/components/metadata/MetadataOwners.js b/packages/components/packages/xpub-dashboard/src/components/metadata/MetadataOwners.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/MetadataOwners.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/MetadataOwners.js
diff --git a/packages/component-dashboard/src/components/metadata/MetadataReviewType.js b/packages/components/packages/xpub-dashboard/src/components/metadata/MetadataReviewType.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/MetadataReviewType.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/MetadataReviewType.js
diff --git a/packages/component-dashboard/src/components/metadata/MetadataSections.js b/packages/components/packages/xpub-dashboard/src/components/metadata/MetadataSections.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/MetadataSections.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/MetadataSections.js
diff --git a/packages/component-dashboard/src/components/metadata/MetadataSubmittedDate.js b/packages/components/packages/xpub-dashboard/src/components/metadata/MetadataSubmittedDate.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/MetadataSubmittedDate.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/MetadataSubmittedDate.js
diff --git a/packages/component-dashboard/src/components/metadata/MetadataType.js b/packages/components/packages/xpub-dashboard/src/components/metadata/MetadataType.js
similarity index 100%
rename from packages/component-dashboard/src/components/metadata/MetadataType.js
rename to packages/components/packages/xpub-dashboard/src/components/metadata/MetadataType.js
diff --git a/packages/component-dashboard/src/components/molecules/Actions.js b/packages/components/packages/xpub-dashboard/src/components/molecules/Actions.js
similarity index 100%
rename from packages/component-dashboard/src/components/molecules/Actions.js
rename to packages/components/packages/xpub-dashboard/src/components/molecules/Actions.js
diff --git a/packages/component-dashboard/src/components/molecules/Item.js b/packages/components/packages/xpub-dashboard/src/components/molecules/Item.js
similarity index 100%
rename from packages/component-dashboard/src/components/molecules/Item.js
rename to packages/components/packages/xpub-dashboard/src/components/molecules/Item.js
diff --git a/packages/component-dashboard/src/components/molecules/Links.js b/packages/components/packages/xpub-dashboard/src/components/molecules/Links.js
similarity index 100%
rename from packages/component-dashboard/src/components/molecules/Links.js
rename to packages/components/packages/xpub-dashboard/src/components/molecules/Links.js
diff --git a/packages/component-dashboard/src/components/molecules/Page.js b/packages/components/packages/xpub-dashboard/src/components/molecules/Page.js
similarity index 100%
rename from packages/component-dashboard/src/components/molecules/Page.js
rename to packages/components/packages/xpub-dashboard/src/components/molecules/Page.js
diff --git a/packages/component-dashboard/src/components/molecules/Roles.js b/packages/components/packages/xpub-dashboard/src/components/molecules/Roles.js
similarity index 100%
rename from packages/component-dashboard/src/components/molecules/Roles.js
rename to packages/components/packages/xpub-dashboard/src/components/molecules/Roles.js
diff --git a/packages/component-dashboard/src/components/sections/EditorItem.js b/packages/components/packages/xpub-dashboard/src/components/sections/EditorItem.js
similarity index 100%
rename from packages/component-dashboard/src/components/sections/EditorItem.js
rename to packages/components/packages/xpub-dashboard/src/components/sections/EditorItem.js
diff --git a/packages/component-dashboard/src/components/sections/EditorItem.md b/packages/components/packages/xpub-dashboard/src/components/sections/EditorItem.md
similarity index 100%
rename from packages/component-dashboard/src/components/sections/EditorItem.md
rename to packages/components/packages/xpub-dashboard/src/components/sections/EditorItem.md
diff --git a/packages/component-dashboard/src/components/sections/OwnerItem.js b/packages/components/packages/xpub-dashboard/src/components/sections/OwnerItem.js
similarity index 100%
rename from packages/component-dashboard/src/components/sections/OwnerItem.js
rename to packages/components/packages/xpub-dashboard/src/components/sections/OwnerItem.js
diff --git a/packages/component-dashboard/src/components/sections/OwnerItem.md b/packages/components/packages/xpub-dashboard/src/components/sections/OwnerItem.md
similarity index 100%
rename from packages/component-dashboard/src/components/sections/OwnerItem.md
rename to packages/components/packages/xpub-dashboard/src/components/sections/OwnerItem.md
diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.js b/packages/components/packages/xpub-dashboard/src/components/sections/ReviewerItem.js
similarity index 100%
rename from packages/component-dashboard/src/components/sections/ReviewerItem.js
rename to packages/components/packages/xpub-dashboard/src/components/sections/ReviewerItem.js
diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.md b/packages/components/packages/xpub-dashboard/src/components/sections/ReviewerItem.md
similarity index 100%
rename from packages/component-dashboard/src/components/sections/ReviewerItem.md
rename to packages/components/packages/xpub-dashboard/src/components/sections/ReviewerItem.md
diff --git a/packages/component-dashboard/src/components/sections/VersionTitle.js b/packages/components/packages/xpub-dashboard/src/components/sections/VersionTitle.js
similarity index 100%
rename from packages/component-dashboard/src/components/sections/VersionTitle.js
rename to packages/components/packages/xpub-dashboard/src/components/sections/VersionTitle.js
diff --git a/packages/component-dashboard/src/components/withVersion.js b/packages/components/packages/xpub-dashboard/src/components/withVersion.js
similarity index 100%
rename from packages/component-dashboard/src/components/withVersion.js
rename to packages/components/packages/xpub-dashboard/src/components/withVersion.js
diff --git a/packages/component-dashboard/src/index.js b/packages/components/packages/xpub-dashboard/src/index.js
similarity index 100%
rename from packages/component-dashboard/src/index.js
rename to packages/components/packages/xpub-dashboard/src/index.js
diff --git a/packages/component-dashboard/src/lib/title.js b/packages/components/packages/xpub-dashboard/src/lib/title.js
similarity index 100%
rename from packages/component-dashboard/src/lib/title.js
rename to packages/components/packages/xpub-dashboard/src/lib/title.js
diff --git a/packages/component-dashboard/src/redux/conversion.js b/packages/components/packages/xpub-dashboard/src/redux/conversion.js
similarity index 100%
rename from packages/component-dashboard/src/redux/conversion.js
rename to packages/components/packages/xpub-dashboard/src/redux/conversion.js
diff --git a/packages/component-dashboard/src/redux/conversion.test.js b/packages/components/packages/xpub-dashboard/src/redux/conversion.test.js
similarity index 100%
rename from packages/component-dashboard/src/redux/conversion.test.js
rename to packages/components/packages/xpub-dashboard/src/redux/conversion.test.js
diff --git a/packages/component-dashboard/src/redux/index.js b/packages/components/packages/xpub-dashboard/src/redux/index.js
similarity index 100%
rename from packages/component-dashboard/src/redux/index.js
rename to packages/components/packages/xpub-dashboard/src/redux/index.js
diff --git a/packages/component-dashboard/src/redux/teams.js b/packages/components/packages/xpub-dashboard/src/redux/teams.js
similarity index 100%
rename from packages/component-dashboard/src/redux/teams.js
rename to packages/components/packages/xpub-dashboard/src/redux/teams.js
diff --git a/packages/component-dashboard/styleguide.config.js b/packages/components/packages/xpub-dashboard/styleguide.config.js
similarity index 100%
rename from packages/component-dashboard/styleguide.config.js
rename to packages/components/packages/xpub-dashboard/styleguide.config.js
diff --git a/packages/component-dashboard/webpack.config.js b/packages/components/packages/xpub-dashboard/webpack.config.js
similarity index 100%
rename from packages/component-dashboard/webpack.config.js
rename to packages/components/packages/xpub-dashboard/webpack.config.js
diff --git a/packages/xpub-edit/README.md b/packages/components/packages/xpub-edit/README.md
similarity index 100%
rename from packages/xpub-edit/README.md
rename to packages/components/packages/xpub-edit/README.md
diff --git a/packages/xpub-edit/package.json b/packages/components/packages/xpub-edit/package.json
similarity index 100%
rename from packages/xpub-edit/package.json
rename to packages/components/packages/xpub-edit/package.json
diff --git a/packages/xpub-edit/src/components/Editor.js b/packages/components/packages/xpub-edit/src/components/Editor.js
similarity index 100%
rename from packages/xpub-edit/src/components/Editor.js
rename to packages/components/packages/xpub-edit/src/components/Editor.js
diff --git a/packages/xpub-edit/src/components/HtmlEditor.js b/packages/components/packages/xpub-edit/src/components/HtmlEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/HtmlEditor.js
rename to packages/components/packages/xpub-edit/src/components/HtmlEditor.js
diff --git a/packages/xpub-edit/src/components/HtmlViewer.js b/packages/components/packages/xpub-edit/src/components/HtmlViewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/HtmlViewer.js
rename to packages/components/packages/xpub-edit/src/components/HtmlViewer.js
diff --git a/packages/xpub-edit/src/components/MenuBar.js b/packages/components/packages/xpub-edit/src/components/MenuBar.js
similarity index 100%
rename from packages/xpub-edit/src/components/MenuBar.js
rename to packages/components/packages/xpub-edit/src/components/MenuBar.js
diff --git a/packages/xpub-edit/src/components/MenuButton.js b/packages/components/packages/xpub-edit/src/components/MenuButton.js
similarity index 100%
rename from packages/xpub-edit/src/components/MenuButton.js
rename to packages/components/packages/xpub-edit/src/components/MenuButton.js
diff --git a/packages/xpub-edit/src/components/StyledEditor.js b/packages/components/packages/xpub-edit/src/components/StyledEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/StyledEditor.js
rename to packages/components/packages/xpub-edit/src/components/StyledEditor.js
diff --git a/packages/xpub-edit/src/components/Viewer.js b/packages/components/packages/xpub-edit/src/components/Viewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/Viewer.js
rename to packages/components/packages/xpub-edit/src/components/Viewer.js
diff --git a/packages/xpub-edit/src/components/abstract/AbstractEditor.js b/packages/components/packages/xpub-edit/src/components/abstract/AbstractEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/AbstractEditor.js
rename to packages/components/packages/xpub-edit/src/components/abstract/AbstractEditor.js
diff --git a/packages/xpub-edit/src/components/abstract/AbstractEditor.md b/packages/components/packages/xpub-edit/src/components/abstract/AbstractEditor.md
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/AbstractEditor.md
rename to packages/components/packages/xpub-edit/src/components/abstract/AbstractEditor.md
diff --git a/packages/xpub-edit/src/components/abstract/AbstractViewer.js b/packages/components/packages/xpub-edit/src/components/abstract/AbstractViewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/AbstractViewer.js
rename to packages/components/packages/xpub-edit/src/components/abstract/AbstractViewer.js
diff --git a/packages/xpub-edit/src/components/abstract/AbstractViewer.md b/packages/components/packages/xpub-edit/src/components/abstract/AbstractViewer.md
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/AbstractViewer.md
rename to packages/components/packages/xpub-edit/src/components/abstract/AbstractViewer.md
diff --git a/packages/xpub-edit/src/components/abstract/config/icons.js b/packages/components/packages/xpub-edit/src/components/abstract/config/icons.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/icons.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/icons.js
diff --git a/packages/xpub-edit/src/components/abstract/config/index.js b/packages/components/packages/xpub-edit/src/components/abstract/config/index.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/index.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/index.js
diff --git a/packages/xpub-edit/src/components/abstract/config/keys.js b/packages/components/packages/xpub-edit/src/components/abstract/config/keys.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/keys.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/keys.js
diff --git a/packages/xpub-edit/src/components/abstract/config/marks.js b/packages/components/packages/xpub-edit/src/components/abstract/config/marks.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/marks.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/marks.js
diff --git a/packages/xpub-edit/src/components/abstract/config/menu.js b/packages/components/packages/xpub-edit/src/components/abstract/config/menu.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/menu.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/menu.js
diff --git a/packages/xpub-edit/src/components/abstract/config/nodes.js b/packages/components/packages/xpub-edit/src/components/abstract/config/nodes.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/nodes.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/nodes.js
diff --git a/packages/xpub-edit/src/components/abstract/config/plugins.js b/packages/components/packages/xpub-edit/src/components/abstract/config/plugins.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/plugins.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/plugins.js
diff --git a/packages/xpub-edit/src/components/abstract/config/schema.js b/packages/components/packages/xpub-edit/src/components/abstract/config/schema.js
similarity index 100%
rename from packages/xpub-edit/src/components/abstract/config/schema.js
rename to packages/components/packages/xpub-edit/src/components/abstract/config/schema.js
diff --git a/packages/xpub-edit/src/components/index.js b/packages/components/packages/xpub-edit/src/components/index.js
similarity index 100%
rename from packages/xpub-edit/src/components/index.js
rename to packages/components/packages/xpub-edit/src/components/index.js
diff --git a/packages/xpub-edit/src/components/note/NoteEditor.js b/packages/components/packages/xpub-edit/src/components/note/NoteEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/NoteEditor.js
rename to packages/components/packages/xpub-edit/src/components/note/NoteEditor.js
diff --git a/packages/xpub-edit/src/components/note/NoteEditor.md b/packages/components/packages/xpub-edit/src/components/note/NoteEditor.md
similarity index 100%
rename from packages/xpub-edit/src/components/note/NoteEditor.md
rename to packages/components/packages/xpub-edit/src/components/note/NoteEditor.md
diff --git a/packages/xpub-edit/src/components/note/NoteViewer.js b/packages/components/packages/xpub-edit/src/components/note/NoteViewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/NoteViewer.js
rename to packages/components/packages/xpub-edit/src/components/note/NoteViewer.js
diff --git a/packages/xpub-edit/src/components/note/NoteViewer.md b/packages/components/packages/xpub-edit/src/components/note/NoteViewer.md
similarity index 100%
rename from packages/xpub-edit/src/components/note/NoteViewer.md
rename to packages/components/packages/xpub-edit/src/components/note/NoteViewer.md
diff --git a/packages/xpub-edit/src/components/note/config/icons.js b/packages/components/packages/xpub-edit/src/components/note/config/icons.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/icons.js
rename to packages/components/packages/xpub-edit/src/components/note/config/icons.js
diff --git a/packages/xpub-edit/src/components/note/config/index.js b/packages/components/packages/xpub-edit/src/components/note/config/index.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/index.js
rename to packages/components/packages/xpub-edit/src/components/note/config/index.js
diff --git a/packages/xpub-edit/src/components/note/config/keys.js b/packages/components/packages/xpub-edit/src/components/note/config/keys.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/keys.js
rename to packages/components/packages/xpub-edit/src/components/note/config/keys.js
diff --git a/packages/xpub-edit/src/components/note/config/marks.js b/packages/components/packages/xpub-edit/src/components/note/config/marks.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/marks.js
rename to packages/components/packages/xpub-edit/src/components/note/config/marks.js
diff --git a/packages/xpub-edit/src/components/note/config/menu.js b/packages/components/packages/xpub-edit/src/components/note/config/menu.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/menu.js
rename to packages/components/packages/xpub-edit/src/components/note/config/menu.js
diff --git a/packages/xpub-edit/src/components/note/config/nodes.js b/packages/components/packages/xpub-edit/src/components/note/config/nodes.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/nodes.js
rename to packages/components/packages/xpub-edit/src/components/note/config/nodes.js
diff --git a/packages/xpub-edit/src/components/note/config/plugins.js b/packages/components/packages/xpub-edit/src/components/note/config/plugins.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/plugins.js
rename to packages/components/packages/xpub-edit/src/components/note/config/plugins.js
diff --git a/packages/xpub-edit/src/components/note/config/schema.js b/packages/components/packages/xpub-edit/src/components/note/config/schema.js
similarity index 100%
rename from packages/xpub-edit/src/components/note/config/schema.js
rename to packages/components/packages/xpub-edit/src/components/note/config/schema.js
diff --git a/packages/xpub-edit/src/components/text/TextEditor.js b/packages/components/packages/xpub-edit/src/components/text/TextEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/TextEditor.js
rename to packages/components/packages/xpub-edit/src/components/text/TextEditor.js
diff --git a/packages/xpub-edit/src/components/text/TextEditor.md b/packages/components/packages/xpub-edit/src/components/text/TextEditor.md
similarity index 100%
rename from packages/xpub-edit/src/components/text/TextEditor.md
rename to packages/components/packages/xpub-edit/src/components/text/TextEditor.md
diff --git a/packages/xpub-edit/src/components/text/TextViewer.js b/packages/components/packages/xpub-edit/src/components/text/TextViewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/TextViewer.js
rename to packages/components/packages/xpub-edit/src/components/text/TextViewer.js
diff --git a/packages/xpub-edit/src/components/text/TextViewer.md b/packages/components/packages/xpub-edit/src/components/text/TextViewer.md
similarity index 100%
rename from packages/xpub-edit/src/components/text/TextViewer.md
rename to packages/components/packages/xpub-edit/src/components/text/TextViewer.md
diff --git a/packages/xpub-edit/src/components/text/config/index.js b/packages/components/packages/xpub-edit/src/components/text/config/index.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/config/index.js
rename to packages/components/packages/xpub-edit/src/components/text/config/index.js
diff --git a/packages/xpub-edit/src/components/text/config/nodes.js b/packages/components/packages/xpub-edit/src/components/text/config/nodes.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/config/nodes.js
rename to packages/components/packages/xpub-edit/src/components/text/config/nodes.js
diff --git a/packages/xpub-edit/src/components/text/config/plugins.js b/packages/components/packages/xpub-edit/src/components/text/config/plugins.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/config/plugins.js
rename to packages/components/packages/xpub-edit/src/components/text/config/plugins.js
diff --git a/packages/xpub-edit/src/components/text/config/schema.js b/packages/components/packages/xpub-edit/src/components/text/config/schema.js
similarity index 100%
rename from packages/xpub-edit/src/components/text/config/schema.js
rename to packages/components/packages/xpub-edit/src/components/text/config/schema.js
diff --git a/packages/xpub-edit/src/components/title/TitleEditor.js b/packages/components/packages/xpub-edit/src/components/title/TitleEditor.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/TitleEditor.js
rename to packages/components/packages/xpub-edit/src/components/title/TitleEditor.js
diff --git a/packages/xpub-edit/src/components/title/TitleEditor.md b/packages/components/packages/xpub-edit/src/components/title/TitleEditor.md
similarity index 100%
rename from packages/xpub-edit/src/components/title/TitleEditor.md
rename to packages/components/packages/xpub-edit/src/components/title/TitleEditor.md
diff --git a/packages/xpub-edit/src/components/title/TitleViewer.js b/packages/components/packages/xpub-edit/src/components/title/TitleViewer.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/TitleViewer.js
rename to packages/components/packages/xpub-edit/src/components/title/TitleViewer.js
diff --git a/packages/xpub-edit/src/components/title/TitleViewer.md b/packages/components/packages/xpub-edit/src/components/title/TitleViewer.md
similarity index 100%
rename from packages/xpub-edit/src/components/title/TitleViewer.md
rename to packages/components/packages/xpub-edit/src/components/title/TitleViewer.md
diff --git a/packages/xpub-edit/src/components/title/config/icons.js b/packages/components/packages/xpub-edit/src/components/title/config/icons.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/icons.js
rename to packages/components/packages/xpub-edit/src/components/title/config/icons.js
diff --git a/packages/xpub-edit/src/components/title/config/index.js b/packages/components/packages/xpub-edit/src/components/title/config/index.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/index.js
rename to packages/components/packages/xpub-edit/src/components/title/config/index.js
diff --git a/packages/xpub-edit/src/components/title/config/keys.js b/packages/components/packages/xpub-edit/src/components/title/config/keys.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/keys.js
rename to packages/components/packages/xpub-edit/src/components/title/config/keys.js
diff --git a/packages/xpub-edit/src/components/title/config/marks.js b/packages/components/packages/xpub-edit/src/components/title/config/marks.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/marks.js
rename to packages/components/packages/xpub-edit/src/components/title/config/marks.js
diff --git a/packages/xpub-edit/src/components/title/config/menu.js b/packages/components/packages/xpub-edit/src/components/title/config/menu.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/menu.js
rename to packages/components/packages/xpub-edit/src/components/title/config/menu.js
diff --git a/packages/xpub-edit/src/components/title/config/nodes.js b/packages/components/packages/xpub-edit/src/components/title/config/nodes.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/nodes.js
rename to packages/components/packages/xpub-edit/src/components/title/config/nodes.js
diff --git a/packages/xpub-edit/src/components/title/config/plugins.js b/packages/components/packages/xpub-edit/src/components/title/config/plugins.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/plugins.js
rename to packages/components/packages/xpub-edit/src/components/title/config/plugins.js
diff --git a/packages/xpub-edit/src/components/title/config/schema.js b/packages/components/packages/xpub-edit/src/components/title/config/schema.js
similarity index 100%
rename from packages/xpub-edit/src/components/title/config/schema.js
rename to packages/components/packages/xpub-edit/src/components/title/config/schema.js
diff --git a/packages/xpub-edit/src/components/withStyles.js b/packages/components/packages/xpub-edit/src/components/withStyles.js
similarity index 100%
rename from packages/xpub-edit/src/components/withStyles.js
rename to packages/components/packages/xpub-edit/src/components/withStyles.js
diff --git a/packages/xpub-edit/src/decorations.js b/packages/components/packages/xpub-edit/src/decorations.js
similarity index 100%
rename from packages/xpub-edit/src/decorations.js
rename to packages/components/packages/xpub-edit/src/decorations.js
diff --git a/packages/xpub-edit/src/index.js b/packages/components/packages/xpub-edit/src/index.js
similarity index 100%
rename from packages/xpub-edit/src/index.js
rename to packages/components/packages/xpub-edit/src/index.js
diff --git a/packages/xpub-edit/styleguide.config.js b/packages/components/packages/xpub-edit/styleguide.config.js
similarity index 100%
rename from packages/xpub-edit/styleguide.config.js
rename to packages/components/packages/xpub-edit/styleguide.config.js
diff --git a/packages/component-find-reviewers/webpack.config.js b/packages/components/packages/xpub-edit/webpack.config.js
similarity index 100%
rename from packages/component-find-reviewers/webpack.config.js
rename to packages/components/packages/xpub-edit/webpack.config.js
diff --git a/packages/component-find-reviewers/package.json b/packages/components/packages/xpub-find-reviewers/package.json
similarity index 95%
rename from packages/component-find-reviewers/package.json
rename to packages/components/packages/xpub-find-reviewers/package.json
index ff054f1371418387a253cbc3e8eba1cf8bb54f16..4fc2d12bd202dedf3376af0cd6b2a61ffd9f8091 100644
--- a/packages/component-find-reviewers/package.json
+++ b/packages/components/packages/xpub-find-reviewers/package.json
@@ -1,5 +1,5 @@
{
- "name": "pubsweet-component-xpub-find-reviewers",
+ "name": "@pubsweet/find-reviewers",
"version": "0.0.2",
"main": "src",
"author": "Collaborative Knowledge Foundation",
diff --git a/packages/component-find-reviewers/src/components/Author.js b/packages/components/packages/xpub-find-reviewers/src/components/Author.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/Author.js
rename to packages/components/packages/xpub-find-reviewers/src/components/Author.js
diff --git a/packages/component-find-reviewers/src/components/Author.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/Author.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/Author.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/Author.local.scss
diff --git a/packages/component-find-reviewers/src/components/Author.md b/packages/components/packages/xpub-find-reviewers/src/components/Author.md
similarity index 100%
rename from packages/component-find-reviewers/src/components/Author.md
rename to packages/components/packages/xpub-find-reviewers/src/components/Author.md
diff --git a/packages/component-find-reviewers/src/components/AuthorLayout.js b/packages/components/packages/xpub-find-reviewers/src/components/AuthorLayout.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/AuthorLayout.js
rename to packages/components/packages/xpub-find-reviewers/src/components/AuthorLayout.js
diff --git a/packages/component-find-reviewers/src/components/AuthorLayout.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/AuthorLayout.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/AuthorLayout.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/AuthorLayout.local.scss
diff --git a/packages/component-find-reviewers/src/components/AuthorPage.js b/packages/components/packages/xpub-find-reviewers/src/components/AuthorPage.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/AuthorPage.js
rename to packages/components/packages/xpub-find-reviewers/src/components/AuthorPage.js
diff --git a/packages/component-find-reviewers/src/components/FindReviewersLayout.js b/packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/FindReviewersLayout.js
rename to packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.js
diff --git a/packages/component-find-reviewers/src/components/FindReviewersLayout.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/FindReviewersLayout.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.local.scss
diff --git a/packages/component-find-reviewers/src/components/FindReviewersLayout.md b/packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.md
similarity index 100%
rename from packages/component-find-reviewers/src/components/FindReviewersLayout.md
rename to packages/components/packages/xpub-find-reviewers/src/components/FindReviewersLayout.md
diff --git a/packages/component-find-reviewers/src/components/FindReviewersPage.js b/packages/components/packages/xpub-find-reviewers/src/components/FindReviewersPage.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/FindReviewersPage.js
rename to packages/components/packages/xpub-find-reviewers/src/components/FindReviewersPage.js
diff --git a/packages/component-find-reviewers/src/components/Metadata.js b/packages/components/packages/xpub-find-reviewers/src/components/Metadata.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/Metadata.js
rename to packages/components/packages/xpub-find-reviewers/src/components/Metadata.js
diff --git a/packages/component-find-reviewers/src/components/Metadata.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/Metadata.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/Metadata.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/Metadata.local.scss
diff --git a/packages/component-find-reviewers/src/components/Metadata.md b/packages/components/packages/xpub-find-reviewers/src/components/Metadata.md
similarity index 100%
rename from packages/component-find-reviewers/src/components/Metadata.md
rename to packages/components/packages/xpub-find-reviewers/src/components/Metadata.md
diff --git a/packages/component-find-reviewers/src/components/Paper.js b/packages/components/packages/xpub-find-reviewers/src/components/Paper.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/Paper.js
rename to packages/components/packages/xpub-find-reviewers/src/components/Paper.js
diff --git a/packages/component-find-reviewers/src/components/Paper.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/Paper.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/Paper.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/Paper.local.scss
diff --git a/packages/component-find-reviewers/src/components/Paper.md b/packages/components/packages/xpub-find-reviewers/src/components/Paper.md
similarity index 100%
rename from packages/component-find-reviewers/src/components/Paper.md
rename to packages/components/packages/xpub-find-reviewers/src/components/Paper.md
diff --git a/packages/component-find-reviewers/src/components/PaperLayout.js b/packages/components/packages/xpub-find-reviewers/src/components/PaperLayout.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/PaperLayout.js
rename to packages/components/packages/xpub-find-reviewers/src/components/PaperLayout.js
diff --git a/packages/component-find-reviewers/src/components/PaperLayout.local.scss b/packages/components/packages/xpub-find-reviewers/src/components/PaperLayout.local.scss
similarity index 100%
rename from packages/component-find-reviewers/src/components/PaperLayout.local.scss
rename to packages/components/packages/xpub-find-reviewers/src/components/PaperLayout.local.scss
diff --git a/packages/component-find-reviewers/src/components/PaperPage.js b/packages/components/packages/xpub-find-reviewers/src/components/PaperPage.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/PaperPage.js
rename to packages/components/packages/xpub-find-reviewers/src/components/PaperPage.js
diff --git a/packages/component-find-reviewers/src/components/ProjectLink.js b/packages/components/packages/xpub-find-reviewers/src/components/ProjectLink.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/ProjectLink.js
rename to packages/components/packages/xpub-find-reviewers/src/components/ProjectLink.js
diff --git a/packages/component-find-reviewers/src/components/index.js b/packages/components/packages/xpub-find-reviewers/src/components/index.js
similarity index 100%
rename from packages/component-find-reviewers/src/components/index.js
rename to packages/components/packages/xpub-find-reviewers/src/components/index.js
diff --git a/packages/component-find-reviewers/src/index.js b/packages/components/packages/xpub-find-reviewers/src/index.js
similarity index 100%
rename from packages/component-find-reviewers/src/index.js
rename to packages/components/packages/xpub-find-reviewers/src/index.js
diff --git a/packages/component-find-reviewers/src/lib/author.js b/packages/components/packages/xpub-find-reviewers/src/lib/author.js
similarity index 100%
rename from packages/component-find-reviewers/src/lib/author.js
rename to packages/components/packages/xpub-find-reviewers/src/lib/author.js
diff --git a/packages/component-find-reviewers/src/lib/scholar.js b/packages/components/packages/xpub-find-reviewers/src/lib/scholar.js
similarity index 100%
rename from packages/component-find-reviewers/src/lib/scholar.js
rename to packages/components/packages/xpub-find-reviewers/src/lib/scholar.js
diff --git a/packages/component-find-reviewers/src/lib/score.js b/packages/components/packages/xpub-find-reviewers/src/lib/score.js
similarity index 100%
rename from packages/component-find-reviewers/src/lib/score.js
rename to packages/components/packages/xpub-find-reviewers/src/lib/score.js
diff --git a/packages/component-find-reviewers/src/lib/sort.js b/packages/components/packages/xpub-find-reviewers/src/lib/sort.js
similarity index 100%
rename from packages/component-find-reviewers/src/lib/sort.js
rename to packages/components/packages/xpub-find-reviewers/src/lib/sort.js
diff --git a/packages/component-find-reviewers/styleguide.config.js b/packages/components/packages/xpub-find-reviewers/styleguide.config.js
similarity index 100%
rename from packages/component-find-reviewers/styleguide.config.js
rename to packages/components/packages/xpub-find-reviewers/styleguide.config.js
diff --git a/packages/component-manuscript/webpack.config.js b/packages/components/packages/xpub-find-reviewers/webpack.config.js
similarity index 100%
rename from packages/component-manuscript/webpack.config.js
rename to packages/components/packages/xpub-find-reviewers/webpack.config.js
diff --git a/packages/xpub-journal/README.md b/packages/components/packages/xpub-journal/README.md
similarity index 100%
rename from packages/xpub-journal/README.md
rename to packages/components/packages/xpub-journal/README.md
diff --git a/packages/xpub-journal/package.json b/packages/components/packages/xpub-journal/package.json
similarity index 100%
rename from packages/xpub-journal/package.json
rename to packages/components/packages/xpub-journal/package.json
diff --git a/packages/xpub-journal/src/components/JournalProvider.js b/packages/components/packages/xpub-journal/src/components/JournalProvider.js
similarity index 100%
rename from packages/xpub-journal/src/components/JournalProvider.js
rename to packages/components/packages/xpub-journal/src/components/JournalProvider.js
diff --git a/packages/xpub-journal/src/components/index.js b/packages/components/packages/xpub-journal/src/components/index.js
similarity index 100%
rename from packages/xpub-journal/src/components/index.js
rename to packages/components/packages/xpub-journal/src/components/index.js
diff --git a/packages/xpub-journal/src/index.js b/packages/components/packages/xpub-journal/src/index.js
similarity index 100%
rename from packages/xpub-journal/src/index.js
rename to packages/components/packages/xpub-journal/src/index.js
diff --git a/packages/component-manuscript/README.md b/packages/components/packages/xpub-manuscript/README.md
similarity index 100%
rename from packages/component-manuscript/README.md
rename to packages/components/packages/xpub-manuscript/README.md
diff --git a/packages/component-manuscript/package.json b/packages/components/packages/xpub-manuscript/package.json
similarity index 100%
rename from packages/component-manuscript/package.json
rename to packages/components/packages/xpub-manuscript/package.json
diff --git a/packages/component-manuscript/src/components/Manuscript.js b/packages/components/packages/xpub-manuscript/src/components/Manuscript.js
similarity index 100%
rename from packages/component-manuscript/src/components/Manuscript.js
rename to packages/components/packages/xpub-manuscript/src/components/Manuscript.js
diff --git a/packages/component-manuscript/src/components/Manuscript.md b/packages/components/packages/xpub-manuscript/src/components/Manuscript.md
similarity index 100%
rename from packages/component-manuscript/src/components/Manuscript.md
rename to packages/components/packages/xpub-manuscript/src/components/Manuscript.md
diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/components/packages/xpub-manuscript/src/components/ManuscriptPage.js
similarity index 100%
rename from packages/component-manuscript/src/components/ManuscriptPage.js
rename to packages/components/packages/xpub-manuscript/src/components/ManuscriptPage.js
diff --git a/packages/component-manuscript/src/components/index.js b/packages/components/packages/xpub-manuscript/src/components/index.js
similarity index 100%
rename from packages/component-manuscript/src/components/index.js
rename to packages/components/packages/xpub-manuscript/src/components/index.js
diff --git a/packages/component-manuscript/src/index.js b/packages/components/packages/xpub-manuscript/src/index.js
similarity index 100%
rename from packages/component-manuscript/src/index.js
rename to packages/components/packages/xpub-manuscript/src/index.js
diff --git a/packages/component-manuscript/styleguide.config.js b/packages/components/packages/xpub-manuscript/styleguide.config.js
similarity index 100%
rename from packages/component-manuscript/styleguide.config.js
rename to packages/components/packages/xpub-manuscript/styleguide.config.js
diff --git a/packages/component-review/webpack.config.js b/packages/components/packages/xpub-manuscript/webpack.config.js
similarity index 100%
rename from packages/component-review/webpack.config.js
rename to packages/components/packages/xpub-manuscript/webpack.config.js
diff --git a/packages/component-review-backend/package.json b/packages/components/packages/xpub-review-backend/package.json
similarity index 100%
rename from packages/component-review-backend/package.json
rename to packages/components/packages/xpub-review-backend/package.json
diff --git a/packages/component-review-backend/src/index.js b/packages/components/packages/xpub-review-backend/src/index.js
similarity index 100%
rename from packages/component-review-backend/src/index.js
rename to packages/components/packages/xpub-review-backend/src/index.js
diff --git a/packages/component-review-backend/src/reviewBackend.js b/packages/components/packages/xpub-review-backend/src/reviewBackend.js
similarity index 100%
rename from packages/component-review-backend/src/reviewBackend.js
rename to packages/components/packages/xpub-review-backend/src/reviewBackend.js
diff --git a/packages/component-review-backend/src/reviewBackend.test.js b/packages/components/packages/xpub-review-backend/src/reviewBackend.test.js
similarity index 100%
rename from packages/component-review-backend/src/reviewBackend.test.js
rename to packages/components/packages/xpub-review-backend/src/reviewBackend.test.js
diff --git a/packages/component-review-backend/src/transport.js b/packages/components/packages/xpub-review-backend/src/transport.js
similarity index 100%
rename from packages/component-review-backend/src/transport.js
rename to packages/components/packages/xpub-review-backend/src/transport.js
diff --git a/packages/component-review/README.md b/packages/components/packages/xpub-review/README.md
similarity index 100%
rename from packages/component-review/README.md
rename to packages/components/packages/xpub-review/README.md
diff --git a/packages/component-review/package.json b/packages/components/packages/xpub-review/package.json
similarity index 100%
rename from packages/component-review/package.json
rename to packages/components/packages/xpub-review/package.json
diff --git a/packages/component-review/src/components/DecisionPage.js b/packages/components/packages/xpub-review/src/components/DecisionPage.js
similarity index 100%
rename from packages/component-review/src/components/DecisionPage.js
rename to packages/components/packages/xpub-review/src/components/DecisionPage.js
diff --git a/packages/component-review/src/components/ReviewPage.js b/packages/components/packages/xpub-review/src/components/ReviewPage.js
similarity index 100%
rename from packages/component-review/src/components/ReviewPage.js
rename to packages/components/packages/xpub-review/src/components/ReviewPage.js
diff --git a/packages/component-review/src/components/ReviewersPage.js b/packages/components/packages/xpub-review/src/components/ReviewersPage.js
similarity index 100%
rename from packages/component-review/src/components/ReviewersPage.js
rename to packages/components/packages/xpub-review/src/components/ReviewersPage.js
diff --git a/packages/component-review/src/components/atoms/AdminSection.js b/packages/components/packages/xpub-review/src/components/atoms/AdminSection.js
similarity index 100%
rename from packages/component-review/src/components/atoms/AdminSection.js
rename to packages/components/packages/xpub-review/src/components/atoms/AdminSection.js
diff --git a/packages/component-review/src/components/atoms/Columns.js b/packages/components/packages/xpub-review/src/components/atoms/Columns.js
similarity index 100%
rename from packages/component-review/src/components/atoms/Columns.js
rename to packages/components/packages/xpub-review/src/components/atoms/Columns.js
diff --git a/packages/component-review/src/components/atoms/Tab.js b/packages/components/packages/xpub-review/src/components/atoms/Tab.js
similarity index 100%
rename from packages/component-review/src/components/atoms/Tab.js
rename to packages/components/packages/xpub-review/src/components/atoms/Tab.js
diff --git a/packages/component-review/src/components/atoms/Tab.md b/packages/components/packages/xpub-review/src/components/atoms/Tab.md
similarity index 100%
rename from packages/component-review/src/components/atoms/Tab.md
rename to packages/components/packages/xpub-review/src/components/atoms/Tab.md
diff --git a/packages/component-review/src/components/atoms/Tabs.js b/packages/components/packages/xpub-review/src/components/atoms/Tabs.js
similarity index 100%
rename from packages/component-review/src/components/atoms/Tabs.js
rename to packages/components/packages/xpub-review/src/components/atoms/Tabs.js
diff --git a/packages/component-review/src/components/atoms/Tabs.md b/packages/components/packages/xpub-review/src/components/atoms/Tabs.md
similarity index 100%
rename from packages/component-review/src/components/atoms/Tabs.md
rename to packages/components/packages/xpub-review/src/components/atoms/Tabs.md
diff --git a/packages/component-review/src/components/decision/Decision.js b/packages/components/packages/xpub-review/src/components/decision/Decision.js
similarity index 100%
rename from packages/component-review/src/components/decision/Decision.js
rename to packages/components/packages/xpub-review/src/components/decision/Decision.js
diff --git a/packages/component-review/src/components/decision/Decision.md b/packages/components/packages/xpub-review/src/components/decision/Decision.md
similarity index 100%
rename from packages/component-review/src/components/decision/Decision.md
rename to packages/components/packages/xpub-review/src/components/decision/Decision.md
diff --git a/packages/component-review/src/components/decision/DecisionForm.js b/packages/components/packages/xpub-review/src/components/decision/DecisionForm.js
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionForm.js
rename to packages/components/packages/xpub-review/src/components/decision/DecisionForm.js
diff --git a/packages/component-review/src/components/decision/DecisionForm.md b/packages/components/packages/xpub-review/src/components/decision/DecisionForm.md
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionForm.md
rename to packages/components/packages/xpub-review/src/components/decision/DecisionForm.md
diff --git a/packages/component-review/src/components/decision/DecisionLayout.js b/packages/components/packages/xpub-review/src/components/decision/DecisionLayout.js
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionLayout.js
rename to packages/components/packages/xpub-review/src/components/decision/DecisionLayout.js
diff --git a/packages/component-review/src/components/decision/DecisionLayout.md b/packages/components/packages/xpub-review/src/components/decision/DecisionLayout.md
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionLayout.md
rename to packages/components/packages/xpub-review/src/components/decision/DecisionLayout.md
diff --git a/packages/component-review/src/components/decision/DecisionReview.js b/packages/components/packages/xpub-review/src/components/decision/DecisionReview.js
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionReview.js
rename to packages/components/packages/xpub-review/src/components/decision/DecisionReview.js
diff --git a/packages/component-review/src/components/decision/DecisionReview.md b/packages/components/packages/xpub-review/src/components/decision/DecisionReview.md
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionReview.md
rename to packages/components/packages/xpub-review/src/components/decision/DecisionReview.md
diff --git a/packages/component-review/src/components/decision/DecisionReviews.js b/packages/components/packages/xpub-review/src/components/decision/DecisionReviews.js
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionReviews.js
rename to packages/components/packages/xpub-review/src/components/decision/DecisionReviews.js
diff --git a/packages/component-review/src/components/decision/DecisionReviews.md b/packages/components/packages/xpub-review/src/components/decision/DecisionReviews.md
similarity index 100%
rename from packages/component-review/src/components/decision/DecisionReviews.md
rename to packages/components/packages/xpub-review/src/components/decision/DecisionReviews.md
diff --git a/packages/component-review/src/components/index.js b/packages/components/packages/xpub-review/src/components/index.js
similarity index 100%
rename from packages/component-review/src/components/index.js
rename to packages/components/packages/xpub-review/src/components/index.js
diff --git a/packages/component-review/src/components/metadata/ReviewMetadata.js b/packages/components/packages/xpub-review/src/components/metadata/ReviewMetadata.js
similarity index 100%
rename from packages/component-review/src/components/metadata/ReviewMetadata.js
rename to packages/components/packages/xpub-review/src/components/metadata/ReviewMetadata.js
diff --git a/packages/component-review/src/components/metadata/ReviewMetadata.md b/packages/components/packages/xpub-review/src/components/metadata/ReviewMetadata.md
similarity index 100%
rename from packages/component-review/src/components/metadata/ReviewMetadata.md
rename to packages/components/packages/xpub-review/src/components/metadata/ReviewMetadata.md
diff --git a/packages/component-review/src/components/review/Review.js b/packages/components/packages/xpub-review/src/components/review/Review.js
similarity index 100%
rename from packages/component-review/src/components/review/Review.js
rename to packages/components/packages/xpub-review/src/components/review/Review.js
diff --git a/packages/component-review/src/components/review/Review.md b/packages/components/packages/xpub-review/src/components/review/Review.md
similarity index 100%
rename from packages/component-review/src/components/review/Review.md
rename to packages/components/packages/xpub-review/src/components/review/Review.md
diff --git a/packages/component-review/src/components/review/ReviewForm.js b/packages/components/packages/xpub-review/src/components/review/ReviewForm.js
similarity index 100%
rename from packages/component-review/src/components/review/ReviewForm.js
rename to packages/components/packages/xpub-review/src/components/review/ReviewForm.js
diff --git a/packages/component-review/src/components/review/ReviewForm.md b/packages/components/packages/xpub-review/src/components/review/ReviewForm.md
similarity index 100%
rename from packages/component-review/src/components/review/ReviewForm.md
rename to packages/components/packages/xpub-review/src/components/review/ReviewForm.md
diff --git a/packages/component-review/src/components/review/ReviewLayout.js b/packages/components/packages/xpub-review/src/components/review/ReviewLayout.js
similarity index 100%
rename from packages/component-review/src/components/review/ReviewLayout.js
rename to packages/components/packages/xpub-review/src/components/review/ReviewLayout.js
diff --git a/packages/component-review/src/components/review/ReviewLayout.md b/packages/components/packages/xpub-review/src/components/review/ReviewLayout.md
similarity index 100%
rename from packages/component-review/src/components/review/ReviewLayout.md
rename to packages/components/packages/xpub-review/src/components/review/ReviewLayout.md
diff --git a/packages/component-review/src/components/reviewers/Reviewer.js b/packages/components/packages/xpub-review/src/components/reviewers/Reviewer.js
similarity index 100%
rename from packages/component-review/src/components/reviewers/Reviewer.js
rename to packages/components/packages/xpub-review/src/components/reviewers/Reviewer.js
diff --git a/packages/component-review/src/components/reviewers/Reviewer.md b/packages/components/packages/xpub-review/src/components/reviewers/Reviewer.md
similarity index 100%
rename from packages/component-review/src/components/reviewers/Reviewer.md
rename to packages/components/packages/xpub-review/src/components/reviewers/Reviewer.md
diff --git a/packages/component-review/src/components/reviewers/ReviewerContainer.js b/packages/components/packages/xpub-review/src/components/reviewers/ReviewerContainer.js
similarity index 100%
rename from packages/component-review/src/components/reviewers/ReviewerContainer.js
rename to packages/components/packages/xpub-review/src/components/reviewers/ReviewerContainer.js
diff --git a/packages/component-review/src/components/reviewers/ReviewerForm.js b/packages/components/packages/xpub-review/src/components/reviewers/ReviewerForm.js
similarity index 100%
rename from packages/component-review/src/components/reviewers/ReviewerForm.js
rename to packages/components/packages/xpub-review/src/components/reviewers/ReviewerForm.js
diff --git a/packages/component-review/src/components/reviewers/ReviewerForm.md b/packages/components/packages/xpub-review/src/components/reviewers/ReviewerForm.md
similarity index 100%
rename from packages/component-review/src/components/reviewers/ReviewerForm.md
rename to packages/components/packages/xpub-review/src/components/reviewers/ReviewerForm.md
diff --git a/packages/component-review/src/components/reviewers/ReviewerFormContainer.js b/packages/components/packages/xpub-review/src/components/reviewers/ReviewerFormContainer.js
similarity index 100%
rename from packages/component-review/src/components/reviewers/ReviewerFormContainer.js
rename to packages/components/packages/xpub-review/src/components/reviewers/ReviewerFormContainer.js
diff --git a/packages/component-review/src/components/reviewers/Reviewers.js b/packages/components/packages/xpub-review/src/components/reviewers/Reviewers.js
similarity index 100%
rename from packages/component-review/src/components/reviewers/Reviewers.js
rename to packages/components/packages/xpub-review/src/components/reviewers/Reviewers.js
diff --git a/packages/component-review/src/components/reviewers/Reviewers.md b/packages/components/packages/xpub-review/src/components/reviewers/Reviewers.md
similarity index 100%
rename from packages/component-review/src/components/reviewers/Reviewers.md
rename to packages/components/packages/xpub-review/src/components/reviewers/Reviewers.md
diff --git a/packages/component-review/src/index.js b/packages/components/packages/xpub-review/src/index.js
similarity index 100%
rename from packages/component-review/src/index.js
rename to packages/components/packages/xpub-review/src/index.js
diff --git a/packages/component-review/src/redux/index.js b/packages/components/packages/xpub-review/src/redux/index.js
similarity index 100%
rename from packages/component-review/src/redux/index.js
rename to packages/components/packages/xpub-review/src/redux/index.js
diff --git a/packages/component-review/styleguide.config.js b/packages/components/packages/xpub-review/styleguide.config.js
similarity index 100%
rename from packages/component-review/styleguide.config.js
rename to packages/components/packages/xpub-review/styleguide.config.js
diff --git a/packages/component-submit/webpack.config.js b/packages/components/packages/xpub-review/webpack.config.js
similarity index 100%
rename from packages/component-submit/webpack.config.js
rename to packages/components/packages/xpub-review/webpack.config.js
diff --git a/packages/xpub-selectors/README.md b/packages/components/packages/xpub-selectors/README.md
similarity index 100%
rename from packages/xpub-selectors/README.md
rename to packages/components/packages/xpub-selectors/README.md
diff --git a/packages/xpub-selectors/package.json b/packages/components/packages/xpub-selectors/package.json
similarity index 100%
rename from packages/xpub-selectors/package.json
rename to packages/components/packages/xpub-selectors/package.json
diff --git a/packages/xpub-selectors/src/index.js b/packages/components/packages/xpub-selectors/src/index.js
similarity index 100%
rename from packages/xpub-selectors/src/index.js
rename to packages/components/packages/xpub-selectors/src/index.js
diff --git a/packages/xpub-styleguide/package.json b/packages/components/packages/xpub-styleguide/package.json
similarity index 100%
rename from packages/xpub-styleguide/package.json
rename to packages/components/packages/xpub-styleguide/package.json
diff --git a/packages/xpub-styleguide/src/components/StyleGuideRenderer.js b/packages/components/packages/xpub-styleguide/src/components/StyleGuideRenderer.js
similarity index 100%
rename from packages/xpub-styleguide/src/components/StyleGuideRenderer.js
rename to packages/components/packages/xpub-styleguide/src/components/StyleGuideRenderer.js
diff --git a/packages/xpub-styleguide/src/components/Wrapper.js b/packages/components/packages/xpub-styleguide/src/components/Wrapper.js
similarity index 100%
rename from packages/xpub-styleguide/src/components/Wrapper.js
rename to packages/components/packages/xpub-styleguide/src/components/Wrapper.js
diff --git a/packages/xpub-styleguide/src/components/index.js b/packages/components/packages/xpub-styleguide/src/components/index.js
similarity index 100%
rename from packages/xpub-styleguide/src/components/index.js
rename to packages/components/packages/xpub-styleguide/src/components/index.js
diff --git a/packages/xpub-styleguide/src/config/journal/article-sections.js b/packages/components/packages/xpub-styleguide/src/config/journal/article-sections.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/article-sections.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/article-sections.js
diff --git a/packages/xpub-styleguide/src/config/journal/article-types.js b/packages/components/packages/xpub-styleguide/src/config/journal/article-types.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/article-types.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/article-types.js
diff --git a/packages/xpub-styleguide/src/config/journal/decisions.js b/packages/components/packages/xpub-styleguide/src/config/journal/decisions.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/decisions.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/decisions.js
diff --git a/packages/xpub-styleguide/src/config/journal/declarations.js b/packages/components/packages/xpub-styleguide/src/config/journal/declarations.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/declarations.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/declarations.js
diff --git a/packages/xpub-styleguide/src/config/journal/editors.js b/packages/components/packages/xpub-styleguide/src/config/journal/editors.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/editors.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/editors.js
diff --git a/packages/xpub-styleguide/src/config/journal/index.js b/packages/components/packages/xpub-styleguide/src/config/journal/index.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/index.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/index.js
diff --git a/packages/xpub-styleguide/src/config/journal/metadata.js b/packages/components/packages/xpub-styleguide/src/config/journal/metadata.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/metadata.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/metadata.js
diff --git a/packages/xpub-styleguide/src/config/journal/recommendations.js b/packages/components/packages/xpub-styleguide/src/config/journal/recommendations.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/recommendations.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/recommendations.js
diff --git a/packages/xpub-styleguide/src/config/journal/roles.js b/packages/components/packages/xpub-styleguide/src/config/journal/roles.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/roles.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/roles.js
diff --git a/packages/xpub-styleguide/src/config/journal/sections.js b/packages/components/packages/xpub-styleguide/src/config/journal/sections.js
similarity index 100%
rename from packages/xpub-styleguide/src/config/journal/sections.js
rename to packages/components/packages/xpub-styleguide/src/config/journal/sections.js
diff --git a/packages/xpub-styleguide/src/index.js b/packages/components/packages/xpub-styleguide/src/index.js
similarity index 100%
rename from packages/xpub-styleguide/src/index.js
rename to packages/components/packages/xpub-styleguide/src/index.js
diff --git a/packages/xpub-styleguide/src/webpack-config.js b/packages/components/packages/xpub-styleguide/src/webpack-config.js
similarity index 100%
rename from packages/xpub-styleguide/src/webpack-config.js
rename to packages/components/packages/xpub-styleguide/src/webpack-config.js
diff --git a/packages/component-submit/README.md b/packages/components/packages/xpub-submit/README.md
similarity index 100%
rename from packages/component-submit/README.md
rename to packages/components/packages/xpub-submit/README.md
diff --git a/packages/component-submit/package.json b/packages/components/packages/xpub-submit/package.json
similarity index 100%
rename from packages/component-submit/package.json
rename to packages/components/packages/xpub-submit/package.json
diff --git a/packages/component-submit/src/components/Confirm.js b/packages/components/packages/xpub-submit/src/components/Confirm.js
similarity index 100%
rename from packages/component-submit/src/components/Confirm.js
rename to packages/components/packages/xpub-submit/src/components/Confirm.js
diff --git a/packages/component-submit/src/components/Confirm.md b/packages/components/packages/xpub-submit/src/components/Confirm.md
similarity index 100%
rename from packages/component-submit/src/components/Confirm.md
rename to packages/components/packages/xpub-submit/src/components/Confirm.md
diff --git a/packages/component-submit/src/components/Declarations.js b/packages/components/packages/xpub-submit/src/components/Declarations.js
similarity index 100%
rename from packages/component-submit/src/components/Declarations.js
rename to packages/components/packages/xpub-submit/src/components/Declarations.js
diff --git a/packages/component-submit/src/components/Declarations.md b/packages/components/packages/xpub-submit/src/components/Declarations.md
similarity index 100%
rename from packages/component-submit/src/components/Declarations.md
rename to packages/components/packages/xpub-submit/src/components/Declarations.md
diff --git a/packages/component-submit/src/components/Metadata.js b/packages/components/packages/xpub-submit/src/components/Metadata.js
similarity index 100%
rename from packages/component-submit/src/components/Metadata.js
rename to packages/components/packages/xpub-submit/src/components/Metadata.js
diff --git a/packages/component-submit/src/components/Metadata.md b/packages/components/packages/xpub-submit/src/components/Metadata.md
similarity index 100%
rename from packages/component-submit/src/components/Metadata.md
rename to packages/components/packages/xpub-submit/src/components/Metadata.md
diff --git a/packages/component-submit/src/components/Notes.js b/packages/components/packages/xpub-submit/src/components/Notes.js
similarity index 100%
rename from packages/component-submit/src/components/Notes.js
rename to packages/components/packages/xpub-submit/src/components/Notes.js
diff --git a/packages/component-submit/src/components/Notes.md b/packages/components/packages/xpub-submit/src/components/Notes.md
similarity index 100%
rename from packages/component-submit/src/components/Notes.md
rename to packages/components/packages/xpub-submit/src/components/Notes.md
diff --git a/packages/component-submit/src/components/Submit.js b/packages/components/packages/xpub-submit/src/components/Submit.js
similarity index 100%
rename from packages/component-submit/src/components/Submit.js
rename to packages/components/packages/xpub-submit/src/components/Submit.js
diff --git a/packages/component-submit/src/components/Submit.md b/packages/components/packages/xpub-submit/src/components/Submit.md
similarity index 100%
rename from packages/component-submit/src/components/Submit.md
rename to packages/components/packages/xpub-submit/src/components/Submit.md
diff --git a/packages/component-submit/src/components/SubmitPage.js b/packages/components/packages/xpub-submit/src/components/SubmitPage.js
similarity index 100%
rename from packages/component-submit/src/components/SubmitPage.js
rename to packages/components/packages/xpub-submit/src/components/SubmitPage.js
diff --git a/packages/component-submit/src/components/Suggestions.js b/packages/components/packages/xpub-submit/src/components/Suggestions.js
similarity index 100%
rename from packages/component-submit/src/components/Suggestions.js
rename to packages/components/packages/xpub-submit/src/components/Suggestions.js
diff --git a/packages/component-submit/src/components/Suggestions.md b/packages/components/packages/xpub-submit/src/components/Suggestions.md
similarity index 100%
rename from packages/component-submit/src/components/Suggestions.md
rename to packages/components/packages/xpub-submit/src/components/Suggestions.md
diff --git a/packages/component-submit/src/components/SupplementaryFiles.js b/packages/components/packages/xpub-submit/src/components/SupplementaryFiles.js
similarity index 100%
rename from packages/component-submit/src/components/SupplementaryFiles.js
rename to packages/components/packages/xpub-submit/src/components/SupplementaryFiles.js
diff --git a/packages/component-submit/src/components/SupplementaryFiles.md b/packages/components/packages/xpub-submit/src/components/SupplementaryFiles.md
similarity index 100%
rename from packages/component-submit/src/components/SupplementaryFiles.md
rename to packages/components/packages/xpub-submit/src/components/SupplementaryFiles.md
diff --git a/packages/component-submit/src/components/Validot.js b/packages/components/packages/xpub-submit/src/components/Validot.js
similarity index 100%
rename from packages/component-submit/src/components/Validot.js
rename to packages/components/packages/xpub-submit/src/components/Validot.js
diff --git a/packages/component-submit/src/components/Validot.md b/packages/components/packages/xpub-submit/src/components/Validot.md
similarity index 100%
rename from packages/component-submit/src/components/Validot.md
rename to packages/components/packages/xpub-submit/src/components/Validot.md
diff --git a/packages/component-submit/src/components/Validots.js b/packages/components/packages/xpub-submit/src/components/Validots.js
similarity index 100%
rename from packages/component-submit/src/components/Validots.js
rename to packages/components/packages/xpub-submit/src/components/Validots.js
diff --git a/packages/component-submit/src/components/index.js b/packages/components/packages/xpub-submit/src/components/index.js
similarity index 100%
rename from packages/component-submit/src/components/index.js
rename to packages/components/packages/xpub-submit/src/components/index.js
diff --git a/packages/component-submit/src/index.js b/packages/components/packages/xpub-submit/src/index.js
similarity index 100%
rename from packages/component-submit/src/index.js
rename to packages/components/packages/xpub-submit/src/index.js
diff --git a/packages/component-submit/src/styles/index.js b/packages/components/packages/xpub-submit/src/styles/index.js
similarity index 100%
rename from packages/component-submit/src/styles/index.js
rename to packages/components/packages/xpub-submit/src/styles/index.js
diff --git a/packages/component-submit/styleguide.config.js b/packages/components/packages/xpub-submit/styleguide.config.js
similarity index 100%
rename from packages/component-submit/styleguide.config.js
rename to packages/components/packages/xpub-submit/styleguide.config.js
diff --git a/packages/xpub-edit/webpack.config.js b/packages/components/packages/xpub-submit/webpack.config.js
similarity index 100%
rename from packages/xpub-edit/webpack.config.js
rename to packages/components/packages/xpub-submit/webpack.config.js
diff --git a/packages/xpub-theme/package.json b/packages/components/packages/xpub-theme/package.json
similarity index 100%
rename from packages/xpub-theme/package.json
rename to packages/components/packages/xpub-theme/package.json
diff --git a/packages/xpub-theme/src/index.js b/packages/components/packages/xpub-theme/src/index.js
similarity index 100%
rename from packages/xpub-theme/src/index.js
rename to packages/components/packages/xpub-theme/src/index.js
diff --git a/packages/xpub-theme/src/variables.css b/packages/components/packages/xpub-theme/src/variables.css
similarity index 100%
rename from packages/xpub-theme/src/variables.css
rename to packages/components/packages/xpub-theme/src/variables.css
diff --git a/packages/xpub-upload/README.md b/packages/components/packages/xpub-upload/README.md
similarity index 100%
rename from packages/xpub-upload/README.md
rename to packages/components/packages/xpub-upload/README.md
diff --git a/packages/xpub-upload/package.json b/packages/components/packages/xpub-upload/package.json
similarity index 100%
rename from packages/xpub-upload/package.json
rename to packages/components/packages/xpub-upload/package.json
diff --git a/packages/xpub-upload/src/index.js b/packages/components/packages/xpub-upload/src/index.js
similarity index 100%
rename from packages/xpub-upload/src/index.js
rename to packages/components/packages/xpub-upload/src/index.js
diff --git a/packages/xpub-upload/src/upload.js b/packages/components/packages/xpub-upload/src/upload.js
similarity index 100%
rename from packages/xpub-upload/src/upload.js
rename to packages/components/packages/xpub-upload/src/upload.js
diff --git a/packages/xpub-validators/README.md b/packages/components/packages/xpub-validators/README.md
similarity index 100%
rename from packages/xpub-validators/README.md
rename to packages/components/packages/xpub-validators/README.md
diff --git a/packages/xpub-validators/package.json b/packages/components/packages/xpub-validators/package.json
similarity index 100%
rename from packages/xpub-validators/package.json
rename to packages/components/packages/xpub-validators/package.json
diff --git a/packages/xpub-validators/src/index.js b/packages/components/packages/xpub-validators/src/index.js
similarity index 100%
rename from packages/xpub-validators/src/index.js
rename to packages/components/packages/xpub-validators/src/index.js