diff --git a/editors/demo/src/Editoria/config/config.js b/editors/demo/src/Editoria/config/config.js
index b40c7cb6fb904b70fbbb8b51cf4a6831876c61e2..65fa24bc4361e60250a7a78c36bf0490d3ffd935 100644
--- a/editors/demo/src/Editoria/config/config.js
+++ b/editors/demo/src/Editoria/config/config.js
@@ -22,7 +22,6 @@ import {
   HighlightService,
   BottomInfoService,
   TransformService,
-  TrackCommentOptionsToolGroupService,
   CustomTagService,
   disallowPasteImagesPlugin,
   BlockDropDownToolGroupService,
@@ -208,6 +207,5 @@ export default {
     new HighlightService(),
     new BottomInfoService(),
     new TransformService(),
-    new TrackCommentOptionsToolGroupService(),
   ],
 };
diff --git a/editors/demo/src/OEN/config/config.js b/editors/demo/src/OEN/config/config.js
index 9993db069398ccca9a46795887ae4185a88679ce..c468e6258ded6d4f29b721cb17604ec33bbe1d2b 100644
--- a/editors/demo/src/OEN/config/config.js
+++ b/editors/demo/src/OEN/config/config.js
@@ -22,7 +22,6 @@ import {
   HighlightService,
   BottomInfoService,
   TransformService,
-  TrackCommentOptionsToolGroupService,
   CustomTagService,
   OENContainersService,
 } from 'wax-prosemirror-services';
@@ -206,6 +205,5 @@ export default {
     new HighlightService(),
     new BottomInfoService(),
     new TransformService(),
-    new TrackCommentOptionsToolGroupService(),
   ],
 };
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index 60209bc2a51a35c27a16a0bdc1b40de554ace35f..af898118e764e1904a5b2276ba1f691c6ab8f193 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -37,7 +37,6 @@ ToolGroups
 */
 export { default as DisplayTextToolGroupService } from './src/WaxToolGroups/DisplayTextToolGroupService/DisplayTextToolGroupService';
 export { default as BlockDropDownToolGroupService } from './src/WaxToolGroups/BlockDropDownToolGroupService/BlockDropDownToolGroupService';
-export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
 /* Plugins */
 
 export { default as disallowPasteImagesPlugin } from './src/ImageService/plugins/disallowPasteImagesPlugin';
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptions.js b/wax-prosemirror-services/src/TrackChangeService/TrackCommentOptionsToolGroupService/TrackCommentOptions.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptions.js
rename to wax-prosemirror-services/src/TrackChangeService/TrackCommentOptionsToolGroupService/TrackCommentOptions.js
diff --git a/wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js b/wax-prosemirror-services/src/TrackChangeService/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js
rename to wax-prosemirror-services/src/TrackChangeService/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService.js
diff --git a/wax-prosemirror-services/src/TrackChangeService/index.js b/wax-prosemirror-services/src/TrackChangeService/index.js
index 6bd92366b8680aaea504d417da497bfa6370ff1b..82159a1bc190a1a6f25b0588972e570fcca7911e 100644
--- a/wax-prosemirror-services/src/TrackChangeService/index.js
+++ b/wax-prosemirror-services/src/TrackChangeService/index.js
@@ -4,6 +4,7 @@ import RejectTrackChangeService from './RejectTrackChangeService/RejectTrackChan
 import ShowHideTrackChangeService from './ShowHideTrackChangeService/ShowHideTrackChangeService';
 import TrackingAndEditingToolGroupService from './TrackingAndEditingToolGroupService/TrackingAndEditingToolGroupService';
 import TrackOptionsToolGroupService from './TrackOptionsToolGroupService/TrackOptionsToolGroupService';
+import TrackCommentOptionsToolGroupService from './TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
 
 export default [
   new EnableTrackChangeService(),
@@ -12,4 +13,5 @@ export default [
   new ShowHideTrackChangeService(),
   new TrackingAndEditingToolGroupService(),
   new TrackOptionsToolGroupService(),
+  new TrackCommentOptionsToolGroupService(),
 ];