diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js
index 96fb850d78583d6934de36b8a1d57e1c30827873..95fe5eeed5a9d213b3379acd4924ccf1abd152a4 100644
--- a/editors/demo/src/HHMI/config/config.js
+++ b/editors/demo/src/HHMI/config/config.js
@@ -20,6 +20,8 @@ import {
   SpecialCharactersToolGroupService,
   EditorInfoToolGroupServices,
   BottomInfoService,
+  MultipleChoiceQuestionService,
+  QuestionsToolGroupService,
 } from 'wax-prosemirror-services';
 
 import { DefaultSchema } from 'wax-prosemirror-utilities';
@@ -27,8 +29,8 @@ import { WaxSelectionPlugin } from 'wax-prosemirror-plugins';
 import invisibles, { hardBreak } from '@guardian/prosemirror-invisibles';
 
 /* Questions Services */
-import MultipleChoiceQuestionService from '../MultipleChoiceQuestionService/MultipleChoiceQuestionService';
-import QuestionsToolGroupService from '../QuestionsToolGroupService/QuestionsToolGroupService';
+// import MultipleChoiceQuestionService from '../MultipleChoiceQuestionService/MultipleChoiceQuestionService';
+// import QuestionsToolGroupService from '../QuestionsToolGroupService/QuestionsToolGroupService';
 
 export default {
   MenuService: [
diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js
index c05ff12dde7d1cd77161ffef63e7d967defeb68e..0ea0ee27c545724d96c6ff5edc46a48556521b24 100644
--- a/wax-prosemirror-services/index.js
+++ b/wax-prosemirror-services/index.js
@@ -44,6 +44,7 @@ export { default as TrackOptionsService } from './src/TrackOptionsService/TrackO
 export { default as CustomTagInlineService } from './src/CustomTagService/CustomTagInlineService/CustomTagInlineService';
 export { default as CustomTagBlockService } from './src/CustomTagService/CustomTagBlockService/CustomTagBlockService';
 export { default as CustomTagService } from './src/CustomTagService/CustomTagService';
+export { default as MultipleChoiceQuestionService } from './src/MultipleChoiceQuestionService/MultipleChoiceQuestionService';
 
 /*
 ToolGroups
@@ -69,3 +70,4 @@ export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/Tra
 export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService';
 export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService';
 export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService';
+export { default as QuestionsToolGroupService } from './src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService';
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
similarity index 94%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
index fd3481abf7935a841fcec880d1226521090eb1f9..742da845512a1469c261615dbcb1626ca245a228 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js
@@ -1,4 +1,4 @@
-import { AbstractNodeView } from 'wax-prosemirror-services';
+import AbstractNodeView from '../PortalService/AbstractNodeView';
 
 export default class MultipleChoiceNodeView extends AbstractNodeView {
   constructor(
@@ -17,6 +17,7 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
     this.getPos = getPos;
     this.context = context;
   }
+
   static name() {
     return 'multiple_choice';
   }
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
similarity index 97%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 735ab1857f2a37ae33269e5306d192000d09d350..6ffe599ba02feb580f125d2217e67025235e3c8c 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -1,10 +1,9 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
-import { Tools } from 'wax-prosemirror-services';
 import { Commands } from 'wax-prosemirror-utilities';
-
 import { v4 as uuidv4 } from 'uuid';
+import Tools from '../lib/Tools';
 import ToolBarBtn from './components/ToolBarBtn';
 
 const checkifEmpty = view => {
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
similarity index 94%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
index 1101b7e124eb6287b3a5945da6503dd58f25e183..4df5be64aec344cd2f9d908946b21811bf7282cf 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-services';
+import Service from '../Service';
 import MultipleChoiceQuestion from './MultipleChoiceQuestion';
 import multipleChoiceNode from './schema/multipleChoiceNode';
 import multipleChoiceContainerNode from './schema/multipleChoiceContainerNode';
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/Button.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Button.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/Button.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Button.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/EditorComponent.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/FeedbackComponent.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/Switch.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Switch.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/Switch.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Switch.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/SwitchComponent.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/helpers/helpers.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/helpers/helpers.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/helpers/helpers.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/helpers/helpers.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/plugins/placeholder.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/placeholder.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/plugins/placeholder.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/placeholder.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
similarity index 100%
rename from editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
rename to wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
diff --git a/editors/demo/src/HHMI/QuestionsToolGroupService/Questions.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
similarity index 83%
rename from editors/demo/src/HHMI/QuestionsToolGroupService/Questions.js
rename to wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
index 51d123699336e9578825d08742bac60f9e746c93..8b9b9eada607a08c6bc9937f5257a696b57d98af 100644
--- a/editors/demo/src/HHMI/QuestionsToolGroupService/Questions.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/Questions.js
@@ -1,5 +1,5 @@
 import { injectable, inject } from 'inversify';
-import { ToolGroup } from 'wax-prosemirror-services';
+import ToolGroup from '../../lib/ToolGroup';
 
 @injectable()
 class Questions extends ToolGroup {
diff --git a/editors/demo/src/HHMI/QuestionsToolGroupService/QuestionsToolGroupService.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
similarity index 79%
rename from editors/demo/src/HHMI/QuestionsToolGroupService/QuestionsToolGroupService.js
rename to wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
index daaed80e70273035541d32a6cbbd9854a884e8ae..f5b68c449e652bc226bad710d132b21c55ec9277 100644
--- a/editors/demo/src/HHMI/QuestionsToolGroupService/QuestionsToolGroupService.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsToolGroupService/QuestionsToolGroupService.js
@@ -1,4 +1,4 @@
-import { Service } from 'wax-prosemirror-services';
+import Service from '../../Service';
 import Questions from './Questions';
 
 class QuestionsToolGroupService extends Service {