diff --git a/wax-prosemirror-schema/index.js b/wax-prosemirror-schema/index.js
index 5a5cc55f45277c26af07e973945882c25c791859..ff6b30a452862714692eca71df6e7d7ae76d8151 100644
--- a/wax-prosemirror-schema/index.js
+++ b/wax-prosemirror-schema/index.js
@@ -1,8 +1,3 @@
-/*
-LIST OF TRACK CHANGES MARKS
-*/
-export { default as trackChangesMarks } from './src/marks/trackChangesMarks';
-
 /*
 LIST OF SUPPORTED NODES
 */
@@ -29,7 +24,3 @@ export { default as mathInlineNode } from './src/nodes/mathInlineNode';
 export { default as mathDisplayNode } from './src/nodes/mathDisplayNode';
 export { default as customBlockNode } from './src/nodes/customBlockNode';
 export { default as OenNodes } from './src/nodes/oenNodes';
-/*
-LIST OF TRACK CHANGES NODES
-*/
-export { default as trackChangesNodes } from './src/nodes/trackChangesNodes';
diff --git a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
index 96665e883643269e352187c888681fcdb1c9ea30..6f08f53b483e3f78810e5890000915819889bc46 100644
--- a/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
+++ b/wax-prosemirror-services/src/TrackChangeService/TrackChangeService.js
@@ -1,5 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
-import { trackChangesMarks, trackChangesNodes } from 'wax-prosemirror-schema';
+import trackChangesNodes from './schema/trackChangesNodes';
+import trackChangesMarks from './schema/trackChangesMarks';
 import TrackChangePlugin from './plugins/TrackChangePlugin';
 import HideShowPlugin from './plugins/HideShowPlugin';
 import TrackChangeServices from './index';
diff --git a/wax-prosemirror-schema/src/marks/trackChangesMarks/deletionMark.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/deletionMark.js
similarity index 100%
rename from wax-prosemirror-schema/src/marks/trackChangesMarks/deletionMark.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/deletionMark.js
diff --git a/wax-prosemirror-schema/src/marks/trackChangesMarks/formatChangeMark.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/formatChangeMark.js
similarity index 100%
rename from wax-prosemirror-schema/src/marks/trackChangesMarks/formatChangeMark.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/formatChangeMark.js
diff --git a/wax-prosemirror-schema/src/marks/trackChangesMarks/index.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/index.js
similarity index 100%
rename from wax-prosemirror-schema/src/marks/trackChangesMarks/index.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/index.js
diff --git a/wax-prosemirror-schema/src/marks/trackChangesMarks/insertionMark.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/insertionMark.js
similarity index 100%
rename from wax-prosemirror-schema/src/marks/trackChangesMarks/insertionMark.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesMarks/insertionMark.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/authorTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/authorTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/authorTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/bulletListTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/bulletListTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/bulletListTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/bulletListTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/customBlockTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/customBlockTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/customBlockTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/customBlockTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/epigraphPoetryTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/epigraphPoetryTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/epigraphPoetryTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/epigraphPoetryTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/epigraphProseTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/epigraphProseTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/epigraphProseTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/epigraphProseTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/extractPoetryTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/extractPoetryTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/extractPoetryTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/extractPoetryTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/extractProseTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/extractProseTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/extractProseTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/extractProseTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/headingTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/headingTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/headingTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/headingTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/imageTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/imageTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/imageTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/imageTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/index.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/index.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/index.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/index.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/listItemTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/listItemTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/listItemTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/listItemTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/orderedListTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/orderedListTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/orderedListTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/orderedListTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/paragraphContTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/paragraphContTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/paragraphContTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/paragraphContTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/sourceNoteTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/sourceNoteTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/sourceNoteTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/sourceNoteTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/subTitleTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/subTitleTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/subTitleTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/subTitleTrackNode.js
diff --git a/wax-prosemirror-schema/src/nodes/trackChangesNodes/titleTrackNode.js b/wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/titleTrackNode.js
similarity index 100%
rename from wax-prosemirror-schema/src/nodes/trackChangesNodes/titleTrackNode.js
rename to wax-prosemirror-services/src/TrackChangeService/schema/trackChangesNodes/titleTrackNode.js