diff --git a/editors/demo/config-overrides.js b/editors/demo/config-overrides.js
index da69381446be659fddff43c4ae77a2cd6f6084a5..2886c1db5996e78feccf1f0966b7bd2d31f4c2fd 100644
--- a/editors/demo/config-overrides.js
+++ b/editors/demo/config-overrides.js
@@ -15,10 +15,6 @@ module.exports = function override(config, env) {
         __dirname,
         '../../wax-prosemirror-services/index',
       ),
-      'wax-prosemirror-plugins': path.resolve(
-        __dirname,
-        '../../wax-prosemirror-plugins/index',
-      ),
       'wax-prosemirror-schema': path.resolve(
         __dirname,
         '../../wax-prosemirror-schema/index',
diff --git a/editors/demo/package.json b/editors/demo/package.json
index b641765b8d179a7cd2a3880f3e1c9473bb75990f..20267270ada21f95a1e6da8d0e9bb1b9ceaa80e2 100644
--- a/editors/demo/package.json
+++ b/editors/demo/package.json
@@ -16,7 +16,6 @@
     "typeface-vollkorn": "^0.0.54",
     "wax-prosemirror-components": "^0.5.13",
     "wax-prosemirror-core": "^0.5.13",
-    "wax-prosemirror-plugins": "^0.5.13",
     "wax-prosemirror-services": "^0.5.13"
   },
   "scripts": {
diff --git a/package.json b/package.json
index c781e23ab31b7db95e4cc6fab33eeca4d0815469..5b66c8edf7ebbff154beb47ec56aee5a684fb200 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
     "wax-prosemirror-core",
     "wax-prosemirror-schema",
     "wax-prosemirror-components",
-    "wax-prosemirror-plugins",
     "wax-prosemirror-services",
     "editors/*"
   ],
diff --git a/wax-prosemirror-plugins/.gitignore b/wax-prosemirror-plugins/.gitignore
deleted file mode 100644
index b3e3ccb6b0ce3a90e1eb3f9e78da7924ea89f116..0000000000000000000000000000000000000000
--- a/wax-prosemirror-plugins/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# dependencies
-/node_modules
-
-# testing
-/coverage
-
-# production
-/build
-
-# dist
-/dist
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.directory
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-yarn.lock
-package-lock.json
diff --git a/wax-prosemirror-plugins/index.js b/wax-prosemirror-plugins/index.js
deleted file mode 100644
index 745b52ca82c9e0b1bde15254a74c24a36ad2e970..0000000000000000000000000000000000000000
--- a/wax-prosemirror-plugins/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export { default as TrackChangePlugin } from './src/trackChanges/TrackChangePlugin';
-export { default as HideShowPlugin } from './src/trackChanges/HideShowPlugin';
-
-export { default as CommentPlugin } from './src/comments/CommentPlugin';
-export { default as CopyPasteCommentPlugin } from './src/comments/CopyPasteCommentPlugin';
-
-export { default as highlightPlugin } from './src/highlightPlugin';
-
-export { default as mathPlugin } from './src/math/math-plugin';
-export { default as mathSelectPlugin } from './src/math/math-select';
-export { default as FindAndReplacePlugin } from './src/findAndReplace/FindAndReplacePlugin';
-export { default as PlaceHolderPlugin } from './src/images/placeHolderPlugin';
-export { default as captionPlugin } from './src/images/captionPlugin';
-export { default as GetContentOnEnterPlugin } from './src/GetContentOnEnterPlugin';
diff --git a/wax-prosemirror-plugins/jsconfig.json b/wax-prosemirror-plugins/jsconfig.json
deleted file mode 100644
index 504cd646e14906b4db8e943f9bfb10ab80162cee..0000000000000000000000000000000000000000
--- a/wax-prosemirror-plugins/jsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true
-  }
-}
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
deleted file mode 100644
index 339a048e103c7696f33c169c3d18ecb6c2ae6526..0000000000000000000000000000000000000000
--- a/wax-prosemirror-plugins/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "wax-prosemirror-plugins",
-  "author": "Christos Kokosias & Giannis Kopanas",
-  "version": "0.5.13",
-  "description": "Wax prosemirror plugins",
-  "license": "MIT",
-  "main": "dist/index.js",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "BABEL_ENV=production rollup -c"
-  },
-  "dependencies": {
-    "highlight.js": "^10.1.1",
-    "lodash": "^4.17.4",
-    "mathjax-full": "3.1.4",
-    "prosemirror-commands": "1.2.1",
-    "prosemirror-highlightjs": "^0.2.0",
-    "prosemirror-keymap": "1.1.5",
-    "prosemirror-state": "1.3.3",
-    "prosemirror-transform": "1.3.4",
-    "prosemirror-view": "1.23.7",
-    "wax-prosemirror-components": "^0.5.13",
-    "wax-prosemirror-core": "^0.5.13",
-    "wax-prosemirror-utilities": "^0.5.13"
-  }
-}
diff --git a/wax-prosemirror-plugins/rollup.config.js b/wax-prosemirror-plugins/rollup.config.js
deleted file mode 100644
index 839209de9af23cfb44222a83b539625b3cebb143..0000000000000000000000000000000000000000
--- a/wax-prosemirror-plugins/rollup.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import babel from 'rollup-plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import external from 'rollup-plugin-peer-deps-external';
-import css from 'rollup-plugin-import-css';
-import { terser } from 'rollup-plugin-terser';
-
-export default {
-  input: './index.js',
-  output: [
-    {
-      file: 'dist/index.js',
-      format: 'cjs',
-      sourcemap: false,
-    },
-  ],
-  plugins: [
-    css(),
-    external({
-      includeDependencies: true,
-    }),
-    babel({
-      exclude: 'node_modules/**',
-      runtimeHelpers: true,
-    }),
-    commonjs(),
-    terser(),
-  ],
-};
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index cd3aeb5689fa94e2e6e885b7ebdec70c3c151ae3..590b17ae1cb6016f2eddf44674a5f1a99f365831 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -33,7 +33,6 @@
     "uuid": "^7.0.3",
     "wax-prosemirror-components": "^0.5.13",
     "wax-prosemirror-core": "^0.5.13",
