diff --git a/editors/editoria/package.json b/editors/editoria/package.json
index 2ab7378dbf047c638901986139f0c2622672a7ae..348c35c634c2786c568f7835b5c2d90df2fed77d 100644
--- a/editors/editoria/package.json
+++ b/editors/editoria/package.json
@@ -4,7 +4,6 @@
   "private": true,
   "dependencies": {
     "@guardian/prosemirror-invisibles": "^1.2.0",
-    "babel-plugin-parameter-decorator": "1.0.12",
     "prosemirror-tables": "^0.9.5",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
diff --git a/package.json b/package.json
index 5ddabbba94d0b5d3b76389cdce0417febf538ae8..c5a676d1840f5e3d43b60dd90e95241bd967cfe4 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "@babel/plugin-proposal-decorators": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
+    "babel-plugin-parameter-decorator": "1.0.12",
     "css-loader": "^0.28.11",
     "lerna": "^2.6.0",
     "react-app-rewired": "^2.1.2",
diff --git a/wax-prosemirror-components/rollup.config.js b/wax-prosemirror-components/rollup.config.js
index 15a09995a2e3d1017029309f556bd57e0c2b029e..8d989b437ac1fede109f5571208e970244ccdd15 100644
--- a/wax-prosemirror-components/rollup.config.js
+++ b/wax-prosemirror-components/rollup.config.js
@@ -18,11 +18,6 @@ export default {
     }),
     babel({
       presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),
diff --git a/wax-prosemirror-core/rollup.config.js b/wax-prosemirror-core/rollup.config.js
index 64b68c8961bf90c6ff2ab9c1735b8b964cabbee8..9ffc2c2499905a2a347f2a36e19c0d65cf1d3181 100644
--- a/wax-prosemirror-core/rollup.config.js
+++ b/wax-prosemirror-core/rollup.config.js
@@ -20,8 +20,7 @@ export default {
       presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
+        "babel-plugin-parameter-decorator"
       ],
       exclude: "node_modules/**",
       runtimeHelpers: true
diff --git a/wax-prosemirror-layouts/src/layouts/DefaultLayout.js b/wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js
similarity index 100%
rename from wax-prosemirror-layouts/src/layouts/DefaultLayout.js
rename to wax-prosemirror-core/src/services/LayoutService/DefaultLayout/DefaultLayout.js
diff --git a/wax-prosemirror-core/src/services/LayoutService/Layout.js b/wax-prosemirror-core/src/services/LayoutService/Layout.js
index 59bf0f1f46db61f976c3a002913fbf32aa216f30..229d6eca833f7de175bc4f297d0f4e1607a47e4b 100644
--- a/wax-prosemirror-core/src/services/LayoutService/Layout.js
+++ b/wax-prosemirror-core/src/services/LayoutService/Layout.js
@@ -1,5 +1,5 @@
 import { injectable } from "inversify";
-import { DefaultLayout } from "wax-prosemirror-layouts";
+import DefaultLayout from "./DefaultLayout/DefaultLayout";
 import LayoutFactory from "./components/LayoutFactory";
 
 @injectable()
diff --git a/wax-prosemirror-layouts/index.js b/wax-prosemirror-layouts/index.js
index 6ea69e16ea2c99700e74539eb2310489deb0ecbf..c48bf92d52569f9696a1c5f88dbf4805f7469279 100644
--- a/wax-prosemirror-layouts/index.js
+++ b/wax-prosemirror-layouts/index.js
@@ -1,2 +1 @@
 export { default as EditoriaLayout } from "./src/layouts/EditoriaLayout";
-export { default as DefaultLayout } from "./src/layouts/DefaultLayout";
diff --git a/wax-prosemirror-layouts/rollup.config.js b/wax-prosemirror-layouts/rollup.config.js
index 8003f54586ac909eb593a6a6cfca6e9b851c37af..4443b1f9a2686cf6e54710f91271d25453de6497 100644
--- a/wax-prosemirror-layouts/rollup.config.js
+++ b/wax-prosemirror-layouts/rollup.config.js
@@ -18,11 +18,6 @@ export default {
     }),
     babel({
       presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
index f43c40919d03fced0270d46b8a1aa16435b08a36..b2b93c1a1f7fb7b69a20b998933eecd01794fb81 100644
--- a/wax-prosemirror-plugins/rollup.config.js
+++ b/wax-prosemirror-plugins/rollup.config.js
@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),
diff --git a/wax-prosemirror-schema/rollup.config.js b/wax-prosemirror-schema/rollup.config.js
index 1ab72128a5dbb74dccfd9354e1c10bbdc14b8dd2..6887179da74255fb0d82d19b5fa8e057fee980f8 100644
--- a/wax-prosemirror-schema/rollup.config.js
+++ b/wax-prosemirror-schema/rollup.config.js
@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index 8454fc6a129e8c6960e0515ee3a086c303d85bf7..95e85457cded71ac13c6a28b1bc4015b41cffda4 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/wax-prosemirror-services/rollup.config.js
@@ -4,7 +4,7 @@ import external from "rollup-plugin-peer-deps-external";
 import { terser } from "rollup-plugin-terser";
 
 export default {
-  input: "./index.js",
+  input: "index.js",
   output: [
     {
       file: "dist/index.js",
@@ -20,8 +20,7 @@ export default {
       presets: ["react-app"],
       plugins: [
         ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
+        "babel-plugin-parameter-decorator"
       ],
       exclude: "node_modules/**",
       runtimeHelpers: true
@@ -35,6 +34,7 @@ export default {
     "react-dom",
     "wax-prosemirror-schema",
     "lodash",
-    "prosemirror-tables"
+    "prosemirror-tables",
+    "prosemirror-schema-list"
   ]
 };
diff --git a/wax-prosemirror-themes/rollup.config.js b/wax-prosemirror-themes/rollup.config.js
index 8e356c8ef36a0e0ea784aaf76bb44fa9387ec2eb..1a7da58dbb3fda81fa41046c0f703c5cd5ee06b2 100644
--- a/wax-prosemirror-themes/rollup.config.js
+++ b/wax-prosemirror-themes/rollup.config.js
@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),
diff --git a/wax-prosemirror-utilities/rollup.config.js b/wax-prosemirror-utilities/rollup.config.js
index 1ab72128a5dbb74dccfd9354e1c10bbdc14b8dd2..6887179da74255fb0d82d19b5fa8e057fee980f8 100644
--- a/wax-prosemirror-utilities/rollup.config.js
+++ b/wax-prosemirror-utilities/rollup.config.js
@@ -17,12 +17,6 @@ export default {
       includeDependencies: true
     }),
     babel({
-      presets: ["react-app"],
-      plugins: [
-        ["@babel/plugin-proposal-decorators", { legacy: true }],
-        "babel-plugin-parameter-decorator",
-        ["@babel/plugin-proposal-class-properties", { loose: true }]
-      ],
       exclude: "node_modules/**",
       runtimeHelpers: true
     }),