diff --git a/wax-prosemirror-schema/index.js b/wax-prosemirror-schema/index.js
index 581f1fe54983dd7df6f015119c260597804565cc..5a5cc55f45277c26af07e973945882c25c791859 100644
--- a/wax-prosemirror-schema/index.js
+++ b/wax-prosemirror-schema/index.js
@@ -1,21 +1,4 @@
 /*
-LIST OF SUPPORTED MARKS
-*/
-export { default as codeMark } from './src/marks/codeMark';
-export { default as strongMark } from './src/marks/strongMark';
-export { default as linkMark } from './src/marks/linkMark';
-export { default as emphasisMark } from './src/marks/emphasisMark';
-export { default as subscriptMark } from './src/marks/subscriptMark';
-export { default as superscriptMark } from './src/marks/superscriptMark';
-export { default as strikethroughMark } from './src/marks/strikethroughMark';
-export { default as underlineMark } from './src/marks/underlineMark';
-export { default as smallcapsMark } from './src/marks/smallcapsMark';
-export { default as sourceMark } from './src/marks/sourceMark';
-export { default as commentMark } from './src/marks/commentMark';
-export { default as mathSelectMark } from './src/marks/mathSelectMark';
-export { default as highlightMark } from './src/marks/highlightMark';
-export { default as customtagInlineMark } from './src/marks/customTagInlineMark';
-/*
 LIST OF TRACK CHANGES MARKS
 */
 export { default as trackChangesMarks } from './src/marks/trackChangesMarks';
diff --git a/wax-prosemirror-schema/src/marks/codeMark.js b/wax-prosemirror-schema/src/marks/codeMark.js
deleted file mode 100644
index a9e6ab1ef818a09622c2a272826ba30ba38c3e65..0000000000000000000000000000000000000000
--- a/wax-prosemirror-schema/src/marks/codeMark.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const code = {
-  parseDOM: { tag: "code" },
-  toDOM(hook, next) {
-    hook.value = ["code", 0];
-    next();
-  }
-};
-
-export default code;
diff --git a/wax-prosemirror-schema/src/marks/sourceMark.js b/wax-prosemirror-schema/src/marks/sourceMark.js
deleted file mode 100644
index 7b87d7b462c8198a44b869292a83c97865cfb324..0000000000000000000000000000000000000000
--- a/wax-prosemirror-schema/src/marks/sourceMark.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const source = {
-  parseDOM: [{ tag: "cite" }],
-  toDOM() {
-    return ["cite", 0];
-  }
-};
-
-export default source;
diff --git a/wax-prosemirror-schema/src/marks/subscriptMark.js b/wax-prosemirror-schema/src/marks/subscriptMark.js
deleted file mode 100644
index ee7d7fc4a48543f2aa23af199cbe4e8531745de3..0000000000000000000000000000000000000000
--- a/wax-prosemirror-schema/src/marks/subscriptMark.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const subscript = {
-  excludes: "superscript",
-  parseDOM: [{ tag: "sub" }, { style: "vertical-align=sub" }],
-  toDOM(hook, next) {
-    hook.value = ["sub"];
-    next();
-  }
-};
-
-export default subscript;
diff --git a/wax-prosemirror-schema/src/marks/superscriptMark.js b/wax-prosemirror-schema/src/marks/superscriptMark.js
deleted file mode 100644
index 4e4bc5328a2d9ad11544b826c9254cff866cb24d..0000000000000000000000000000000000000000
--- a/wax-prosemirror-schema/src/marks/superscriptMark.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const superscript = {
-  excludes: "subscript",
-  parseDOM: [{ tag: "sup" }, { style: "vertical-align=super" }],
-  toDOM: (hook, next) => {
-    hook.value = ["sup"];
-    next();
-  }
-};
-
-export default superscript;
diff --git a/wax-prosemirror-services/src/CommentsService/CommentsService.js b/wax-prosemirror-services/src/CommentsService/CommentsService.js
index 149006cfdec6dd5fafb5b847dcb54bf1ba8831f6..b09dd1c9ddb07b8736733c5c50df835b162df9c2 100644
--- a/wax-prosemirror-services/src/CommentsService/CommentsService.js
+++ b/wax-prosemirror-services/src/CommentsService/CommentsService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
-import { commentMark } from 'wax-prosemirror-schema';
 import { RightArea, CommentBubbleComponent } from 'wax-prosemirror-components';