-    "wax-prosemirror-plugins": "^0.5.13",
     "wax-prosemirror-schema": "^0.5.13"
   },
   "peerDependencies": {
diff --git a/wax-prosemirror-services/rollup.config.js b/wax-prosemirror-services/rollup.config.js
index e23b0931b4a2752cf353c58bcaaa3a329bf06617..2ce6aaafee7612f1b0547755b3e9991998f21663 100644
--- a/wax-prosemirror-services/rollup.config.js
+++ b/wax-prosemirror-services/rollup.config.js
@@ -39,7 +39,6 @@ export default {
     'lodash',
     'prosemirror-tables',
     'prosemirror-schema-list',
-    'wax-prosemirror-plugins',
     'prosemirror-model',
     'prosemirror-inputrules',
   ],
diff --git a/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js b/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js
index b7221d9ae02916d9cb4c149268576170f4170336..d289f63c7d68ee6b30d281dfab9e08aad14cb4ee 100644
--- a/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js
+++ b/wax-prosemirror-services/src/CodeBlockService/CodeBlockService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
-import { highlightPlugin } from 'wax-prosemirror-plugins';
 import { codeBlockNode } from 'wax-prosemirror-schema';
+import highlightPlugin from './plugins/highlightPlugin';
 import CodeBlockTool from './CodeBlockTool';
 import './highlightStyles.css';
 
diff --git a/wax-prosemirror-plugins/src/highlightPlugin.js b/wax-prosemirror-services/src/CodeBlockService/plugins/highlightPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/highlightPlugin.js
rename to wax-prosemirror-services/src/CodeBlockService/plugins/highlightPlugin.js
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 98fa6f693953b0eb9e8e621b5122fcc83a687ca6..149006cfdec6dd5fafb5b847dcb54bf1ba8831f6 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -1,7 +1,8 @@
 import { Service } from 'wax-prosemirror-core';
 import { commentMark } from 'wax-prosemirror-schema';
 import { RightArea, CommentBubbleComponent } from 'wax-prosemirror-components';
-import { CommentPlugin, CopyPasteCommentPlugin } from 'wax-prosemirror-plugins';
+import CommentPlugin from './plugins/CommentPlugin';
+import CopyPasteCommentPlugin from './plugins/CopyPasteCommentPlugin';
 import './comments.css';
 
 const PLUGIN_KEY = 'commentPlugin';
diff --git a/wax-prosemirror-plugins/src/comments/CommentPlugin.js b/wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/comments/CommentPlugin.js
rename to wax-prosemirror-services/src/CommentsService/plugins/CommentPlugin.js
diff --git a/wax-prosemirror-plugins/src/comments/CopyPasteCommentPlugin.js b/wax-prosemirror-services/src/CommentsService/plugins/CopyPasteCommentPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/comments/CopyPasteCommentPlugin.js
rename to wax-prosemirror-services/src/CommentsService/plugins/CopyPasteCommentPlugin.js
diff --git a/wax-prosemirror-services/src/EnterService/EnterService.js b/wax-prosemirror-services/src/EnterService/EnterService.js
index 331feeb63fcd9101b09b42500f1dabaf3e96144e..567feaa0bc4bb3f9b410293089a70f4588f1b6c9 100644
--- a/wax-prosemirror-services/src/EnterService/EnterService.js
+++ b/wax-prosemirror-services/src/EnterService/EnterService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { GetContentOnEnterPlugin } from 'wax-prosemirror-plugins';
+import GetContentOnEnterPlugin from './plugins/GetContentOnEnterPlugin';
 
 class EnterService extends Service {
   name = 'EnterService';
diff --git a/wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js b/wax-prosemirror-services/src/EnterService/plugins/GetContentOnEnterPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/GetContentOnEnterPlugin.js
rename to wax-prosemirror-services/src/EnterService/plugins/GetContentOnEnterPlugin.js
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplaceService.js b/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplaceService.js
index b3819bbd792f9aa51e5937c24548563639cdd1df..5bbf7fd0f4fb417b814711dac848f3964ab3830b 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplaceService.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/FindAndReplaceService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { FindAndReplacePlugin } from 'wax-prosemirror-plugins';
+import FindAndReplacePlugin from './plugins/FindAndReplacePlugin';
 import FindAndReplace from './FindAndReplace';
 import './findAndReplace.css';
 
diff --git a/wax-prosemirror-plugins/src/findAndReplace/FindAndReplacePlugin.js b/wax-prosemirror-services/src/FindAndReplaceService/plugins/FindAndReplacePlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/findAndReplace/FindAndReplacePlugin.js
rename to wax-prosemirror-services/src/FindAndReplaceService/plugins/FindAndReplacePlugin.js
diff --git a/wax-prosemirror-services/src/ImageService/ImageService.js b/wax-prosemirror-services/src/ImageService/ImageService.js
index efbb680b13729a69ce910d3a08d48a73578ab1ad..a9c84709da6bbfcc2fdf6d2ecfbb0c2c0d347e60 100644
--- a/wax-prosemirror-services/src/ImageService/ImageService.js
+++ b/wax-prosemirror-services/src/ImageService/ImageService.js
@@ -4,7 +4,8 @@ import {
   figureCaptionNode,
   figureNode,
 } from 'wax-prosemirror-schema';
-import { PlaceHolderPlugin, captionPlugin } from 'wax-prosemirror-plugins';
+import PlaceHolderPlugin from './plugins/placeHolderPlugin';
+import captionPlugin from './plugins/captionPlugin';
 import Image from './Image';
 import './image.css';
 import AltComponent from './AltComponent';
diff --git a/wax-prosemirror-plugins/src/images/captionPlugin.js b/wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/images/captionPlugin.js
rename to wax-prosemirror-services/src/ImageService/plugins/captionPlugin.js
diff --git a/wax-prosemirror-plugins/src/images/placeHolderPlugin.js b/wax-prosemirror-services/src/ImageService/plugins/placeHolderPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/images/placeHolderPlugin.js
rename to wax-prosemirror-services/src/ImageService/plugins/placeHolderPlugin.js
diff --git a/wax-prosemirror-services/src/MathService/MathService.js b/wax-prosemirror-services/src/MathService/MathService.js
index c0f231d97bb57fc9bb5c31821b375ccbc5186941..5e5e9da0139025dd5184b8597340bf44caf4f96c 100644
--- a/wax-prosemirror-services/src/MathService/MathService.js
+++ b/wax-prosemirror-services/src/MathService/MathService.js
@@ -4,7 +4,8 @@ import {
   mathInlineNode,
   mathSelectMark,
 } from 'wax-prosemirror-schema';
-import { mathPlugin, mathSelectPlugin } from 'wax-prosemirror-plugins';
+import mathPlugin from './plugins/math-plugin';
+import mathSelectPlugin from './plugins/math-select';
 import inlineInputRule from './InlineInputRule';
 import blockInputRule from './BlockInputRule';
 import './math.css';
diff --git a/wax-prosemirror-plugins/src/math/helpers/collapse-math-cmd.js b/wax-prosemirror-services/src/MathService/plugins/helpers/collapse-math-cmd.js
similarity index 100%
rename from wax-prosemirror-plugins/src/math/helpers/collapse-math-cmd.js
rename to wax-prosemirror-services/src/MathService/plugins/helpers/collapse-math-cmd.js
diff --git a/wax-prosemirror-plugins/src/math/math-nodeview.js b/wax-prosemirror-services/src/MathService/plugins/math-nodeview.js
similarity index 100%
rename from wax-prosemirror-plugins/src/math/math-nodeview.js
rename to wax-prosemirror-services/src/MathService/plugins/math-nodeview.js
diff --git a/wax-prosemirror-plugins/src/math/math-plugin.js b/wax-prosemirror-services/src/MathService/plugins/math-plugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/math/math-plugin.js
rename to wax-prosemirror-services/src/MathService/plugins/math-plugin.js
diff --git a/wax-prosemirror-plugins/src/math/math-select.js b/wax-prosemirror-services/src/MathService/plugins/math-select.js
similarity index 100%
rename from wax-prosemirror-plugins/src/math/math-select.js
rename to wax-prosemirror-services/src/MathService/plugins/math-select.js
diff --git a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
index 1c3fff694f1bb34e6ebb2db12498c369ad754490..96665e883643269e352187c888681fcdb1c9ea30 100644
--- a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
+++ b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
@@ -1,6 +1,7 @@
 import { Service } from 'wax-prosemirror-core';
 import { trackChangesMarks, trackChangesNodes } from 'wax-prosemirror-schema';
-import { TrackChangePlugin, HideShowPlugin } from 'wax-prosemirror-plugins';
+import TrackChangePlugin from './plugins/TrackChangePlugin';
+import HideShowPlugin from './plugins/HideShowPlugin';
 import TrackChangeServices from './index';
 import './trackChange.css';
 
diff --git a/wax-prosemirror-plugins/src/trackChanges/FindSelectedChanges.js b/wax-prosemirror-services/src/TrackChangeService/plugins/FindSelectedChanges.js
similarity index 100%
rename from wax-prosemirror-plugins/src/trackChanges/FindSelectedChanges.js
rename to wax-prosemirror-services/src/TrackChangeService/plugins/FindSelectedChanges.js
diff --git a/wax-prosemirror-plugins/src/trackChanges/HideShowPlugin.js b/wax-prosemirror-services/src/TrackChangeService/plugins/HideShowPlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/trackChanges/HideShowPlugin.js
rename to wax-prosemirror-services/src/TrackChangeService/plugins/HideShowPlugin.js
diff --git a/wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js b/wax-prosemirror-services/src/TrackChangeService/plugins/TrackChangePlugin.js
similarity index 100%
rename from wax-prosemirror-plugins/src/trackChanges/TrackChangePlugin.js
rename to wax-prosemirror-services/src/TrackChangeService/plugins/TrackChangePlugin.js