diff --git a/.gitmodules b/.gitmodules
index 818cd02..86cc493 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "modules/qmining/qmining-page"]
-	path = src/modules/qmining/qmining-page
+	path = submodules/qmining-page
 	url = git@gitlab.com:MrFry/qmining-page.git
 [submodule "modules/dataEditor/qmining-data-editor"]
-	path = src/modules/dataEditor/qmining-data-editor
+	path = submodules/dataEditor/qmining-data-editor
 	url = git@gitlab.com:MrFry/qmining-data-editor.git
 [submodule "qminingPublic/moodle-test-userscript"]
-	path = publicDirs/qminingPublic/moodle-test-userscript
+	path = submodules/moodle-test-userscript
 	url = git@gitlab.com:MrFry/moodle-test-userscript.git
diff --git a/scripts/make.sh b/scripts/make.sh
index 6ed84fa..523c139 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -6,6 +6,10 @@ git submodule update --init --recursive
 echo "Installing node modules for server"
 npm install
 
+
+echo "Making moodle test userscript"
+# TODO: ln script to publicDirs/qminingPublic/.....
+
 echo "Making qmining page"
 pushd modules/qmining/qmining-page/
 npm install
diff --git a/src/modules/dataEditor/dataEditor.js b/submodules/dataEditor/dataEditor.js
similarity index 100%
rename from src/modules/dataEditor/dataEditor.js
rename to submodules/dataEditor/dataEditor.js
diff --git a/src/modules/dataEditor/qmining-data-editor b/submodules/dataEditor/qmining-data-editor
similarity index 100%
rename from src/modules/dataEditor/qmining-data-editor
rename to submodules/dataEditor/qmining-data-editor
diff --git a/publicDirs/qminingPublic/moodle-test-userscript b/submodules/moodle-test-userscript
similarity index 100%
rename from publicDirs/qminingPublic/moodle-test-userscript
rename to submodules/moodle-test-userscript
diff --git a/src/modules/qmining/qmining-page b/submodules/qmining-page
similarity index 100%
rename from src/modules/qmining/qmining-page
rename to submodules/qmining-page