+import commentMark from './schema/commentMark';
 import CommentPlugin from './plugins/CommentPlugin';
 import CopyPasteCommentPlugin from './plugins/CopyPasteCommentPlugin';
 import './comments.css';
diff --git a/wax-prosemirror-schema/src/marks/commentMark.js b/wax-prosemirror-services/src/CommentsService/schema/commentMark.js
similarity index 94%
rename from wax-prosemirror-schema/src/marks/commentMark.js
rename to wax-prosemirror-services/src/CommentsService/schema/commentMark.js
index aee15bd8176590a1071f3fbfc869205d0f655114..15d92a34c466f8995036ddc979d136decacba9b7 100644
--- a/wax-prosemirror-schema/src/marks/commentMark.js
+++ b/wax-prosemirror-services/src/CommentsService/schema/commentMark.js
@@ -1,4 +1,4 @@
-const comment = {
+const commentMark = {
   attrs: {
     class: { default: 'comment' },
     id: { default: '' },
@@ -38,4 +38,4 @@ const comment = {
   },
 };
 
-export default comment;
+export default commentMark;
diff --git a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
index c10d644cf5535b930e0b781e9d751241e74286f5..a7da291b3d62976df2a9a865118380a7d58fbb28 100644
--- a/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
+++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/CustomTagInlineService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { CustomTagInlineOverlayComponent } from 'wax-prosemirror-components';
-import { customtagInlineMark } from 'wax-prosemirror-schema';
+import customtagInlineMark from './schema/customtagInlineMark';
 import CustomTagInlineTool from './CustomTagInlineTool';
 
 class CustomTagInlineService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/customTagInlineMark.js b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/schema/customtagInlineMark.js
similarity index 91%
rename from wax-prosemirror-schema/src/marks/customTagInlineMark.js
rename to wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/schema/customtagInlineMark.js
index 62acd1dd0c9a06f51ef53b3c832a5b03140bc143..6ce70f7f597225c5ea932ee8f14da3e3b831ca75 100644
--- a/wax-prosemirror-schema/src/marks/customTagInlineMark.js
+++ b/wax-prosemirror-services/src/CustomTagService/CustomTagInlineService/schema/customtagInlineMark.js
@@ -1,4 +1,4 @@
-const customtagInline = {
+const customtagInlineMark = {
   attrs: {
     class: { default: null },
     tags: [],
@@ -32,4 +32,4 @@ const customtagInline = {
   },
 };
 
-export default customtagInline;
+export default customtagInlineMark;
diff --git a/wax-prosemirror-services/src/HighlightService/HightlightService.js b/wax-prosemirror-services/src/HighlightService/HightlightService.js
index d02531af7c89c3a6f0baf55354c044804de35e22..71a2b9db5c155e4c8acf184247d2385e4b078c9e 100644
--- a/wax-prosemirror-services/src/HighlightService/HightlightService.js
+++ b/wax-prosemirror-services/src/HighlightService/HightlightService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { highlightMark } from 'wax-prosemirror-schema';
+import highlightMark from './schema/highlightMark';
 import TextHighlightTool from './TextHighlightTool';
 
 export default class HighlightService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/highlightMark.js b/wax-prosemirror-services/src/HighlightService/schema/highlightMark.js
similarity index 90%
rename from wax-prosemirror-schema/src/marks/highlightMark.js
rename to wax-prosemirror-services/src/HighlightService/schema/highlightMark.js
index 322c6031490321b3106be7cc2af5753c205a7741..58391d47206e159cb61b499c66b8f95f71e38ea4 100644
--- a/wax-prosemirror-schema/src/marks/highlightMark.js
+++ b/wax-prosemirror-services/src/HighlightService/schema/highlightMark.js
@@ -1,4 +1,4 @@
-const highlight = {
+const highlightMark = {
   attrs: {
     style: { default: null },
     class: { default: 'highlight' },
@@ -23,4 +23,4 @@ const highlight = {
   },
 };
 
-export default highlight;
+export default highlightMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
index 22343f06c776d474d39a159a07f6d81500fb6948..59f6d725414aed09090083aea9913a888806bf34 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/CodeService/CodeService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { toggleMark } from 'prosemirror-commands';
-import { codeMark } from 'wax-prosemirror-schema';
+import codeMark from './schema/codeMark';
 import Code from './Code';
 
 class CodeService extends Service {
diff --git a/wax-prosemirror-services/src/InlineAnnotations/CodeService/schema/codeMark.js b/wax-prosemirror-services/src/InlineAnnotations/CodeService/schema/codeMark.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1b042ed62c93763b344c61b04c6e870105ca34a
--- /dev/null
+++ b/wax-prosemirror-services/src/InlineAnnotations/CodeService/schema/codeMark.js
@@ -0,0 +1,9 @@
+const codeMark = {
+  parseDOM: { tag: 'code' },
+  toDOM(hook, next) {
+    hook.value = ['code', 0];
+    next();
+  },
+};
+
+export default codeMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
index 48e3dac84c10ef89e27d17417fdac7e33c59547f..2bc7316d7bd185fbc293fbb8c3025e4f1eed7076 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/EmphasisService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { toggleMark } from 'prosemirror-commands';
-import { emphasisMark } from 'wax-prosemirror-schema';
+import emphasisMark from './schema/emphasisMark';
 import Emphasis from './Emphasis';
 
 class EmphasisService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/emphasisMark.js b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/schema/emphasisMark.js
similarity index 73%
rename from wax-prosemirror-schema/src/marks/emphasisMark.js
rename to wax-prosemirror-services/src/InlineAnnotations/EmphasisService/schema/emphasisMark.js
index 25c6835c0b3c6dd3059a77c187749ef4c0eb49ad..9f5bc0aee3fb466188bd244a67b4b622fb3e7fee 100644
--- a/wax-prosemirror-schema/src/marks/emphasisMark.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/EmphasisService/schema/emphasisMark.js
@@ -1,4 +1,4 @@
-const em = {
+const emphasisMark = {
   parseDOM: [{ tag: 'i' }, { tag: 'em' }, { style: 'font-style=italic' }],
   toDOM(hook, next) {
     hook.value = ['em', 0];
@@ -6,4 +6,4 @@ const em = {
   },
 };
 
-export default em;
+export default emphasisMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
index dcc5097f0774e32231ea684d660243a7c9b7f82e..9ac16008ad29e896b07cd5cc05720270021bc1ec 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/SmallCapsService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { smallcapsMark } from 'wax-prosemirror-schema';
+import smallcapsMark from './schema/smallcapsMark';
 import SmallCaps from './SmallCaps';
 
 class SmallCapsService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/smallcapsMark.js b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/schema/smallcapsMark.js
similarity index 87%
rename from wax-prosemirror-schema/src/marks/smallcapsMark.js
rename to wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/schema/smallcapsMark.js
index bdf73f6f7f08c7ca817cd6cd20e1ec16d08bf90a..df19d67bdfe3fbbaa4a42c156b9fe94db253c4e5 100644
--- a/wax-prosemirror-schema/src/marks/smallcapsMark.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SmallCapsService/schema/smallcapsMark.js
@@ -1,4 +1,4 @@
-const smallcaps = {
+const smallcapsMark = {
   attrs: {
     class: { default: 'small-caps' },
   },
@@ -20,4 +20,4 @@ const smallcaps = {
   },
 };
 
-export default smallcaps;
+export default smallcapsMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
index f0bb9a51424c363745542eafaa72c7706781704e..1784d570a35e85e302f6a19222b2f1fe32bcc3cd 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/StrikeThroughService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { strikethroughMark } from 'wax-prosemirror-schema';
+import strikethroughMark from './schema/strikethroughMark';
 import StrikeThrough from './StrikeThrough';
 
 class StrikeThroughService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/strikethroughMark.js b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/schema/strikethroughMark.js
similarity index 89%
rename from wax-prosemirror-schema/src/marks/strikethroughMark.js
rename to wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/schema/strikethroughMark.js
index 0f77448935135503030acec2e74f662cd59e572c..18aa35bbc486c8903eab8231a4377ea14c14d988 100644
--- a/wax-prosemirror-schema/src/marks/strikethroughMark.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrikeThroughService/schema/strikethroughMark.js
@@ -1,4 +1,4 @@
-const strikethrough = {
+const strikethroughMark = {
   attrs: {
     class: { default: 'strikethrough' },
     style: { default: 'text-decoration:line-through' },
@@ -23,4 +23,4 @@ const strikethrough = {
   },
 };
 
-export default strikethrough;
+export default strikethroughMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js b/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
index 11ba9ec3b023fbf3bd5f6395d6e7fd86c3284a10..3f8a7d9416ecb8d872c5474c9197d372614afbd4 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrongService/StrongService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { toggleMark } from 'prosemirror-commands';
-import { strongMark } from 'wax-prosemirror-schema';
+import strongMark from './schema/strongMark';
 import Strong from './Strong';
 import './strong.css';
 
diff --git a/wax-prosemirror-schema/src/marks/strongMark.js b/wax-prosemirror-services/src/InlineAnnotations/StrongService/schema/strongMark.js
similarity index 90%
rename from wax-prosemirror-schema/src/marks/strongMark.js
rename to wax-prosemirror-services/src/InlineAnnotations/StrongService/schema/strongMark.js
index e1fc8ea10cb4d8796a9a275513869770ef9bb524..1f7a64ffcdb1372526b478f14e2c8854d1e235c9 100644
--- a/wax-prosemirror-schema/src/marks/strongMark.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/StrongService/schema/strongMark.js
@@ -1,4 +1,4 @@
-const strong = {
+const strongMark = {
   parseDOM: [
     { tag: 'strong' },
     // This works around a Google Docs misbehavior where
@@ -15,4 +15,4 @@ const strong = {
   },
 };
 
-export default strong;
+export default strongMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
index f8496c1f4676515b1b5b00bbacfab6ab9bed194b..27a600424a61703bb9940b35ded61a96c0ab92f7 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/SubscriptService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { subscriptMark } from 'wax-prosemirror-schema';
+import subscriptMark from './schema/subscriptMark';
 import Subscript from './Subscript';
 import './subscript.css';
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/schema/subscriptMark.js b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/schema/subscriptMark.js
new file mode 100644
index 0000000000000000000000000000000000000000..675fb57129bec6c083caadfe14a2dfcceeca1288
--- /dev/null
+++ b/wax-prosemirror-services/src/InlineAnnotations/SubscriptService/schema/subscriptMark.js
@@ -0,0 +1,10 @@
+const subscriptMark = {
+  excludes: 'superscript',
+  parseDOM: [{ tag: 'sub' }, { style: 'vertical-align=sub' }],
+  toDOM(hook, next) {
+    hook.value = ['sub'];
+    next();
+  },
+};
+
+export default subscriptMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
index 6d6637efb87d8baa877b5c0bc1bc0cd2ebb99ae9..462e702adb93950898c6a65ed81958294ca4292b 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/SuperscriptService.js
@@ -1,5 +1,5 @@
 import { Service } from 'wax-prosemirror-core';
-import { superscriptMark } from 'wax-prosemirror-schema';
+import superscriptMark from './schema/superscriptMark';
 import Superscript from './Superscript';
 import './superscript.css';
 
diff --git a/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/schema/superscriptMark.js b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/schema/superscriptMark.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed53294644e410b1f4fbbfb2c2642f4f39c1fe57
--- /dev/null
+++ b/wax-prosemirror-services/src/InlineAnnotations/SuperscriptService/schema/superscriptMark.js
@@ -0,0 +1,10 @@
+const superscriptMark = {
+  excludes: 'subscript',
+  parseDOM: [{ tag: 'sup' }, { style: 'vertical-align=super' }],
+  toDOM: (hook, next) => {
+    hook.value = ['sup'];
+    next();
+  },
+};
+
+export default superscriptMark;
diff --git a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
index d9ca47959fd208660ee137fc1d383d7aabfba3f8..b175116ae141817dd205d1f6bdaf3baa45ed802f 100644
--- a/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/UnderlineService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { toggleMark } from 'prosemirror-commands';
-import { underlineMark } from 'wax-prosemirror-schema';
+import underlineMark from './schema/underlineMark';
 import Underline from './Underline';
 
 class UnderlineService extends Service {
diff --git a/wax-prosemirror-schema/src/marks/underlineMark.js b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/schema/underlineMark.js
similarity index 73%
rename from wax-prosemirror-schema/src/marks/underlineMark.js
rename to wax-prosemirror-services/src/InlineAnnotations/UnderlineService/schema/underlineMark.js
index 3e4a135686d4a47b03d9d88ac3c97d74e2c1104e..3c06aff03fabde2f83c1f4672c44d6e2e75e2cf7 100644
--- a/wax-prosemirror-schema/src/marks/underlineMark.js
+++ b/wax-prosemirror-services/src/InlineAnnotations/UnderlineService/schema/underlineMark.js
@@ -1,4 +1,4 @@
-const underline = {
+const underlineMark = {
   parseDOM: [{ tag: 'u' }],
   toDOM: (hook, next) => {
     // eslint-disable-next-line no-param-reassign
@@ -7,4 +7,4 @@ const underline = {
   },
 };
 
-export default underline;
+export default underlineMark;
diff --git a/wax-prosemirror-services/src/LinkService/LinkService.js b/wax-prosemirror-services/src/LinkService/LinkService.js
index 8701739c48eb0a657b080e2844542828827f01f5..4a64c1779d9621a64ef7d6b98860080a4739a355 100644
--- a/wax-prosemirror-services/src/LinkService/LinkService.js
+++ b/wax-prosemirror-services/src/LinkService/LinkService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import { LinkComponent } from 'wax-prosemirror-components';
-import { linkMark } from 'wax-prosemirror-schema';
+import linkMark from './schema/linkMark';
 import LinkTool from './LinkTool';
 import linkRule from './LinkInputRule';
 
diff --git a/wax-prosemirror-schema/src/marks/linkMark.js b/wax-prosemirror-services/src/LinkService/schema/linkMark.js
similarity index 94%
rename from wax-prosemirror-schema/src/marks/linkMark.js
rename to wax-prosemirror-services/src/LinkService/schema/linkMark.js
index 291fe66716ec95ac259d91ebf9a090d7e9dcf7ee..96323befad5195b8792cf60c2f46567083f9b660 100644
--- a/wax-prosemirror-schema/src/marks/linkMark.js
+++ b/wax-prosemirror-services/src/LinkService/schema/linkMark.js
@@ -1,4 +1,4 @@
-const link = {
+const linkMark = {
   attrs: {
     href: { default: null },
     rel: { default: '' },
@@ -29,4 +29,4 @@ const link = {
   },
 };
 
-export default link;
+export default linkMark;
diff --git a/wax-prosemirror-services/src/MathService/MathService.js b/wax-prosemirror-services/src/MathService/MathService.js
index 5e5e9da0139025dd5184b8597340bf44caf4f96c..8647915f450aec7de9ae454581c6da4576e50bb5 100644
--- a/wax-prosemirror-services/src/MathService/MathService.js
+++ b/wax-prosemirror-services/src/MathService/MathService.js
@@ -1,9 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
-import {
-  mathDisplayNode,
-  mathInlineNode,
-  mathSelectMark,
-} from 'wax-prosemirror-schema';
+import { mathDisplayNode, mathInlineNode } from 'wax-prosemirror-schema';
+import mathSelectMark from './schema/mathSelectMark';
 import mathPlugin from './plugins/math-plugin';
 import mathSelectPlugin from './plugins/math-select';
 import inlineInputRule from './InlineInputRule';
diff --git a/wax-prosemirror-schema/src/marks/mathSelectMark.js b/wax-prosemirror-services/src/MathService/schema/mathSelectMark.js
similarity index 100%
rename from wax-prosemirror-schema/src/marks/mathSelectMark.js
rename to wax-prosemirror-services/src/MathService/schema/mathSelectMark.js