diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js
index d7cfe9046c9e0c2202551b54975c7ba7f622bf73..7b142ac92100267bb39e2be4b714cea2147d9a67 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js
@@ -1,6 +1,6 @@
 import { Service } from 'wax-prosemirror-core';
 import CreateGap from './CreateGap';
-import FillTheGapToolGroupService from '../../WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService';
+import FillTheGapToolGroupService from '../FillTheGapToolGroupService/FillTheGapToolGroupService';
 
 class FillTheGapQuestionService extends Service {
   register() {
diff --git a/wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGap.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGap.js
rename to wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js
diff --git a/wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/FillTheGapToolGroupService/FillTheGapToolGroupService.js
rename to wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js
diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js
index ff481070123a1574059bac55bbaa8e3b1587ce46..b4499195462491758a587c43d375397ec1c6aef3 100644
--- a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js
+++ b/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js
@@ -4,7 +4,7 @@ import multipleDropDownOptionNode from '../schema/multipleDropDownOptionNode';
 import MultipleDropDownNodeView from './MultipleDropDownNodeView';
 import MultipleDropDownComponent from '../components/MultipleDropDownComponent';
 import DropDownComponent from '../components/DropDownComponent';
-import MultipleDropDownToolGroupService from '../../WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService';
+import MultipleDropDownToolGroupService from '../MultipleDropDownToolGroupService/MultipleDropDownToolGroupService';
 
 class CreateDropDownService extends Service {
   name = 'CreateDropDownService';
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
rename to wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js b/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js
similarity index 100%
rename from wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js
rename to wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js