diff --git a/.eslintrc b/packages/pubsweet-ui/.eslintrc
similarity index 100%
rename from .eslintrc
rename to packages/pubsweet-ui/.eslintrc
diff --git a/docs/colors.md b/packages/pubsweet-ui/docs/colors.md
similarity index 100%
rename from docs/colors.md
rename to packages/pubsweet-ui/docs/colors.md
diff --git a/docs/fonts.md b/packages/pubsweet-ui/docs/fonts.md
similarity index 100%
rename from docs/fonts.md
rename to packages/pubsweet-ui/docs/fonts.md
diff --git a/package.json b/packages/pubsweet-ui/package.json
similarity index 98%
rename from package.json
rename to packages/pubsweet-ui/package.json
index 13126a9fccaec1bedccc3145f7fb9fbaa0056c3f..59319dc89e14e0c2ffb4fcda283a2654339ce6cc 100644
--- a/package.json
+++ b/packages/pubsweet-ui/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "xpub-ui",
+  "name": "pubsweet-ui",
   "version": "0.0.2",
   "files": [
     "docs",
diff --git a/src/atoms/Attachment.js b/packages/pubsweet-ui/src/atoms/Attachment.js
similarity index 100%
rename from src/atoms/Attachment.js
rename to packages/pubsweet-ui/src/atoms/Attachment.js
diff --git a/src/atoms/Attachment.local.scss b/packages/pubsweet-ui/src/atoms/Attachment.local.scss
similarity index 100%
rename from src/atoms/Attachment.local.scss
rename to packages/pubsweet-ui/src/atoms/Attachment.local.scss
diff --git a/src/atoms/Attachment.md b/packages/pubsweet-ui/src/atoms/Attachment.md
similarity index 100%
rename from src/atoms/Attachment.md
rename to packages/pubsweet-ui/src/atoms/Attachment.md
diff --git a/src/atoms/Avatar.js b/packages/pubsweet-ui/src/atoms/Avatar.js
similarity index 100%
rename from src/atoms/Avatar.js
rename to packages/pubsweet-ui/src/atoms/Avatar.js
diff --git a/src/atoms/Avatar.local.scss b/packages/pubsweet-ui/src/atoms/Avatar.local.scss
similarity index 100%
rename from src/atoms/Avatar.local.scss
rename to packages/pubsweet-ui/src/atoms/Avatar.local.scss
diff --git a/src/atoms/Avatar.md b/packages/pubsweet-ui/src/atoms/Avatar.md
similarity index 100%
rename from src/atoms/Avatar.md
rename to packages/pubsweet-ui/src/atoms/Avatar.md
diff --git a/src/atoms/Badge.js b/packages/pubsweet-ui/src/atoms/Badge.js
similarity index 100%
rename from src/atoms/Badge.js
rename to packages/pubsweet-ui/src/atoms/Badge.js
diff --git a/src/atoms/Badge.local.scss b/packages/pubsweet-ui/src/atoms/Badge.local.scss
similarity index 100%
rename from src/atoms/Badge.local.scss
rename to packages/pubsweet-ui/src/atoms/Badge.local.scss
diff --git a/src/atoms/Badge.md b/packages/pubsweet-ui/src/atoms/Badge.md
similarity index 100%
rename from src/atoms/Badge.md
rename to packages/pubsweet-ui/src/atoms/Badge.md
diff --git a/src/atoms/Button.js b/packages/pubsweet-ui/src/atoms/Button.js
similarity index 100%
rename from src/atoms/Button.js
rename to packages/pubsweet-ui/src/atoms/Button.js
diff --git a/src/atoms/Button.local.scss b/packages/pubsweet-ui/src/atoms/Button.local.scss
similarity index 100%
rename from src/atoms/Button.local.scss
rename to packages/pubsweet-ui/src/atoms/Button.local.scss
diff --git a/src/atoms/Button.md b/packages/pubsweet-ui/src/atoms/Button.md
similarity index 100%
rename from src/atoms/Button.md
rename to packages/pubsweet-ui/src/atoms/Button.md
diff --git a/src/atoms/Checkbox.js b/packages/pubsweet-ui/src/atoms/Checkbox.js
similarity index 100%
rename from src/atoms/Checkbox.js
rename to packages/pubsweet-ui/src/atoms/Checkbox.js
diff --git a/src/atoms/Checkbox.local.scss b/packages/pubsweet-ui/src/atoms/Checkbox.local.scss
similarity index 100%
rename from src/atoms/Checkbox.local.scss
rename to packages/pubsweet-ui/src/atoms/Checkbox.local.scss
diff --git a/src/atoms/Checkbox.md b/packages/pubsweet-ui/src/atoms/Checkbox.md
similarity index 100%
rename from src/atoms/Checkbox.md
rename to packages/pubsweet-ui/src/atoms/Checkbox.md
diff --git a/src/atoms/File.js b/packages/pubsweet-ui/src/atoms/File.js
similarity index 100%
rename from src/atoms/File.js
rename to packages/pubsweet-ui/src/atoms/File.js
diff --git a/src/atoms/File.local.scss b/packages/pubsweet-ui/src/atoms/File.local.scss
similarity index 100%
rename from src/atoms/File.local.scss
rename to packages/pubsweet-ui/src/atoms/File.local.scss
diff --git a/src/atoms/File.md b/packages/pubsweet-ui/src/atoms/File.md
similarity index 100%
rename from src/atoms/File.md
rename to packages/pubsweet-ui/src/atoms/File.md
diff --git a/src/atoms/Icon.js b/packages/pubsweet-ui/src/atoms/Icon.js
similarity index 100%
rename from src/atoms/Icon.js
rename to packages/pubsweet-ui/src/atoms/Icon.js
diff --git a/src/atoms/Icon.local.scss b/packages/pubsweet-ui/src/atoms/Icon.local.scss
similarity index 100%
rename from src/atoms/Icon.local.scss
rename to packages/pubsweet-ui/src/atoms/Icon.local.scss
diff --git a/src/atoms/Icon.md b/packages/pubsweet-ui/src/atoms/Icon.md
similarity index 100%
rename from src/atoms/Icon.md
rename to packages/pubsweet-ui/src/atoms/Icon.md
diff --git a/src/atoms/Menu.js b/packages/pubsweet-ui/src/atoms/Menu.js
similarity index 100%
rename from src/atoms/Menu.js
rename to packages/pubsweet-ui/src/atoms/Menu.js
diff --git a/src/atoms/Menu.local.scss b/packages/pubsweet-ui/src/atoms/Menu.local.scss
similarity index 100%
rename from src/atoms/Menu.local.scss
rename to packages/pubsweet-ui/src/atoms/Menu.local.scss
diff --git a/src/atoms/Menu.md b/packages/pubsweet-ui/src/atoms/Menu.md
similarity index 100%
rename from src/atoms/Menu.md
rename to packages/pubsweet-ui/src/atoms/Menu.md
diff --git a/src/atoms/Radio.js b/packages/pubsweet-ui/src/atoms/Radio.js
similarity index 100%
rename from src/atoms/Radio.js
rename to packages/pubsweet-ui/src/atoms/Radio.js
diff --git a/src/atoms/Radio.local.scss b/packages/pubsweet-ui/src/atoms/Radio.local.scss
similarity index 100%
rename from src/atoms/Radio.local.scss
rename to packages/pubsweet-ui/src/atoms/Radio.local.scss
diff --git a/src/atoms/Radio.md b/packages/pubsweet-ui/src/atoms/Radio.md
similarity index 100%
rename from src/atoms/Radio.md
rename to packages/pubsweet-ui/src/atoms/Radio.md
diff --git a/src/atoms/Tags.js b/packages/pubsweet-ui/src/atoms/Tags.js
similarity index 100%
rename from src/atoms/Tags.js
rename to packages/pubsweet-ui/src/atoms/Tags.js
diff --git a/src/atoms/Tags.md b/packages/pubsweet-ui/src/atoms/Tags.md
similarity index 100%
rename from src/atoms/Tags.md
rename to packages/pubsweet-ui/src/atoms/Tags.md
diff --git a/src/atoms/Tags.scss b/packages/pubsweet-ui/src/atoms/Tags.scss
similarity index 100%
rename from src/atoms/Tags.scss
rename to packages/pubsweet-ui/src/atoms/Tags.scss
diff --git a/src/atoms/TextField.js b/packages/pubsweet-ui/src/atoms/TextField.js
similarity index 100%
rename from src/atoms/TextField.js
rename to packages/pubsweet-ui/src/atoms/TextField.js
diff --git a/src/atoms/TextField.local.scss b/packages/pubsweet-ui/src/atoms/TextField.local.scss
similarity index 100%
rename from src/atoms/TextField.local.scss
rename to packages/pubsweet-ui/src/atoms/TextField.local.scss
diff --git a/src/atoms/TextField.md b/packages/pubsweet-ui/src/atoms/TextField.md
similarity index 100%
rename from src/atoms/TextField.md
rename to packages/pubsweet-ui/src/atoms/TextField.md
diff --git a/src/atoms/UploadingFile.js b/packages/pubsweet-ui/src/atoms/UploadingFile.js
similarity index 100%
rename from src/atoms/UploadingFile.js
rename to packages/pubsweet-ui/src/atoms/UploadingFile.js
diff --git a/src/atoms/UploadingFile.local.scss b/packages/pubsweet-ui/src/atoms/UploadingFile.local.scss
similarity index 100%
rename from src/atoms/UploadingFile.local.scss
rename to packages/pubsweet-ui/src/atoms/UploadingFile.local.scss
diff --git a/src/atoms/UploadingFile.md b/packages/pubsweet-ui/src/atoms/UploadingFile.md
similarity index 100%
rename from src/atoms/UploadingFile.md
rename to packages/pubsweet-ui/src/atoms/UploadingFile.md
diff --git a/src/atoms/ValidatedField.js b/packages/pubsweet-ui/src/atoms/ValidatedField.js
similarity index 100%
rename from src/atoms/ValidatedField.js
rename to packages/pubsweet-ui/src/atoms/ValidatedField.js
diff --git a/src/atoms/ValidatedField.local.scss b/packages/pubsweet-ui/src/atoms/ValidatedField.local.scss
similarity index 100%
rename from src/atoms/ValidatedField.local.scss
rename to packages/pubsweet-ui/src/atoms/ValidatedField.local.scss
diff --git a/src/atoms/ValidatedField.md b/packages/pubsweet-ui/src/atoms/ValidatedField.md
similarity index 100%
rename from src/atoms/ValidatedField.md
rename to packages/pubsweet-ui/src/atoms/ValidatedField.md
diff --git a/src/index.js b/packages/pubsweet-ui/src/index.js
similarity index 100%
rename from src/index.js
rename to packages/pubsweet-ui/src/index.js
diff --git a/src/lib/animation.scss b/packages/pubsweet-ui/src/lib/animation.scss
similarity index 100%
rename from src/lib/animation.scss
rename to packages/pubsweet-ui/src/lib/animation.scss
diff --git a/src/lib/colors.local.scss b/packages/pubsweet-ui/src/lib/colors.local.scss
similarity index 100%
rename from src/lib/colors.local.scss
rename to packages/pubsweet-ui/src/lib/colors.local.scss
diff --git a/src/molecules/AppBar.js b/packages/pubsweet-ui/src/molecules/AppBar.js
similarity index 100%
rename from src/molecules/AppBar.js
rename to packages/pubsweet-ui/src/molecules/AppBar.js
diff --git a/src/molecules/AppBar.local.scss b/packages/pubsweet-ui/src/molecules/AppBar.local.scss
similarity index 100%
rename from src/molecules/AppBar.local.scss
rename to packages/pubsweet-ui/src/molecules/AppBar.local.scss
diff --git a/src/molecules/AppBar.md b/packages/pubsweet-ui/src/molecules/AppBar.md
similarity index 100%
rename from src/molecules/AppBar.md
rename to packages/pubsweet-ui/src/molecules/AppBar.md
diff --git a/src/molecules/Attachments.js b/packages/pubsweet-ui/src/molecules/Attachments.js
similarity index 100%
rename from src/molecules/Attachments.js
rename to packages/pubsweet-ui/src/molecules/Attachments.js
diff --git a/src/molecules/Attachments.local.scss b/packages/pubsweet-ui/src/molecules/Attachments.local.scss
similarity index 100%
rename from src/molecules/Attachments.local.scss
rename to packages/pubsweet-ui/src/molecules/Attachments.local.scss
diff --git a/src/molecules/Attachments.md b/packages/pubsweet-ui/src/molecules/Attachments.md
similarity index 100%
rename from src/molecules/Attachments.md
rename to packages/pubsweet-ui/src/molecules/Attachments.md
diff --git a/src/molecules/CheckboxGroup.js b/packages/pubsweet-ui/src/molecules/CheckboxGroup.js
similarity index 100%
rename from src/molecules/CheckboxGroup.js
rename to packages/pubsweet-ui/src/molecules/CheckboxGroup.js
diff --git a/src/molecules/CheckboxGroup.md b/packages/pubsweet-ui/src/molecules/CheckboxGroup.md
similarity index 100%
rename from src/molecules/CheckboxGroup.md
rename to packages/pubsweet-ui/src/molecules/CheckboxGroup.md
diff --git a/src/molecules/Files.js b/packages/pubsweet-ui/src/molecules/Files.js
similarity index 100%
rename from src/molecules/Files.js
rename to packages/pubsweet-ui/src/molecules/Files.js
diff --git a/src/molecules/Files.local.scss b/packages/pubsweet-ui/src/molecules/Files.local.scss
similarity index 100%
rename from src/molecules/Files.local.scss
rename to packages/pubsweet-ui/src/molecules/Files.local.scss
diff --git a/src/molecules/Files.md b/packages/pubsweet-ui/src/molecules/Files.md
similarity index 100%
rename from src/molecules/Files.md
rename to packages/pubsweet-ui/src/molecules/Files.md
diff --git a/src/molecules/PlainButton.js b/packages/pubsweet-ui/src/molecules/PlainButton.js
similarity index 100%
rename from src/molecules/PlainButton.js
rename to packages/pubsweet-ui/src/molecules/PlainButton.js
diff --git a/src/molecules/PlainButton.local.scss b/packages/pubsweet-ui/src/molecules/PlainButton.local.scss
similarity index 100%
rename from src/molecules/PlainButton.local.scss
rename to packages/pubsweet-ui/src/molecules/PlainButton.local.scss
diff --git a/src/molecules/PlainButton.md b/packages/pubsweet-ui/src/molecules/PlainButton.md
similarity index 100%
rename from src/molecules/PlainButton.md
rename to packages/pubsweet-ui/src/molecules/PlainButton.md
diff --git a/src/molecules/RadioGroup.js b/packages/pubsweet-ui/src/molecules/RadioGroup.js
similarity index 100%
rename from src/molecules/RadioGroup.js
rename to packages/pubsweet-ui/src/molecules/RadioGroup.js
diff --git a/src/molecules/RadioGroup.md b/packages/pubsweet-ui/src/molecules/RadioGroup.md
similarity index 100%
rename from src/molecules/RadioGroup.md
rename to packages/pubsweet-ui/src/molecules/RadioGroup.md
diff --git a/src/molecules/Supplementary.js b/packages/pubsweet-ui/src/molecules/Supplementary.js
similarity index 100%
rename from src/molecules/Supplementary.js
rename to packages/pubsweet-ui/src/molecules/Supplementary.js
diff --git a/src/molecules/Supplementary.md b/packages/pubsweet-ui/src/molecules/Supplementary.md
similarity index 100%
rename from src/molecules/Supplementary.md
rename to packages/pubsweet-ui/src/molecules/Supplementary.md
diff --git a/src/molecules/Upload.js b/packages/pubsweet-ui/src/molecules/Upload.js
similarity index 100%
rename from src/molecules/Upload.js
rename to packages/pubsweet-ui/src/molecules/Upload.js
diff --git a/src/molecules/YesOrNo.js b/packages/pubsweet-ui/src/molecules/YesOrNo.js
similarity index 100%
rename from src/molecules/YesOrNo.js
rename to packages/pubsweet-ui/src/molecules/YesOrNo.js
diff --git a/src/molecules/YesOrNo.local.scss b/packages/pubsweet-ui/src/molecules/YesOrNo.local.scss
similarity index 100%
rename from src/molecules/YesOrNo.local.scss
rename to packages/pubsweet-ui/src/molecules/YesOrNo.local.scss
diff --git a/src/molecules/YesOrNo.md b/packages/pubsweet-ui/src/molecules/YesOrNo.md
similarity index 100%
rename from src/molecules/YesOrNo.md
rename to packages/pubsweet-ui/src/molecules/YesOrNo.md
diff --git a/styleguide.config.js b/packages/pubsweet-ui/styleguide.config.js
similarity index 100%
rename from styleguide.config.js
rename to packages/pubsweet-ui/styleguide.config.js
diff --git a/test/AppBar.test.js b/packages/pubsweet-ui/test/AppBar.test.js
similarity index 100%
rename from test/AppBar.test.js
rename to packages/pubsweet-ui/test/AppBar.test.js
diff --git a/test/Menu.test.js b/packages/pubsweet-ui/test/Menu.test.js
similarity index 100%
rename from test/Menu.test.js
rename to packages/pubsweet-ui/test/Menu.test.js
diff --git a/test/Radio.test.js b/packages/pubsweet-ui/test/Radio.test.js
similarity index 100%
rename from test/Radio.test.js
rename to packages/pubsweet-ui/test/Radio.test.js
diff --git a/test/RadioGroup.test.js b/packages/pubsweet-ui/test/RadioGroup.test.js
similarity index 100%
rename from test/RadioGroup.test.js
rename to packages/pubsweet-ui/test/RadioGroup.test.js
diff --git a/test/YesOrNo.test.js b/packages/pubsweet-ui/test/YesOrNo.test.js
similarity index 100%
rename from test/YesOrNo.test.js
rename to packages/pubsweet-ui/test/YesOrNo.test.js
diff --git a/test/__snapshots__/AppBar.test.js.snap b/packages/pubsweet-ui/test/__snapshots__/AppBar.test.js.snap
similarity index 100%
rename from test/__snapshots__/AppBar.test.js.snap
rename to packages/pubsweet-ui/test/__snapshots__/AppBar.test.js.snap
diff --git a/test/__snapshots__/Menu.test.js.snap b/packages/pubsweet-ui/test/__snapshots__/Menu.test.js.snap
similarity index 100%
rename from test/__snapshots__/Menu.test.js.snap
rename to packages/pubsweet-ui/test/__snapshots__/Menu.test.js.snap
diff --git a/test/__snapshots__/Radio.test.js.snap b/packages/pubsweet-ui/test/__snapshots__/Radio.test.js.snap
similarity index 100%
rename from test/__snapshots__/Radio.test.js.snap
rename to packages/pubsweet-ui/test/__snapshots__/Radio.test.js.snap
diff --git a/test/__snapshots__/RadioGroup.test.js.snap b/packages/pubsweet-ui/test/__snapshots__/RadioGroup.test.js.snap
similarity index 100%
rename from test/__snapshots__/RadioGroup.test.js.snap
rename to packages/pubsweet-ui/test/__snapshots__/RadioGroup.test.js.snap
diff --git a/test/__snapshots__/YesOrNo.test.js.snap b/packages/pubsweet-ui/test/__snapshots__/YesOrNo.test.js.snap
similarity index 100%
rename from test/__snapshots__/YesOrNo.test.js.snap
rename to packages/pubsweet-ui/test/__snapshots__/YesOrNo.test.js.snap
diff --git a/test/config/transform.js b/packages/pubsweet-ui/test/config/transform.js
similarity index 100%
rename from test/config/transform.js
rename to packages/pubsweet-ui/test/config/transform.js
diff --git a/test/setup/enzyme.js b/packages/pubsweet-ui/test/setup/enzyme.js
similarity index 100%
rename from test/setup/enzyme.js
rename to packages/pubsweet-ui/test/setup/enzyme.js
diff --git a/webpack.config.js b/packages/pubsweet-ui/webpack.config.js
similarity index 100%
rename from webpack.config.js
rename to packages/pubsweet-ui/webpack.config.js