diff --git a/.gitignore b/.gitignore
index d4b2026c183d21a8015f621d5951128a23273257..a66f59479d71c2ea5915fe743a79299375f7a8f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,5 @@ Temporary Items
 .apdisk
 
 # End of https://www.gitignore.io/api/osx,linux
+
+node_modules/
diff --git a/lerna.json b/lerna.json
index 362f7f796993ae764cceb9d9eaa9345bbe45eb14..f16ce7a2a810db6b699224bb328653361167a965 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "lerna": "2.5.1",
   "packages": [
     "packages/*",
-    "packages/pubsweet-components/packages/*"
+    "packages/components/packages/*"
   ],
   "version": "0.0.0"
 }
diff --git a/package.json b/package.json
index 3f62244dabc0d43c5bd261aabedbfa91af5e1b60..5f33f6f062e7c74358c34393d9666ce939ee7fcb 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "lint": "npm run lint:js && npm run lint:style",
     "lint:js": "eslint packages",
     "lint:style": "stylelint packages/**/*.scss packages/**/*.css",
-    "precommit": "lint-staged"
+    "precommit": "lerna run --concurrency 1 --stream precommit"
   },
   "lint-staged": {
     "*.js": [
diff --git a/packages/pubsweet-cli/.eslintrc b/packages/cli/.eslintrc
similarity index 100%
rename from packages/pubsweet-cli/.eslintrc
rename to packages/cli/.eslintrc
diff --git a/packages/pubsweet-cli/.gitignore b/packages/cli/.gitignore
similarity index 100%
rename from packages/pubsweet-cli/.gitignore
rename to packages/cli/.gitignore
diff --git a/packages/pubsweet-cli/.gitlab-ci.yml b/packages/cli/.gitlab-ci.yml
similarity index 100%
rename from packages/pubsweet-cli/.gitlab-ci.yml
rename to packages/cli/.gitlab-ci.yml
diff --git a/packages/pubsweet-cli/.gitlab/merge_request_templates/mr.md b/packages/cli/.gitlab/merge_request_templates/mr.md
similarity index 100%
rename from packages/pubsweet-cli/.gitlab/merge_request_templates/mr.md
rename to packages/cli/.gitlab/merge_request_templates/mr.md
diff --git a/packages/pubsweet-cli/.nsprc b/packages/cli/.nsprc
similarity index 100%
rename from packages/pubsweet-cli/.nsprc
rename to packages/cli/.nsprc
diff --git a/packages/pubsweet-cli/.nvmrc b/packages/cli/.nvmrc
similarity index 100%
rename from packages/pubsweet-cli/.nvmrc
rename to packages/cli/.nvmrc
diff --git a/packages/pubsweet-cli/README.md b/packages/cli/README.md
similarity index 100%
rename from packages/pubsweet-cli/README.md
rename to packages/cli/README.md
diff --git a/packages/pubsweet-cli/bin/pubsweet-add.js b/packages/cli/bin/pubsweet-add.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-add.js
rename to packages/cli/bin/pubsweet-add.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-adduser.js b/packages/cli/bin/pubsweet-adduser.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-adduser.js
rename to packages/cli/bin/pubsweet-adduser.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-build.js b/packages/cli/bin/pubsweet-build.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-build.js
rename to packages/cli/bin/pubsweet-build.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-new.js b/packages/cli/bin/pubsweet-new.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-new.js
rename to packages/cli/bin/pubsweet-new.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-remove.js b/packages/cli/bin/pubsweet-remove.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-remove.js
rename to packages/cli/bin/pubsweet-remove.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-setupdb.js b/packages/cli/bin/pubsweet-setupdb.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-setupdb.js
rename to packages/cli/bin/pubsweet-setupdb.js
diff --git a/packages/pubsweet-cli/bin/pubsweet-start.js b/packages/cli/bin/pubsweet-start.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet-start.js
rename to packages/cli/bin/pubsweet-start.js
diff --git a/packages/pubsweet-cli/bin/pubsweet.js b/packages/cli/bin/pubsweet.js
similarity index 100%
rename from packages/pubsweet-cli/bin/pubsweet.js
rename to packages/cli/bin/pubsweet.js
diff --git a/packages/pubsweet-cli/cli/add.js b/packages/cli/cli/add.js
similarity index 100%
rename from packages/pubsweet-cli/cli/add.js
rename to packages/cli/cli/add.js
diff --git a/packages/pubsweet-cli/cli/adduser.js b/packages/cli/cli/adduser.js
similarity index 100%
rename from packages/pubsweet-cli/cli/adduser.js
rename to packages/cli/cli/adduser.js
diff --git a/packages/pubsweet-cli/cli/build.js b/packages/cli/cli/build.js
similarity index 100%
rename from packages/pubsweet-cli/cli/build.js
rename to packages/cli/cli/build.js
diff --git a/packages/pubsweet-cli/cli/new.js b/packages/cli/cli/new.js
similarity index 100%
rename from packages/pubsweet-cli/cli/new.js
rename to packages/cli/cli/new.js
diff --git a/packages/pubsweet-cli/cli/remove.js b/packages/cli/cli/remove.js
similarity index 100%
rename from packages/pubsweet-cli/cli/remove.js
rename to packages/cli/cli/remove.js
diff --git a/packages/pubsweet-cli/cli/setupdb.js b/packages/cli/cli/setupdb.js
similarity index 100%
rename from packages/pubsweet-cli/cli/setupdb.js
rename to packages/cli/cli/setupdb.js
diff --git a/packages/pubsweet-cli/cli/start.js b/packages/cli/cli/start.js
similarity index 100%
rename from packages/pubsweet-cli/cli/start.js
rename to packages/cli/cli/start.js
diff --git a/packages/pubsweet-cli/config/test.js b/packages/cli/config/test.js
similarity index 100%
rename from packages/pubsweet-cli/config/test.js
rename to packages/cli/config/test.js
diff --git a/packages/pubsweet-cli/logs/.gitkeep b/packages/cli/logs/.gitkeep
similarity index 100%
rename from packages/pubsweet-cli/logs/.gitkeep
rename to packages/cli/logs/.gitkeep
diff --git a/packages/pubsweet-cli/package.json b/packages/cli/package.json
similarity index 100%
rename from packages/pubsweet-cli/package.json
rename to packages/cli/package.json
diff --git a/packages/pubsweet-cli/src/constants.js b/packages/cli/src/constants.js
similarity index 100%
rename from packages/pubsweet-cli/src/constants.js
rename to packages/cli/src/constants.js
diff --git a/packages/pubsweet-cli/src/error-exit.js b/packages/cli/src/error-exit.js
similarity index 100%
rename from packages/pubsweet-cli/src/error-exit.js
rename to packages/cli/src/error-exit.js
diff --git a/packages/pubsweet-cli/src/package-management/add.js b/packages/cli/src/package-management/add.js
similarity index 100%
rename from packages/pubsweet-cli/src/package-management/add.js
rename to packages/cli/src/package-management/add.js
diff --git a/packages/pubsweet-cli/src/package-management/helpers/index.js b/packages/cli/src/package-management/helpers/index.js
similarity index 100%
rename from packages/pubsweet-cli/src/package-management/helpers/index.js
rename to packages/cli/src/package-management/helpers/index.js
diff --git a/packages/pubsweet-cli/src/package-management/index.js b/packages/cli/src/package-management/index.js
similarity index 100%
rename from packages/pubsweet-cli/src/package-management/index.js
rename to packages/cli/src/package-management/index.js
diff --git a/packages/pubsweet-cli/src/package-management/remove.js b/packages/cli/src/package-management/remove.js
similarity index 100%
rename from packages/pubsweet-cli/src/package-management/remove.js
rename to packages/cli/src/package-management/remove.js
diff --git a/packages/pubsweet-cli/src/run-prompt.js b/packages/cli/src/run-prompt.js
similarity index 100%
rename from packages/pubsweet-cli/src/run-prompt.js
rename to packages/cli/src/run-prompt.js
diff --git a/packages/pubsweet-cli/src/schemas/db.js b/packages/cli/src/schemas/db.js
similarity index 100%
rename from packages/pubsweet-cli/src/schemas/db.js
rename to packages/cli/src/schemas/db.js
diff --git a/packages/pubsweet-cli/src/schemas/index.js b/packages/cli/src/schemas/index.js
similarity index 100%
rename from packages/pubsweet-cli/src/schemas/index.js
rename to packages/cli/src/schemas/index.js
diff --git a/packages/pubsweet-cli/src/schemas/user.js b/packages/cli/src/schemas/user.js
similarity index 100%
rename from packages/pubsweet-cli/src/schemas/user.js
rename to packages/cli/src/schemas/user.js
diff --git a/packages/pubsweet-cli/src/startup/build.js b/packages/cli/src/startup/build.js
similarity index 100%
rename from packages/pubsweet-cli/src/startup/build.js
rename to packages/cli/src/startup/build.js
diff --git a/packages/pubsweet-cli/src/startup/index.js b/packages/cli/src/startup/index.js
similarity index 100%
rename from packages/pubsweet-cli/src/startup/index.js
rename to packages/cli/src/startup/index.js
diff --git a/packages/pubsweet-cli/src/startup/start.js b/packages/cli/src/startup/start.js
similarity index 100%
rename from packages/pubsweet-cli/src/startup/start.js
rename to packages/cli/src/startup/start.js
diff --git a/packages/pubsweet-cli/test/.eslintrc b/packages/cli/test/.eslintrc
similarity index 100%
rename from packages/pubsweet-cli/test/.eslintrc
rename to packages/cli/test/.eslintrc
diff --git a/packages/pubsweet-cli/test/cli/add.js b/packages/cli/test/cli/add.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/add.js
rename to packages/cli/test/cli/add.js
diff --git a/packages/pubsweet-cli/test/cli/adduser.js b/packages/cli/test/cli/adduser.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/adduser.js
rename to packages/cli/test/cli/adduser.js
diff --git a/packages/pubsweet-cli/test/cli/new.js b/packages/cli/test/cli/new.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/new.js
rename to packages/cli/test/cli/new.js
diff --git a/packages/pubsweet-cli/test/cli/remove.js b/packages/cli/test/cli/remove.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/remove.js
rename to packages/cli/test/cli/remove.js
diff --git a/packages/pubsweet-cli/test/cli/setupdb.js b/packages/cli/test/cli/setupdb.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/setupdb.js
rename to packages/cli/test/cli/setupdb.js
diff --git a/packages/pubsweet-cli/test/cli/start.js b/packages/cli/test/cli/start.js
similarity index 100%
rename from packages/pubsweet-cli/test/cli/start.js
rename to packages/cli/test/cli/start.js
diff --git a/packages/pubsweet-cli/test/helpers/index.js b/packages/cli/test/helpers/index.js
similarity index 100%
rename from packages/pubsweet-cli/test/helpers/index.js
rename to packages/cli/test/helpers/index.js
diff --git a/packages/pubsweet-cli/test/integration.js b/packages/cli/test/integration.js
similarity index 100%
rename from packages/pubsweet-cli/test/integration.js
rename to packages/cli/test/integration.js
diff --git a/packages/pubsweet-cli/yarn.lock b/packages/cli/yarn.lock
similarity index 100%
rename from packages/pubsweet-cli/yarn.lock
rename to packages/cli/yarn.lock
diff --git a/packages/pubsweet-client/.babelrc b/packages/client/.babelrc
similarity index 100%
rename from packages/pubsweet-client/.babelrc
rename to packages/client/.babelrc
diff --git a/packages/pubsweet-client/.eslintrc b/packages/client/.eslintrc
similarity index 100%
rename from packages/pubsweet-client/.eslintrc
rename to packages/client/.eslintrc
diff --git a/packages/pubsweet-client/.gitignore b/packages/client/.gitignore
similarity index 100%
rename from packages/pubsweet-client/.gitignore
rename to packages/client/.gitignore
diff --git a/packages/pubsweet-client/.gitlab-ci.yml b/packages/client/.gitlab-ci.yml
similarity index 100%
rename from packages/pubsweet-client/.gitlab-ci.yml
rename to packages/client/.gitlab-ci.yml
diff --git a/packages/pubsweet-client/.lintstagedrc b/packages/client/.lintstagedrc
similarity index 100%
rename from packages/pubsweet-client/.lintstagedrc
rename to packages/client/.lintstagedrc
diff --git a/packages/pubsweet-client/.prettierrc b/packages/client/.prettierrc
similarity index 100%
rename from packages/pubsweet-client/.prettierrc
rename to packages/client/.prettierrc
diff --git a/packages/pubsweet-client/CONTRIBUTING.md b/packages/client/CONTRIBUTING.md
similarity index 100%
rename from packages/pubsweet-client/CONTRIBUTING.md
rename to packages/client/CONTRIBUTING.md
diff --git a/packages/pubsweet-client/LICENSE b/packages/client/LICENSE
similarity index 100%
rename from packages/pubsweet-client/LICENSE
rename to packages/client/LICENSE
diff --git a/packages/pubsweet-client/README.md b/packages/client/README.md
similarity index 100%
rename from packages/pubsweet-client/README.md
rename to packages/client/README.md
diff --git a/packages/pubsweet-client/config/default.js b/packages/client/config/default.js
similarity index 100%
rename from packages/pubsweet-client/config/default.js
rename to packages/client/config/default.js
diff --git a/packages/pubsweet-client/config/test.js b/packages/client/config/test.js
similarity index 100%
rename from packages/pubsweet-client/config/test.js
rename to packages/client/config/test.js
diff --git a/packages/pubsweet-client/package.json b/packages/client/package.json
similarity index 100%
rename from packages/pubsweet-client/package.json
rename to packages/client/package.json
diff --git a/packages/pubsweet-client/src/actions/collections.js b/packages/client/src/actions/collections.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/collections.js
rename to packages/client/src/actions/collections.js
diff --git a/packages/pubsweet-client/src/actions/currentUser.js b/packages/client/src/actions/currentUser.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/currentUser.js
rename to packages/client/src/actions/currentUser.js
diff --git a/packages/pubsweet-client/src/actions/fileUpload.js b/packages/client/src/actions/fileUpload.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/fileUpload.js
rename to packages/client/src/actions/fileUpload.js
diff --git a/packages/pubsweet-client/src/actions/fragments.js b/packages/client/src/actions/fragments.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/fragments.js
rename to packages/client/src/actions/fragments.js
diff --git a/packages/pubsweet-client/src/actions/index.js b/packages/client/src/actions/index.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/index.js
rename to packages/client/src/actions/index.js
diff --git a/packages/pubsweet-client/src/actions/teams.js b/packages/client/src/actions/teams.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/teams.js
rename to packages/client/src/actions/teams.js
diff --git a/packages/pubsweet-client/src/actions/types.js b/packages/client/src/actions/types.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/types.js
rename to packages/client/src/actions/types.js
diff --git a/packages/pubsweet-client/src/actions/users.js b/packages/client/src/actions/users.js
similarity index 100%
rename from packages/pubsweet-client/src/actions/users.js
rename to packages/client/src/actions/users.js
diff --git a/packages/pubsweet-client/src/components/AuthenticatedComponent.jsx b/packages/client/src/components/AuthenticatedComponent.jsx
similarity index 100%
rename from packages/pubsweet-client/src/components/AuthenticatedComponent.jsx
rename to packages/client/src/components/AuthenticatedComponent.jsx
diff --git a/packages/pubsweet-client/src/components/Root.js b/packages/client/src/components/Root.js
similarity index 100%
rename from packages/pubsweet-client/src/components/Root.js
rename to packages/client/src/components/Root.js
diff --git a/packages/pubsweet-client/src/components/UpdateSubscriber.jsx b/packages/client/src/components/UpdateSubscriber.jsx
similarity index 100%
rename from packages/pubsweet-client/src/components/UpdateSubscriber.jsx
rename to packages/client/src/components/UpdateSubscriber.jsx
diff --git a/packages/pubsweet-client/src/components/actions.js b/packages/client/src/components/actions.js
similarity index 100%
rename from packages/pubsweet-client/src/components/actions.js
rename to packages/client/src/components/actions.js
diff --git a/packages/pubsweet-client/src/components/index.js b/packages/client/src/components/index.js
similarity index 100%
rename from packages/pubsweet-client/src/components/index.js
rename to packages/client/src/components/index.js
diff --git a/packages/pubsweet-client/src/components/reducers.js b/packages/client/src/components/reducers.js
similarity index 100%
rename from packages/pubsweet-client/src/components/reducers.js
rename to packages/client/src/components/reducers.js
diff --git a/packages/pubsweet-client/src/helpers/Authorize.jsx b/packages/client/src/helpers/Authorize.jsx
similarity index 100%
rename from packages/pubsweet-client/src/helpers/Authorize.jsx
rename to packages/client/src/helpers/Authorize.jsx
diff --git a/packages/pubsweet-client/src/helpers/Utils.js b/packages/client/src/helpers/Utils.js
similarity index 100%
rename from packages/pubsweet-client/src/helpers/Utils.js
rename to packages/client/src/helpers/Utils.js
diff --git a/packages/pubsweet-client/src/helpers/api.js b/packages/client/src/helpers/api.js
similarity index 100%
rename from packages/pubsweet-client/src/helpers/api.js
rename to packages/client/src/helpers/api.js
diff --git a/packages/pubsweet-client/src/helpers/endpoint.js b/packages/client/src/helpers/endpoint.js
similarity index 100%
rename from packages/pubsweet-client/src/helpers/endpoint.js
rename to packages/client/src/helpers/endpoint.js
diff --git a/packages/pubsweet-client/src/helpers/token.js b/packages/client/src/helpers/token.js
similarity index 100%
rename from packages/pubsweet-client/src/helpers/token.js
rename to packages/client/src/helpers/token.js
diff --git a/packages/pubsweet-client/src/helpers/withAuthsome.js b/packages/client/src/helpers/withAuthsome.js
similarity index 100%
rename from packages/pubsweet-client/src/helpers/withAuthsome.js
rename to packages/client/src/helpers/withAuthsome.js
diff --git a/packages/pubsweet-client/src/images/pubsweet-rgb-small.jpg b/packages/client/src/images/pubsweet-rgb-small.jpg
similarity index 100%
rename from packages/pubsweet-client/src/images/pubsweet-rgb-small.jpg
rename to packages/client/src/images/pubsweet-rgb-small.jpg
diff --git a/packages/pubsweet-client/src/index.js b/packages/client/src/index.js
similarity index 100%
rename from packages/pubsweet-client/src/index.js
rename to packages/client/src/index.js
diff --git a/packages/pubsweet-client/src/reducers/collections.js b/packages/client/src/reducers/collections.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/collections.js
rename to packages/client/src/reducers/collections.js
diff --git a/packages/pubsweet-client/src/reducers/currentUser.js b/packages/client/src/reducers/currentUser.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/currentUser.js
rename to packages/client/src/reducers/currentUser.js
diff --git a/packages/pubsweet-client/src/reducers/error.js b/packages/client/src/reducers/error.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/error.js
rename to packages/client/src/reducers/error.js
diff --git a/packages/pubsweet-client/src/reducers/fileUpload.js b/packages/client/src/reducers/fileUpload.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/fileUpload.js
rename to packages/client/src/reducers/fileUpload.js
diff --git a/packages/pubsweet-client/src/reducers/fragments.js b/packages/client/src/reducers/fragments.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/fragments.js
rename to packages/client/src/reducers/fragments.js
diff --git a/packages/pubsweet-client/src/reducers/index.js b/packages/client/src/reducers/index.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/index.js
rename to packages/client/src/reducers/index.js
diff --git a/packages/pubsweet-client/src/reducers/teams.js b/packages/client/src/reducers/teams.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/teams.js
rename to packages/client/src/reducers/teams.js
diff --git a/packages/pubsweet-client/src/reducers/users.js b/packages/client/src/reducers/users.js
similarity index 100%
rename from packages/pubsweet-client/src/reducers/users.js
rename to packages/client/src/reducers/users.js
diff --git a/packages/pubsweet-client/src/store/configureStore.js b/packages/client/src/store/configureStore.js
similarity index 100%
rename from packages/pubsweet-client/src/store/configureStore.js
rename to packages/client/src/store/configureStore.js
diff --git a/packages/pubsweet-client/src/validations.js b/packages/client/src/validations.js
similarity index 100%
rename from packages/pubsweet-client/src/validations.js
rename to packages/client/src/validations.js
diff --git a/packages/pubsweet-client/test/.eslintrc b/packages/client/test/.eslintrc
similarity index 100%
rename from packages/pubsweet-client/test/.eslintrc
rename to packages/client/test/.eslintrc
diff --git a/packages/pubsweet-client/test/actions/collections.test.js b/packages/client/test/actions/collections.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/collections.test.js
rename to packages/client/test/actions/collections.test.js
diff --git a/packages/pubsweet-client/test/actions/currentUser.test.js b/packages/client/test/actions/currentUser.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/currentUser.test.js
rename to packages/client/test/actions/currentUser.test.js
diff --git a/packages/pubsweet-client/test/actions/fileUpload.test.js b/packages/client/test/actions/fileUpload.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/fileUpload.test.js
rename to packages/client/test/actions/fileUpload.test.js
diff --git a/packages/pubsweet-client/test/actions/fragments.test.js b/packages/client/test/actions/fragments.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/fragments.test.js
rename to packages/client/test/actions/fragments.test.js
diff --git a/packages/pubsweet-client/test/actions/index.test.js b/packages/client/test/actions/index.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/index.test.js
rename to packages/client/test/actions/index.test.js
diff --git a/packages/pubsweet-client/test/actions/teams.test.js b/packages/client/test/actions/teams.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/teams.test.js
rename to packages/client/test/actions/teams.test.js
diff --git a/packages/pubsweet-client/test/actions/users.test.js b/packages/client/test/actions/users.test.js
similarity index 100%
rename from packages/pubsweet-client/test/actions/users.test.js
rename to packages/client/test/actions/users.test.js
diff --git a/packages/pubsweet-client/test/components/AuthenticatedComponent.test.jsx b/packages/client/test/components/AuthenticatedComponent.test.jsx
similarity index 100%
rename from packages/pubsweet-client/test/components/AuthenticatedComponent.test.jsx
rename to packages/client/test/components/AuthenticatedComponent.test.jsx
diff --git a/packages/pubsweet-client/test/components/Root.test.jsx b/packages/client/test/components/Root.test.jsx
similarity index 100%
rename from packages/pubsweet-client/test/components/Root.test.jsx
rename to packages/client/test/components/Root.test.jsx
diff --git a/packages/pubsweet-client/test/components/UpdateSubscriber.test.jsx b/packages/client/test/components/UpdateSubscriber.test.jsx
similarity index 100%
rename from packages/pubsweet-client/test/components/UpdateSubscriber.test.jsx
rename to packages/client/test/components/UpdateSubscriber.test.jsx
diff --git a/packages/pubsweet-client/test/components/actions.test.js b/packages/client/test/components/actions.test.js
similarity index 100%
rename from packages/pubsweet-client/test/components/actions.test.js
rename to packages/client/test/components/actions.test.js
diff --git a/packages/pubsweet-client/test/components/reducers.test.js b/packages/client/test/components/reducers.test.js
similarity index 100%
rename from packages/pubsweet-client/test/components/reducers.test.js
rename to packages/client/test/components/reducers.test.js
diff --git a/packages/pubsweet-client/test/helpers/Authorize.test.jsx b/packages/client/test/helpers/Authorize.test.jsx
similarity index 100%
rename from packages/pubsweet-client/test/helpers/Authorize.test.jsx
rename to packages/client/test/helpers/Authorize.test.jsx
diff --git a/packages/pubsweet-client/test/helpers/api.test.js b/packages/client/test/helpers/api.test.js
similarity index 100%
rename from packages/pubsweet-client/test/helpers/api.test.js
rename to packages/client/test/helpers/api.test.js
diff --git a/packages/pubsweet-client/test/helpers/describeAction.js b/packages/client/test/helpers/describeAction.js
similarity index 100%
rename from packages/pubsweet-client/test/helpers/describeAction.js
rename to packages/client/test/helpers/describeAction.js
diff --git a/packages/pubsweet-client/test/helpers/withAuthsome.test.js b/packages/client/test/helpers/withAuthsome.test.js
similarity index 100%
rename from packages/pubsweet-client/test/helpers/withAuthsome.test.js
rename to packages/client/test/helpers/withAuthsome.test.js
diff --git a/packages/pubsweet-client/test/reducers/collections.test.js b/packages/client/test/reducers/collections.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/collections.test.js
rename to packages/client/test/reducers/collections.test.js
diff --git a/packages/pubsweet-client/test/reducers/currentUser.test.js b/packages/client/test/reducers/currentUser.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/currentUser.test.js
rename to packages/client/test/reducers/currentUser.test.js
diff --git a/packages/pubsweet-client/test/reducers/error.test.js b/packages/client/test/reducers/error.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/error.test.js
rename to packages/client/test/reducers/error.test.js
diff --git a/packages/pubsweet-client/test/reducers/fileUpload.test.js b/packages/client/test/reducers/fileUpload.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/fileUpload.test.js
rename to packages/client/test/reducers/fileUpload.test.js
diff --git a/packages/pubsweet-client/test/reducers/fragments.test.js b/packages/client/test/reducers/fragments.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/fragments.test.js
rename to packages/client/test/reducers/fragments.test.js
diff --git a/packages/pubsweet-client/test/reducers/teams.test.js b/packages/client/test/reducers/teams.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/teams.test.js
rename to packages/client/test/reducers/teams.test.js
diff --git a/packages/pubsweet-client/test/reducers/users.test.js b/packages/client/test/reducers/users.test.js
similarity index 100%
rename from packages/pubsweet-client/test/reducers/users.test.js
rename to packages/client/test/reducers/users.test.js
diff --git a/packages/pubsweet-client/test/store/configureStore.test.js b/packages/client/test/store/configureStore.test.js
similarity index 100%
rename from packages/pubsweet-client/test/store/configureStore.test.js
rename to packages/client/test/store/configureStore.test.js
diff --git a/packages/pubsweet-client/yarn.lock b/packages/client/yarn.lock
similarity index 100%
rename from packages/pubsweet-client/yarn.lock
rename to packages/client/yarn.lock
diff --git a/packages/pubsweet-components/.babelrc b/packages/components/.babelrc
similarity index 100%
rename from packages/pubsweet-components/.babelrc
rename to packages/components/.babelrc
diff --git a/packages/pubsweet-components/.eslintrc b/packages/components/.eslintrc
similarity index 100%
rename from packages/pubsweet-components/.eslintrc
rename to packages/components/.eslintrc
diff --git a/packages/pubsweet-components/.gitignore b/packages/components/.gitignore
similarity index 100%
rename from packages/pubsweet-components/.gitignore
rename to packages/components/.gitignore
diff --git a/packages/pubsweet-components/.gitlab-ci.yml b/packages/components/.gitlab-ci.yml
similarity index 100%
rename from packages/pubsweet-components/.gitlab-ci.yml
rename to packages/components/.gitlab-ci.yml
diff --git a/packages/pubsweet-components/README.md b/packages/components/README.md
similarity index 100%
rename from packages/pubsweet-components/README.md
rename to packages/components/README.md
diff --git a/packages/pubsweet-components/config/test.json b/packages/components/config/test.json
similarity index 100%
rename from packages/pubsweet-components/config/test.json
rename to packages/components/config/test.json
diff --git a/packages/pubsweet-components/lerna.json b/packages/components/lerna.json
similarity index 100%
rename from packages/pubsweet-components/lerna.json
rename to packages/components/lerna.json
diff --git a/packages/pubsweet-components/package.json b/packages/components/package.json
similarity index 96%
rename from packages/pubsweet-components/package.json
rename to packages/components/package.json
index 91858485225fe1660e51f5ba4cab6ce8dabdea8f..0f5d24709ed6bc5d5b47f3036dbb67dc90981067 100644
--- a/packages/pubsweet-components/package.json
+++ b/packages/components/package.json
@@ -1,4 +1,6 @@
 {
+  "name": "pubsweet-components",
+  "version": "0.0.0",
   "scripts": {
     "lint": "eslint 'packages/*/*.{js,jsx}'",
     "postinstall": "lerna bootstrap",
diff --git a/packages/pubsweet-components/packages/Blog/Blog.jsx b/packages/components/packages/Blog/Blog.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Blog.jsx
rename to packages/components/packages/Blog/Blog.jsx
diff --git a/packages/pubsweet-components/packages/Blog/Blog.local.scss b/packages/components/packages/Blog/Blog.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Blog.local.scss
rename to packages/components/packages/Blog/Blog.local.scss
diff --git a/packages/pubsweet-components/packages/Blog/Blog.md b/packages/components/packages/Blog/Blog.md
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Blog.md
rename to packages/components/packages/Blog/Blog.md
diff --git a/packages/pubsweet-components/packages/Blog/Blog.test.jsx b/packages/components/packages/Blog/Blog.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Blog.test.jsx
rename to packages/components/packages/Blog/Blog.test.jsx
diff --git a/packages/pubsweet-components/packages/Blog/BlogContainer.js b/packages/components/packages/Blog/BlogContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/BlogContainer.js
rename to packages/components/packages/Blog/BlogContainer.js
diff --git a/packages/pubsweet-components/packages/Blog/BlogContainer.test.js b/packages/components/packages/Blog/BlogContainer.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/BlogContainer.test.js
rename to packages/components/packages/Blog/BlogContainer.test.js
diff --git a/packages/pubsweet-components/packages/Blog/Summary.jsx b/packages/components/packages/Blog/Summary.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Summary.jsx
rename to packages/components/packages/Blog/Summary.jsx
diff --git a/packages/pubsweet-components/packages/Blog/Summary.md b/packages/components/packages/Blog/Summary.md
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Summary.md
rename to packages/components/packages/Blog/Summary.md
diff --git a/packages/pubsweet-components/packages/Blog/Summary.scss b/packages/components/packages/Blog/Summary.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Summary.scss
rename to packages/components/packages/Blog/Summary.scss
diff --git a/packages/pubsweet-components/packages/Blog/Summary.test.jsx b/packages/components/packages/Blog/Summary.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/Summary.test.jsx
rename to packages/components/packages/Blog/Summary.test.jsx
diff --git a/packages/pubsweet-components/packages/Blog/index.js b/packages/components/packages/Blog/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/index.js
rename to packages/components/packages/Blog/index.js
diff --git a/packages/pubsweet-components/packages/Blog/package.json b/packages/components/packages/Blog/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/package.json
rename to packages/components/packages/Blog/package.json
diff --git a/packages/pubsweet-components/packages/Blog/yarn.lock b/packages/components/packages/Blog/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Blog/yarn.lock
rename to packages/components/packages/Blog/yarn.lock
diff --git a/packages/pubsweet-components/packages/Draft.js/Draft.jsx b/packages/components/packages/Draft.js/Draft.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/Draft.jsx
rename to packages/components/packages/Draft.js/Draft.jsx
diff --git a/packages/pubsweet-components/packages/Draft.js/Draft.md b/packages/components/packages/Draft.js/Draft.md
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/Draft.md
rename to packages/components/packages/Draft.js/Draft.md
diff --git a/packages/pubsweet-components/packages/Draft.js/DraftContainer.js b/packages/components/packages/Draft.js/DraftContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/DraftContainer.js
rename to packages/components/packages/Draft.js/DraftContainer.js
diff --git a/packages/pubsweet-components/packages/Draft.js/index.js b/packages/components/packages/Draft.js/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/index.js
rename to packages/components/packages/Draft.js/index.js
diff --git a/packages/pubsweet-components/packages/Draft.js/package.json b/packages/components/packages/Draft.js/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/package.json
rename to packages/components/packages/Draft.js/package.json
diff --git a/packages/pubsweet-components/packages/Draft.js/yarn.lock b/packages/components/packages/Draft.js/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Draft.js/yarn.lock
rename to packages/components/packages/Draft.js/yarn.lock
diff --git a/packages/pubsweet-components/packages/Epub/EpubBackend.js b/packages/components/packages/Epub/EpubBackend.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/EpubBackend.js
rename to packages/components/packages/Epub/EpubBackend.js
diff --git a/packages/pubsweet-components/packages/Epub/EpubBackend.test.js b/packages/components/packages/Epub/EpubBackend.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/EpubBackend.test.js
rename to packages/components/packages/Epub/EpubBackend.test.js
diff --git a/packages/pubsweet-components/packages/Epub/converters/index.js b/packages/components/packages/Epub/converters/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/converters/index.js
rename to packages/components/packages/Epub/converters/index.js
diff --git a/packages/pubsweet-components/packages/Epub/converters/wax.js b/packages/components/packages/Epub/converters/wax.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/converters/wax.js
rename to packages/components/packages/Epub/converters/wax.js
diff --git a/packages/pubsweet-components/packages/Epub/index.js b/packages/components/packages/Epub/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/index.js
rename to packages/components/packages/Epub/index.js
diff --git a/packages/pubsweet-components/packages/Epub/output.js b/packages/components/packages/Epub/output.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/output.js
rename to packages/components/packages/Epub/output.js
diff --git a/packages/pubsweet-components/packages/Epub/package.json b/packages/components/packages/Epub/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/package.json
rename to packages/components/packages/Epub/package.json
diff --git a/packages/pubsweet-components/packages/Epub/process.js b/packages/components/packages/Epub/process.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/process.js
rename to packages/components/packages/Epub/process.js
diff --git a/packages/pubsweet-components/packages/Epub/process.test.js b/packages/components/packages/Epub/process.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/process.test.js
rename to packages/components/packages/Epub/process.test.js
diff --git a/packages/pubsweet-components/packages/Epub/sorter.js b/packages/components/packages/Epub/sorter.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/sorter.js
rename to packages/components/packages/Epub/sorter.js
diff --git a/packages/pubsweet-components/packages/Epub/sorter.test.js b/packages/components/packages/Epub/sorter.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/sorter.test.js
rename to packages/components/packages/Epub/sorter.test.js
diff --git a/packages/pubsweet-components/packages/Epub/themes/default.css b/packages/components/packages/Epub/themes/default.css
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/themes/default.css
rename to packages/components/packages/Epub/themes/default.css
diff --git a/packages/pubsweet-components/packages/Epub/yarn.lock b/packages/components/packages/Epub/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Epub/yarn.lock
rename to packages/components/packages/Epub/yarn.lock
diff --git a/packages/pubsweet-components/packages/EpubFrontend/actions.js b/packages/components/packages/EpubFrontend/actions.js
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/actions.js
rename to packages/components/packages/EpubFrontend/actions.js
diff --git a/packages/pubsweet-components/packages/EpubFrontend/index.js b/packages/components/packages/EpubFrontend/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/index.js
rename to packages/components/packages/EpubFrontend/index.js
diff --git a/packages/pubsweet-components/packages/EpubFrontend/package.json b/packages/components/packages/EpubFrontend/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/package.json
rename to packages/components/packages/EpubFrontend/package.json
diff --git a/packages/pubsweet-components/packages/EpubFrontend/reducers.js b/packages/components/packages/EpubFrontend/reducers.js
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/reducers.js
rename to packages/components/packages/EpubFrontend/reducers.js
diff --git a/packages/pubsweet-components/packages/EpubFrontend/types.js b/packages/components/packages/EpubFrontend/types.js
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/types.js
rename to packages/components/packages/EpubFrontend/types.js
diff --git a/packages/pubsweet-components/packages/EpubFrontend/yarn.lock b/packages/components/packages/EpubFrontend/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/EpubFrontend/yarn.lock
rename to packages/components/packages/EpubFrontend/yarn.lock
diff --git a/packages/pubsweet-components/packages/FormGroup/FormGroup.jsx b/packages/components/packages/FormGroup/FormGroup.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/FormGroup.jsx
rename to packages/components/packages/FormGroup/FormGroup.jsx
diff --git a/packages/pubsweet-components/packages/FormGroup/FormGroup.test.jsx b/packages/components/packages/FormGroup/FormGroup.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/FormGroup.test.jsx
rename to packages/components/packages/FormGroup/FormGroup.test.jsx
diff --git a/packages/pubsweet-components/packages/FormGroup/README.md b/packages/components/packages/FormGroup/README.md
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/README.md
rename to packages/components/packages/FormGroup/README.md
diff --git a/packages/pubsweet-components/packages/FormGroup/index.js b/packages/components/packages/FormGroup/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/index.js
rename to packages/components/packages/FormGroup/index.js
diff --git a/packages/pubsweet-components/packages/FormGroup/package.json b/packages/components/packages/FormGroup/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/package.json
rename to packages/components/packages/FormGroup/package.json
diff --git a/packages/pubsweet-components/packages/FormGroup/yarn.lock b/packages/components/packages/FormGroup/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/FormGroup/yarn.lock
rename to packages/components/packages/FormGroup/yarn.lock
diff --git a/packages/pubsweet-components/packages/HTML/HTML.jsx b/packages/components/packages/HTML/HTML.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTML.jsx
rename to packages/components/packages/HTML/HTML.jsx
diff --git a/packages/pubsweet-components/packages/HTML/HTML.md b/packages/components/packages/HTML/HTML.md
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTML.md
rename to packages/components/packages/HTML/HTML.md
diff --git a/packages/pubsweet-components/packages/HTML/HTML.scss b/packages/components/packages/HTML/HTML.scss
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTML.scss
rename to packages/components/packages/HTML/HTML.scss
diff --git a/packages/pubsweet-components/packages/HTML/HTML.test.jsx b/packages/components/packages/HTML/HTML.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTML.test.jsx
rename to packages/components/packages/HTML/HTML.test.jsx
diff --git a/packages/pubsweet-components/packages/HTML/HTMLContainer.js b/packages/components/packages/HTML/HTMLContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTMLContainer.js
rename to packages/components/packages/HTML/HTMLContainer.js
diff --git a/packages/pubsweet-components/packages/HTML/HTMLContainer.test.jsx b/packages/components/packages/HTML/HTMLContainer.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/HTMLContainer.test.jsx
rename to packages/components/packages/HTML/HTMLContainer.test.jsx
diff --git a/packages/pubsweet-components/packages/HTML/index.js b/packages/components/packages/HTML/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/index.js
rename to packages/components/packages/HTML/index.js
diff --git a/packages/pubsweet-components/packages/HTML/package.json b/packages/components/packages/HTML/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/package.json
rename to packages/components/packages/HTML/package.json
diff --git a/packages/pubsweet-components/packages/HTML/yarn.lock b/packages/components/packages/HTML/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/HTML/yarn.lock
rename to packages/components/packages/HTML/yarn.lock
diff --git a/packages/pubsweet-components/packages/InkBackend/InkBackend.js b/packages/components/packages/InkBackend/InkBackend.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkBackend/InkBackend.js
rename to packages/components/packages/InkBackend/InkBackend.js
diff --git a/packages/pubsweet-components/packages/InkBackend/index.js b/packages/components/packages/InkBackend/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkBackend/index.js
rename to packages/components/packages/InkBackend/index.js
diff --git a/packages/pubsweet-components/packages/InkBackend/package.json b/packages/components/packages/InkBackend/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/InkBackend/package.json
rename to packages/components/packages/InkBackend/package.json
diff --git a/packages/pubsweet-components/packages/InkBackend/yarn.lock b/packages/components/packages/InkBackend/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/InkBackend/yarn.lock
rename to packages/components/packages/InkBackend/yarn.lock
diff --git a/packages/pubsweet-components/packages/InkFrontend/InkFrontend.jsx b/packages/components/packages/InkFrontend/InkFrontend.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/InkFrontend.jsx
rename to packages/components/packages/InkFrontend/InkFrontend.jsx
diff --git a/packages/pubsweet-components/packages/InkFrontend/InkFrontendContainer.js b/packages/components/packages/InkFrontend/InkFrontendContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/InkFrontendContainer.js
rename to packages/components/packages/InkFrontend/InkFrontendContainer.js
diff --git a/packages/pubsweet-components/packages/InkFrontend/actions.js b/packages/components/packages/InkFrontend/actions.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/actions.js
rename to packages/components/packages/InkFrontend/actions.js
diff --git a/packages/pubsweet-components/packages/InkFrontend/index.js b/packages/components/packages/InkFrontend/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/index.js
rename to packages/components/packages/InkFrontend/index.js
diff --git a/packages/pubsweet-components/packages/InkFrontend/package.json b/packages/components/packages/InkFrontend/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/package.json
rename to packages/components/packages/InkFrontend/package.json
diff --git a/packages/pubsweet-components/packages/InkFrontend/reducers.js b/packages/components/packages/InkFrontend/reducers.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/reducers.js
rename to packages/components/packages/InkFrontend/reducers.js
diff --git a/packages/pubsweet-components/packages/InkFrontend/types.js b/packages/components/packages/InkFrontend/types.js
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/types.js
rename to packages/components/packages/InkFrontend/types.js
diff --git a/packages/pubsweet-components/packages/InkFrontend/yarn.lock b/packages/components/packages/InkFrontend/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/InkFrontend/yarn.lock
rename to packages/components/packages/InkFrontend/yarn.lock
diff --git a/packages/pubsweet-components/packages/Login/Login.jsx b/packages/components/packages/Login/Login.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Login/Login.jsx
rename to packages/components/packages/Login/Login.jsx
diff --git a/packages/pubsweet-components/packages/Login/Login.local.scss b/packages/components/packages/Login/Login.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Login/Login.local.scss
rename to packages/components/packages/Login/Login.local.scss
diff --git a/packages/pubsweet-components/packages/Login/Login.test.jsx b/packages/components/packages/Login/Login.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Login/Login.test.jsx
rename to packages/components/packages/Login/Login.test.jsx
diff --git a/packages/pubsweet-components/packages/Login/LoginContainer.js b/packages/components/packages/Login/LoginContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/LoginContainer.js
rename to packages/components/packages/Login/LoginContainer.js
diff --git a/packages/pubsweet-components/packages/Login/actions.js b/packages/components/packages/Login/actions.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/actions.js
rename to packages/components/packages/Login/actions.js
diff --git a/packages/pubsweet-components/packages/Login/actions.test.js b/packages/components/packages/Login/actions.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/actions.test.js
rename to packages/components/packages/Login/actions.test.js
diff --git a/packages/pubsweet-components/packages/Login/index.js b/packages/components/packages/Login/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/index.js
rename to packages/components/packages/Login/index.js
diff --git a/packages/pubsweet-components/packages/Login/package.json b/packages/components/packages/Login/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Login/package.json
rename to packages/components/packages/Login/package.json
diff --git a/packages/pubsweet-components/packages/Login/reducers.js b/packages/components/packages/Login/reducers.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/reducers.js
rename to packages/components/packages/Login/reducers.js
diff --git a/packages/pubsweet-components/packages/Login/reducers.test.js b/packages/components/packages/Login/reducers.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/reducers.test.js
rename to packages/components/packages/Login/reducers.test.js
diff --git a/packages/pubsweet-components/packages/Login/types.js b/packages/components/packages/Login/types.js
similarity index 100%
rename from packages/pubsweet-components/packages/Login/types.js
rename to packages/components/packages/Login/types.js
diff --git a/packages/pubsweet-components/packages/Login/yarn.lock b/packages/components/packages/Login/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Login/yarn.lock
rename to packages/components/packages/Login/yarn.lock
diff --git a/packages/pubsweet-components/packages/Manage/Manage.jsx b/packages/components/packages/Manage/Manage.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Manage/Manage.jsx
rename to packages/components/packages/Manage/Manage.jsx
diff --git a/packages/pubsweet-components/packages/Manage/Manage.scss b/packages/components/packages/Manage/Manage.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Manage/Manage.scss
rename to packages/components/packages/Manage/Manage.scss
diff --git a/packages/pubsweet-components/packages/Manage/index.js b/packages/components/packages/Manage/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Manage/index.js
rename to packages/components/packages/Manage/index.js
diff --git a/packages/pubsweet-components/packages/Manage/package.json b/packages/components/packages/Manage/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Manage/package.json
rename to packages/components/packages/Manage/package.json
diff --git a/packages/pubsweet-components/packages/Manage/yarn.lock b/packages/components/packages/Manage/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Manage/yarn.lock
rename to packages/components/packages/Manage/yarn.lock
diff --git a/packages/pubsweet-components/packages/MediumDraft/CustomImageSideButton.jsx b/packages/components/packages/MediumDraft/CustomImageSideButton.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/CustomImageSideButton.jsx
rename to packages/components/packages/MediumDraft/CustomImageSideButton.jsx
diff --git a/packages/pubsweet-components/packages/MediumDraft/MediumDraft.jsx b/packages/components/packages/MediumDraft/MediumDraft.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/MediumDraft.jsx
rename to packages/components/packages/MediumDraft/MediumDraft.jsx
diff --git a/packages/pubsweet-components/packages/MediumDraft/MediumDraftContainer.js b/packages/components/packages/MediumDraft/MediumDraftContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/MediumDraftContainer.js
rename to packages/components/packages/MediumDraft/MediumDraftContainer.js
diff --git a/packages/pubsweet-components/packages/MediumDraft/index.js b/packages/components/packages/MediumDraft/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/index.js
rename to packages/components/packages/MediumDraft/index.js
diff --git a/packages/pubsweet-components/packages/MediumDraft/package.json b/packages/components/packages/MediumDraft/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/package.json
rename to packages/components/packages/MediumDraft/package.json
diff --git a/packages/pubsweet-components/packages/MediumDraft/styles.scss b/packages/components/packages/MediumDraft/styles.scss
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/styles.scss
rename to packages/components/packages/MediumDraft/styles.scss
diff --git a/packages/pubsweet-components/packages/MediumDraft/yarn.lock b/packages/components/packages/MediumDraft/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/MediumDraft/yarn.lock
rename to packages/components/packages/MediumDraft/yarn.lock
diff --git a/packages/pubsweet-components/packages/Navigation/NavbarUser.jsx b/packages/components/packages/Navigation/NavbarUser.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/NavbarUser.jsx
rename to packages/components/packages/Navigation/NavbarUser.jsx
diff --git a/packages/pubsweet-components/packages/Navigation/Navigation.jsx b/packages/components/packages/Navigation/Navigation.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/Navigation.jsx
rename to packages/components/packages/Navigation/Navigation.jsx
diff --git a/packages/pubsweet-components/packages/Navigation/Navigation.scss b/packages/components/packages/Navigation/Navigation.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/Navigation.scss
rename to packages/components/packages/Navigation/Navigation.scss
diff --git a/packages/pubsweet-components/packages/Navigation/Navigation.test.jsx b/packages/components/packages/Navigation/Navigation.test.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/Navigation.test.jsx
rename to packages/components/packages/Navigation/Navigation.test.jsx
diff --git a/packages/pubsweet-components/packages/Navigation/index.js b/packages/components/packages/Navigation/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/index.js
rename to packages/components/packages/Navigation/index.js
diff --git a/packages/pubsweet-components/packages/Navigation/package.json b/packages/components/packages/Navigation/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/package.json
rename to packages/components/packages/Navigation/package.json
diff --git a/packages/pubsweet-components/packages/Navigation/yarn.lock b/packages/components/packages/Navigation/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Navigation/yarn.lock
rename to packages/components/packages/Navigation/yarn.lock
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/PasswordResetBackend.js b/packages/components/packages/PasswordResetBackend/PasswordResetBackend.js
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/PasswordResetBackend.js
rename to packages/components/packages/PasswordResetBackend/PasswordResetBackend.js
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/PasswordResetBackend.test.js b/packages/components/packages/PasswordResetBackend/PasswordResetBackend.test.js
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/PasswordResetBackend.test.js
rename to packages/components/packages/PasswordResetBackend/PasswordResetBackend.test.js
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/index.js b/packages/components/packages/PasswordResetBackend/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/index.js
rename to packages/components/packages/PasswordResetBackend/index.js
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/package.json b/packages/components/packages/PasswordResetBackend/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/package.json
rename to packages/components/packages/PasswordResetBackend/package.json
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/transport.js b/packages/components/packages/PasswordResetBackend/transport.js
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/transport.js
rename to packages/components/packages/PasswordResetBackend/transport.js
diff --git a/packages/pubsweet-components/packages/PasswordResetBackend/yarn.lock b/packages/components/packages/PasswordResetBackend/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetBackend/yarn.lock
rename to packages/components/packages/PasswordResetBackend/yarn.lock
diff --git a/packages/pubsweet-components/packages/PasswordResetFrontend/PasswordReset.jsx b/packages/components/packages/PasswordResetFrontend/PasswordReset.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetFrontend/PasswordReset.jsx
rename to packages/components/packages/PasswordResetFrontend/PasswordReset.jsx
diff --git a/packages/pubsweet-components/packages/PasswordResetFrontend/PasswordReset.local.scss b/packages/components/packages/PasswordResetFrontend/PasswordReset.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetFrontend/PasswordReset.local.scss
rename to packages/components/packages/PasswordResetFrontend/PasswordReset.local.scss
diff --git a/packages/pubsweet-components/packages/PasswordResetFrontend/index.js b/packages/components/packages/PasswordResetFrontend/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetFrontend/index.js
rename to packages/components/packages/PasswordResetFrontend/index.js
diff --git a/packages/pubsweet-components/packages/PasswordResetFrontend/package.json b/packages/components/packages/PasswordResetFrontend/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetFrontend/package.json
rename to packages/components/packages/PasswordResetFrontend/package.json
diff --git a/packages/pubsweet-components/packages/PasswordResetFrontend/yarn.lock b/packages/components/packages/PasswordResetFrontend/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/PasswordResetFrontend/yarn.lock
rename to packages/components/packages/PasswordResetFrontend/yarn.lock
diff --git a/packages/pubsweet-components/packages/PepperTheme/Blog/Blog.local.scss b/packages/components/packages/PepperTheme/Blog/Blog.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/Blog/Blog.local.scss
rename to packages/components/packages/PepperTheme/Blog/Blog.local.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/Blog/Blog.scss b/packages/components/packages/PepperTheme/Blog/Blog.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/Blog/Blog.scss
rename to packages/components/packages/PepperTheme/Blog/Blog.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/Login/Login.local.scss b/packages/components/packages/PepperTheme/Login/Login.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/Login/Login.local.scss
rename to packages/components/packages/PepperTheme/Login/Login.local.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/Manage/Manage.scss b/packages/components/packages/PepperTheme/Manage/Manage.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/Manage/Manage.scss
rename to packages/components/packages/PepperTheme/Manage/Manage.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/PostsManager/Post.local.scss b/packages/components/packages/PepperTheme/PostsManager/Post.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/PostsManager/Post.local.scss
rename to packages/components/packages/PepperTheme/PostsManager/Post.local.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/PostsManager/PostsManager.local.scss b/packages/components/packages/PepperTheme/PostsManager/PostsManager.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/PostsManager/PostsManager.local.scss
rename to packages/components/packages/PepperTheme/PostsManager/PostsManager.local.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/_variables.scss b/packages/components/packages/PepperTheme/_variables.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/_variables.scss
rename to packages/components/packages/PepperTheme/_variables.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.eot b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.eot
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.eot
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.eot
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.svg b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.svg
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.svg
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.svg
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.ttf b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.ttf
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.ttf
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.ttf
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff2 b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff2
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff2
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-bold-015-webfont.woff2
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.eot b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.eot
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.eot
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.eot
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.svg b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.svg
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.svg
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.svg
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.ttf b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.ttf
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.ttf
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.ttf
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff
diff --git a/packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff2 b/packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff2
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff2
rename to packages/components/packages/PepperTheme/fonts/karmilla-015/karmilla-regular-015-webfont.woff2
diff --git a/packages/pubsweet-components/packages/PepperTheme/index.js b/packages/components/packages/PepperTheme/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/index.js
rename to packages/components/packages/PepperTheme/index.js
diff --git a/packages/pubsweet-components/packages/PepperTheme/main.scss b/packages/components/packages/PepperTheme/main.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/main.scss
rename to packages/components/packages/PepperTheme/main.scss
diff --git a/packages/pubsweet-components/packages/PepperTheme/package.json b/packages/components/packages/PepperTheme/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/PepperTheme/package.json
rename to packages/components/packages/PepperTheme/package.json
diff --git a/packages/pubsweet-components/packages/PostsManager/Post.jsx b/packages/components/packages/PostsManager/Post.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/Post.jsx
rename to packages/components/packages/PostsManager/Post.jsx
diff --git a/packages/pubsweet-components/packages/PostsManager/Post.local.scss b/packages/components/packages/PostsManager/Post.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/Post.local.scss
rename to packages/components/packages/PostsManager/Post.local.scss
diff --git a/packages/pubsweet-components/packages/PostsManager/PostCreator.jsx b/packages/components/packages/PostsManager/PostCreator.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostCreator.jsx
rename to packages/components/packages/PostsManager/PostCreator.jsx
diff --git a/packages/pubsweet-components/packages/PostsManager/PostCreator.scss b/packages/components/packages/PostsManager/PostCreator.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostCreator.scss
rename to packages/components/packages/PostsManager/PostCreator.scss
diff --git a/packages/pubsweet-components/packages/PostsManager/PostList.jsx b/packages/components/packages/PostsManager/PostList.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostList.jsx
rename to packages/components/packages/PostsManager/PostList.jsx
diff --git a/packages/pubsweet-components/packages/PostsManager/PostList.scss b/packages/components/packages/PostsManager/PostList.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostList.scss
rename to packages/components/packages/PostsManager/PostList.scss
diff --git a/packages/pubsweet-components/packages/PostsManager/PostsManager.jsx b/packages/components/packages/PostsManager/PostsManager.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostsManager.jsx
rename to packages/components/packages/PostsManager/PostsManager.jsx
diff --git a/packages/pubsweet-components/packages/PostsManager/PostsManager.local.scss b/packages/components/packages/PostsManager/PostsManager.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostsManager.local.scss
rename to packages/components/packages/PostsManager/PostsManager.local.scss
diff --git a/packages/pubsweet-components/packages/PostsManager/PostsManagerContainer.js b/packages/components/packages/PostsManager/PostsManagerContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/PostsManagerContainer.js
rename to packages/components/packages/PostsManager/PostsManagerContainer.js
diff --git a/packages/pubsweet-components/packages/PostsManager/TextInput.js b/packages/components/packages/PostsManager/TextInput.js
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/TextInput.js
rename to packages/components/packages/PostsManager/TextInput.js
diff --git a/packages/pubsweet-components/packages/PostsManager/index.js b/packages/components/packages/PostsManager/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/index.js
rename to packages/components/packages/PostsManager/index.js
diff --git a/packages/pubsweet-components/packages/PostsManager/package.json b/packages/components/packages/PostsManager/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/package.json
rename to packages/components/packages/PostsManager/package.json
diff --git a/packages/pubsweet-components/packages/PostsManager/yarn.lock b/packages/components/packages/PostsManager/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/PostsManager/yarn.lock
rename to packages/components/packages/PostsManager/yarn.lock
diff --git a/packages/pubsweet-components/packages/Signup/Signup.jsx b/packages/components/packages/Signup/Signup.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/Signup.jsx
rename to packages/components/packages/Signup/Signup.jsx
diff --git a/packages/pubsweet-components/packages/Signup/Signup.local.scss b/packages/components/packages/Signup/Signup.local.scss
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/Signup.local.scss
rename to packages/components/packages/Signup/Signup.local.scss
diff --git a/packages/pubsweet-components/packages/Signup/SignupContainer.js b/packages/components/packages/Signup/SignupContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/SignupContainer.js
rename to packages/components/packages/Signup/SignupContainer.js
diff --git a/packages/pubsweet-components/packages/Signup/actions.js b/packages/components/packages/Signup/actions.js
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/actions.js
rename to packages/components/packages/Signup/actions.js
diff --git a/packages/pubsweet-components/packages/Signup/index.js b/packages/components/packages/Signup/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/index.js
rename to packages/components/packages/Signup/index.js
diff --git a/packages/pubsweet-components/packages/Signup/package.json b/packages/components/packages/Signup/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/package.json
rename to packages/components/packages/Signup/package.json
diff --git a/packages/pubsweet-components/packages/Signup/reducers.js b/packages/components/packages/Signup/reducers.js
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/reducers.js
rename to packages/components/packages/Signup/reducers.js
diff --git a/packages/pubsweet-components/packages/Signup/types.js b/packages/components/packages/Signup/types.js
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/types.js
rename to packages/components/packages/Signup/types.js
diff --git a/packages/pubsweet-components/packages/Signup/yarn.lock b/packages/components/packages/Signup/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/Signup/yarn.lock
rename to packages/components/packages/Signup/yarn.lock
diff --git a/packages/pubsweet-components/packages/TeamsManager/Team.jsx b/packages/components/packages/TeamsManager/Team.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/Team.jsx
rename to packages/components/packages/TeamsManager/Team.jsx
diff --git a/packages/pubsweet-components/packages/TeamsManager/TeamCreator.jsx b/packages/components/packages/TeamsManager/TeamCreator.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/TeamCreator.jsx
rename to packages/components/packages/TeamsManager/TeamCreator.jsx
diff --git a/packages/pubsweet-components/packages/TeamsManager/TeamsManager.jsx b/packages/components/packages/TeamsManager/TeamsManager.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/TeamsManager.jsx
rename to packages/components/packages/TeamsManager/TeamsManager.jsx
diff --git a/packages/pubsweet-components/packages/TeamsManager/TeamsManagerContainer.js b/packages/components/packages/TeamsManager/TeamsManagerContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/TeamsManagerContainer.js
rename to packages/components/packages/TeamsManager/TeamsManagerContainer.js
diff --git a/packages/pubsweet-components/packages/TeamsManager/index.js b/packages/components/packages/TeamsManager/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/index.js
rename to packages/components/packages/TeamsManager/index.js
diff --git a/packages/pubsweet-components/packages/TeamsManager/package.json b/packages/components/packages/TeamsManager/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/package.json
rename to packages/components/packages/TeamsManager/package.json
diff --git a/packages/pubsweet-components/packages/TeamsManager/yarn.lock b/packages/components/packages/TeamsManager/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/TeamsManager/yarn.lock
rename to packages/components/packages/TeamsManager/yarn.lock
diff --git a/packages/pubsweet-components/packages/UsersManager/User.jsx b/packages/components/packages/UsersManager/User.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/User.jsx
rename to packages/components/packages/UsersManager/User.jsx
diff --git a/packages/pubsweet-components/packages/UsersManager/UsersManager.jsx b/packages/components/packages/UsersManager/UsersManager.jsx
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/UsersManager.jsx
rename to packages/components/packages/UsersManager/UsersManager.jsx
diff --git a/packages/pubsweet-components/packages/UsersManager/UsersManagerContainer.js b/packages/components/packages/UsersManager/UsersManagerContainer.js
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/UsersManagerContainer.js
rename to packages/components/packages/UsersManager/UsersManagerContainer.js
diff --git a/packages/pubsweet-components/packages/UsersManager/index.js b/packages/components/packages/UsersManager/index.js
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/index.js
rename to packages/components/packages/UsersManager/index.js
diff --git a/packages/pubsweet-components/packages/UsersManager/package.json b/packages/components/packages/UsersManager/package.json
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/package.json
rename to packages/components/packages/UsersManager/package.json
diff --git a/packages/pubsweet-components/packages/UsersManager/yarn.lock b/packages/components/packages/UsersManager/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/packages/UsersManager/yarn.lock
rename to packages/components/packages/UsersManager/yarn.lock
diff --git a/packages/pubsweet-components/styleguide.config.js b/packages/components/styleguide.config.js
similarity index 100%
rename from packages/pubsweet-components/styleguide.config.js
rename to packages/components/styleguide.config.js
diff --git a/packages/pubsweet-components/styleguidist/Wrapper.jsx b/packages/components/styleguidist/Wrapper.jsx
similarity index 100%
rename from packages/pubsweet-components/styleguidist/Wrapper.jsx
rename to packages/components/styleguidist/Wrapper.jsx
diff --git a/packages/pubsweet-components/styleguidist/config.json b/packages/components/styleguidist/config.json
similarity index 100%
rename from packages/pubsweet-components/styleguidist/config.json
rename to packages/components/styleguidist/config.json
diff --git a/packages/pubsweet-components/webpack.config.js b/packages/components/webpack.config.js
similarity index 100%
rename from packages/pubsweet-components/webpack.config.js
rename to packages/components/webpack.config.js
diff --git a/packages/pubsweet-components/yarn.lock b/packages/components/yarn.lock
similarity index 100%
rename from packages/pubsweet-components/yarn.lock
rename to packages/components/yarn.lock
diff --git a/packages/pubsweet-logger/.envrc b/packages/logger/.envrc
similarity index 100%
rename from packages/pubsweet-logger/.envrc
rename to packages/logger/.envrc
diff --git a/packages/pubsweet-logger/.eslintrc b/packages/logger/.eslintrc
similarity index 100%
rename from packages/pubsweet-logger/.eslintrc
rename to packages/logger/.eslintrc
diff --git a/packages/pubsweet-logger/.gitignore b/packages/logger/.gitignore
similarity index 100%
rename from packages/pubsweet-logger/.gitignore
rename to packages/logger/.gitignore
diff --git a/packages/pubsweet-logger/.gitlab-ci.yml b/packages/logger/.gitlab-ci.yml
similarity index 100%
rename from packages/pubsweet-logger/.gitlab-ci.yml
rename to packages/logger/.gitlab-ci.yml
diff --git a/packages/pubsweet-logger/.nvmrc b/packages/logger/.nvmrc
similarity index 100%
rename from packages/pubsweet-logger/.nvmrc
rename to packages/logger/.nvmrc
diff --git a/packages/pubsweet-logger/LICENSE b/packages/logger/LICENSE
similarity index 100%
rename from packages/pubsweet-logger/LICENSE
rename to packages/logger/LICENSE
diff --git a/packages/pubsweet-logger/README.md b/packages/logger/README.md
similarity index 100%
rename from packages/pubsweet-logger/README.md
rename to packages/logger/README.md
diff --git a/packages/pubsweet-logger/config/test.js b/packages/logger/config/test.js
similarity index 100%
rename from packages/pubsweet-logger/config/test.js
rename to packages/logger/config/test.js
diff --git a/packages/pubsweet-logger/package.json b/packages/logger/package.json
similarity index 100%
rename from packages/pubsweet-logger/package.json
rename to packages/logger/package.json
diff --git a/packages/pubsweet-logger/src/index.js b/packages/logger/src/index.js
similarity index 100%
rename from packages/pubsweet-logger/src/index.js
rename to packages/logger/src/index.js
diff --git a/packages/pubsweet-logger/src/validations.js b/packages/logger/src/validations.js
similarity index 100%
rename from packages/pubsweet-logger/src/validations.js
rename to packages/logger/src/validations.js
diff --git a/packages/pubsweet-logger/test/.eslintrc b/packages/logger/test/.eslintrc
similarity index 100%
rename from packages/pubsweet-logger/test/.eslintrc
rename to packages/logger/test/.eslintrc
diff --git a/packages/pubsweet-logger/test/index.test.js b/packages/logger/test/index.test.js
similarity index 100%
rename from packages/pubsweet-logger/test/index.test.js
rename to packages/logger/test/index.test.js
diff --git a/packages/pubsweet-logger/yarn.lock b/packages/logger/yarn.lock
similarity index 100%
rename from packages/pubsweet-logger/yarn.lock
rename to packages/logger/yarn.lock
diff --git a/packages/pubsweet-server/db/.gitkeep b/packages/pubsweet-server/db/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/packages/pubsweet-server/logs/.gitkeep b/packages/pubsweet-server/logs/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/packages/pubsweet-server/.eslintrc b/packages/server/.eslintrc
similarity index 100%
rename from packages/pubsweet-server/.eslintrc
rename to packages/server/.eslintrc
diff --git a/packages/pubsweet-server/.gitignore b/packages/server/.gitignore
similarity index 100%
rename from packages/pubsweet-server/.gitignore
rename to packages/server/.gitignore
diff --git a/packages/pubsweet-server/.gitlab-ci.yml b/packages/server/.gitlab-ci.yml
similarity index 100%
rename from packages/pubsweet-server/.gitlab-ci.yml
rename to packages/server/.gitlab-ci.yml
diff --git a/packages/pubsweet-server/.nsprc b/packages/server/.nsprc
similarity index 100%
rename from packages/pubsweet-server/.nsprc
rename to packages/server/.nsprc
diff --git a/packages/pubsweet-server/.travis.yml b/packages/server/.travis.yml
similarity index 100%
rename from packages/pubsweet-server/.travis.yml
rename to packages/server/.travis.yml
diff --git a/packages/pubsweet-server/CONTRIBUTING.md b/packages/server/CONTRIBUTING.md
similarity index 100%
rename from packages/pubsweet-server/CONTRIBUTING.md
rename to packages/server/CONTRIBUTING.md
diff --git a/packages/pubsweet-server/LICENSE b/packages/server/LICENSE
similarity index 100%
rename from packages/pubsweet-server/LICENSE
rename to packages/server/LICENSE
diff --git a/packages/pubsweet-server/README.md b/packages/server/README.md
similarity index 100%
rename from packages/pubsweet-server/README.md
rename to packages/server/README.md
diff --git a/packages/pubsweet-server/config/custom-environment-variables.js b/packages/server/config/custom-environment-variables.js
similarity index 100%
rename from packages/pubsweet-server/config/custom-environment-variables.js
rename to packages/server/config/custom-environment-variables.js
diff --git a/packages/pubsweet-server/config/test.js b/packages/server/config/test.js
similarity index 100%
rename from packages/pubsweet-server/config/test.js
rename to packages/server/config/test.js
diff --git a/packages/pubsweet-server/config/validations.js b/packages/server/config/validations.js
similarity index 100%
rename from packages/pubsweet-server/config/validations.js
rename to packages/server/config/validations.js
diff --git a/packages/pubsweet-server/package.json b/packages/server/package.json
similarity index 100%
rename from packages/pubsweet-server/package.json
rename to packages/server/package.json
diff --git a/packages/pubsweet-server/src/.eslintrc b/packages/server/src/.eslintrc
similarity index 100%
rename from packages/pubsweet-server/src/.eslintrc
rename to packages/server/src/.eslintrc
diff --git a/packages/pubsweet-server/src/authentication.js b/packages/server/src/authentication.js
similarity index 100%
rename from packages/pubsweet-server/src/authentication.js
rename to packages/server/src/authentication.js
diff --git a/packages/pubsweet-server/src/db.js b/packages/server/src/db.js
similarity index 100%
rename from packages/pubsweet-server/src/db.js
rename to packages/server/src/db.js
diff --git a/packages/pubsweet-server/src/db/.gitignore b/packages/server/src/db/.gitignore
similarity index 100%
rename from packages/pubsweet-server/src/db/.gitignore
rename to packages/server/src/db/.gitignore
diff --git a/packages/pubsweet-server/src/errors/AuthorizationError.js b/packages/server/src/errors/AuthorizationError.js
similarity index 100%
rename from packages/pubsweet-server/src/errors/AuthorizationError.js
rename to packages/server/src/errors/AuthorizationError.js
diff --git a/packages/pubsweet-server/src/errors/ConflictError.js b/packages/server/src/errors/ConflictError.js
similarity index 100%
rename from packages/pubsweet-server/src/errors/ConflictError.js
rename to packages/server/src/errors/ConflictError.js
diff --git a/packages/pubsweet-server/src/errors/NotFoundError.js b/packages/server/src/errors/NotFoundError.js
similarity index 100%
rename from packages/pubsweet-server/src/errors/NotFoundError.js
rename to packages/server/src/errors/NotFoundError.js
diff --git a/packages/pubsweet-server/src/errors/ValidationError.js b/packages/server/src/errors/ValidationError.js
similarity index 100%
rename from packages/pubsweet-server/src/errors/ValidationError.js
rename to packages/server/src/errors/ValidationError.js
diff --git a/packages/pubsweet-server/src/helpers/authsome.js b/packages/server/src/helpers/authsome.js
similarity index 100%
rename from packages/pubsweet-server/src/helpers/authsome.js
rename to packages/server/src/helpers/authsome.js
diff --git a/packages/pubsweet-server/src/index.js b/packages/server/src/index.js
similarity index 100%
rename from packages/pubsweet-server/src/index.js
rename to packages/server/src/index.js
diff --git a/packages/pubsweet-server/src/models/Collection.js b/packages/server/src/models/Collection.js
similarity index 100%
rename from packages/pubsweet-server/src/models/Collection.js
rename to packages/server/src/models/Collection.js
diff --git a/packages/pubsweet-server/src/models/Fragment.js b/packages/server/src/models/Fragment.js
similarity index 100%
rename from packages/pubsweet-server/src/models/Fragment.js
rename to packages/server/src/models/Fragment.js
diff --git a/packages/pubsweet-server/src/models/Model.js b/packages/server/src/models/Model.js
similarity index 100%
rename from packages/pubsweet-server/src/models/Model.js
rename to packages/server/src/models/Model.js
diff --git a/packages/pubsweet-server/src/models/Team.js b/packages/server/src/models/Team.js
similarity index 100%
rename from packages/pubsweet-server/src/models/Team.js
rename to packages/server/src/models/Team.js
diff --git a/packages/pubsweet-server/src/models/User.js b/packages/server/src/models/User.js
similarity index 100%
rename from packages/pubsweet-server/src/models/User.js
rename to packages/server/src/models/User.js
diff --git a/packages/pubsweet-server/src/models/index.js b/packages/server/src/models/index.js
similarity index 100%
rename from packages/pubsweet-server/src/models/index.js
rename to packages/server/src/models/index.js
diff --git a/packages/pubsweet-server/src/models/schema.js b/packages/server/src/models/schema.js
similarity index 100%
rename from packages/pubsweet-server/src/models/schema.js
rename to packages/server/src/models/schema.js
diff --git a/packages/pubsweet-server/src/models/validations.js b/packages/server/src/models/validations.js
similarity index 100%
rename from packages/pubsweet-server/src/models/validations.js
rename to packages/server/src/models/validations.js
diff --git a/packages/pubsweet-server/src/register-components.js b/packages/server/src/register-components.js
similarity index 100%
rename from packages/pubsweet-server/src/register-components.js
rename to packages/server/src/register-components.js
diff --git a/packages/pubsweet-server/src/routes/api.js b/packages/server/src/routes/api.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api.js
rename to packages/server/src/routes/api.js
diff --git a/packages/pubsweet-server/src/routes/api_collections.js b/packages/server/src/routes/api_collections.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api_collections.js
rename to packages/server/src/routes/api_collections.js
diff --git a/packages/pubsweet-server/src/routes/api_fragments.js b/packages/server/src/routes/api_fragments.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api_fragments.js
rename to packages/server/src/routes/api_fragments.js
diff --git a/packages/pubsweet-server/src/routes/api_teams.js b/packages/server/src/routes/api_teams.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api_teams.js
rename to packages/server/src/routes/api_teams.js
diff --git a/packages/pubsweet-server/src/routes/api_upload.js b/packages/server/src/routes/api_upload.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api_upload.js
rename to packages/server/src/routes/api_upload.js
diff --git a/packages/pubsweet-server/src/routes/api_users.js b/packages/server/src/routes/api_users.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/api_users.js
rename to packages/server/src/routes/api_users.js
diff --git a/packages/pubsweet-server/src/routes/index.js b/packages/server/src/routes/index.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/index.js
rename to packages/server/src/routes/index.js
diff --git a/packages/pubsweet-server/src/routes/util.js b/packages/server/src/routes/util.js
similarity index 100%
rename from packages/pubsweet-server/src/routes/util.js
rename to packages/server/src/routes/util.js
diff --git a/packages/pubsweet-server/src/setup-base.js b/packages/server/src/setup-base.js
similarity index 100%
rename from packages/pubsweet-server/src/setup-base.js
rename to packages/server/src/setup-base.js
diff --git a/packages/pubsweet-server/src/setup.js b/packages/server/src/setup.js
similarity index 100%
rename from packages/pubsweet-server/src/setup.js
rename to packages/server/src/setup.js
diff --git a/packages/pubsweet-server/src/start-server.js b/packages/server/src/start-server.js
similarity index 100%
rename from packages/pubsweet-server/src/start-server.js
rename to packages/server/src/start-server.js
diff --git a/packages/pubsweet-server/test/.eslintrc b/packages/server/test/.eslintrc
similarity index 100%
rename from packages/pubsweet-server/test/.eslintrc
rename to packages/server/test/.eslintrc
diff --git a/packages/pubsweet-server/test/api_admin_test.js b/packages/server/test/api_admin_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_admin_test.js
rename to packages/server/test/api_admin_test.js
diff --git a/packages/pubsweet-server/test/api_authenticated_test.js b/packages/server/test/api_authenticated_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_authenticated_test.js
rename to packages/server/test/api_authenticated_test.js
diff --git a/packages/pubsweet-server/test/api_collections_test.js b/packages/server/test/api_collections_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_collections_test.js
rename to packages/server/test/api_collections_test.js
diff --git a/packages/pubsweet-server/test/api_file_upload_test.js b/packages/server/test/api_file_upload_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_file_upload_test.js
rename to packages/server/test/api_file_upload_test.js
diff --git a/packages/pubsweet-server/test/api_fragments_test.js b/packages/server/test/api_fragments_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_fragments_test.js
rename to packages/server/test/api_fragments_test.js
diff --git a/packages/pubsweet-server/test/api_locals_test.js b/packages/server/test/api_locals_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_locals_test.js
rename to packages/server/test/api_locals_test.js
diff --git a/packages/pubsweet-server/test/api_sse_disabled_test.js b/packages/server/test/api_sse_disabled_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_sse_disabled_test.js
rename to packages/server/test/api_sse_disabled_test.js
diff --git a/packages/pubsweet-server/test/api_sse_enabled_test.js b/packages/server/test/api_sse_enabled_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_sse_enabled_test.js
rename to packages/server/test/api_sse_enabled_test.js
diff --git a/packages/pubsweet-server/test/api_teams_test.js b/packages/server/test/api_teams_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_teams_test.js
rename to packages/server/test/api_teams_test.js
diff --git a/packages/pubsweet-server/test/api_unauthenticated_test.js b/packages/server/test/api_unauthenticated_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_unauthenticated_test.js
rename to packages/server/test/api_unauthenticated_test.js
diff --git a/packages/pubsweet-server/test/api_users_test.js b/packages/server/test/api_users_test.js
similarity index 100%
rename from packages/pubsweet-server/test/api_users_test.js
rename to packages/server/test/api_users_test.js
diff --git a/packages/pubsweet-server/test/db_test.js b/packages/server/test/db_test.js
similarity index 100%
rename from packages/pubsweet-server/test/db_test.js
rename to packages/server/test/db_test.js
diff --git a/packages/pubsweet-server/test/fixtures/fixture.jpg b/packages/server/test/fixtures/fixture.jpg
similarity index 100%
rename from packages/pubsweet-server/test/fixtures/fixture.jpg
rename to packages/server/test/fixtures/fixture.jpg
diff --git a/packages/pubsweet-server/test/fixtures/fixtures.js b/packages/server/test/fixtures/fixtures.js
similarity index 100%
rename from packages/pubsweet-server/test/fixtures/fixtures.js
rename to packages/server/test/fixtures/fixtures.js
diff --git a/packages/pubsweet-server/test/helpers/api.js b/packages/server/test/helpers/api.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/api.js
rename to packages/server/test/helpers/api.js
diff --git a/packages/pubsweet-server/test/helpers/authsome_mode.js b/packages/server/test/helpers/authsome_mode.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/authsome_mode.js
rename to packages/server/test/helpers/authsome_mode.js
diff --git a/packages/pubsweet-server/test/helpers/basic_collection.js b/packages/server/test/helpers/basic_collection.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/basic_collection.js
rename to packages/server/test/helpers/basic_collection.js
diff --git a/packages/pubsweet-server/test/helpers/db_cleaner.js b/packages/server/test/helpers/db_cleaner.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/db_cleaner.js
rename to packages/server/test/helpers/db_cleaner.js
diff --git a/packages/pubsweet-server/test/helpers/fragment.js b/packages/server/test/helpers/fragment.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/fragment.js
rename to packages/server/test/helpers/fragment.js
diff --git a/packages/pubsweet-server/test/helpers/set_team.js b/packages/server/test/helpers/set_team.js
similarity index 100%
rename from packages/pubsweet-server/test/helpers/set_team.js
rename to packages/server/test/helpers/set_team.js
diff --git a/packages/pubsweet-server/test/mocks/mock_component.js b/packages/server/test/mocks/mock_component.js
similarity index 100%
rename from packages/pubsweet-server/test/mocks/mock_component.js
rename to packages/server/test/mocks/mock_component.js
diff --git a/packages/pubsweet-server/test/model_test.js b/packages/server/test/model_test.js
similarity index 100%
rename from packages/pubsweet-server/test/model_test.js
rename to packages/server/test/model_test.js
diff --git a/packages/pubsweet-server/test/register_components_test.js b/packages/server/test/register_components_test.js
similarity index 100%
rename from packages/pubsweet-server/test/register_components_test.js
rename to packages/server/test/register_components_test.js
diff --git a/packages/pubsweet-server/test/start_server_test.js b/packages/server/test/start_server_test.js
similarity index 100%
rename from packages/pubsweet-server/test/start_server_test.js
rename to packages/server/test/start_server_test.js
diff --git a/packages/pubsweet-server/test/teams_test.js b/packages/server/test/teams_test.js
similarity index 100%
rename from packages/pubsweet-server/test/teams_test.js
rename to packages/server/test/teams_test.js
diff --git a/packages/pubsweet-server/test/user_test.js b/packages/server/test/user_test.js
similarity index 100%
rename from packages/pubsweet-server/test/user_test.js
rename to packages/server/test/user_test.js
diff --git a/packages/pubsweet-server/test/validations_test.js b/packages/server/test/validations_test.js
similarity index 100%
rename from packages/pubsweet-server/test/validations_test.js
rename to packages/server/test/validations_test.js
diff --git a/packages/pubsweet-server/yarn.lock b/packages/server/yarn.lock
similarity index 100%
rename from packages/pubsweet-server/yarn.lock
rename to packages/server/yarn.lock
diff --git a/packages/pubsweet-theme-plugin/index.js b/packages/theme-plugin/index.js
similarity index 100%
rename from packages/pubsweet-theme-plugin/index.js
rename to packages/theme-plugin/index.js
diff --git a/packages/pubsweet-theme-plugin/package.json b/packages/theme-plugin/package.json
similarity index 100%
rename from packages/pubsweet-theme-plugin/package.json
rename to packages/theme-plugin/package.json