diff --git a/.gitmodules b/.gitmodules
index 939bd4274..4c058130a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "fossil-hr-watchface"]
-	path = fossil-hr-watchface
+	path = external/fossil-hr-watchface
 	url = https://github.com/arjan-s/fossil-hr-watchface
 [submodule "jerryscript"]
-	path = jerryscript
+	path = external/jerryscript
 	url = https://github.com/jerryscript-project/jerryscript
diff --git a/build_fossil_hr_watchface.sh b/external/build_fossil_hr_watchface.sh
similarity index 88%
rename from build_fossil_hr_watchface.sh
rename to external/build_fossil_hr_watchface.sh
index 441244866..c1ed93fed 100755
--- a/build_fossil_hr_watchface.sh
+++ b/external/build_fossil_hr_watchface.sh
@@ -10,4 +10,4 @@ $jerry generate -f '' widget_weather.js -o widgetWeather.bin
 $jerry generate -f '' widget_steps.js -o widgetSteps.bin
 $jerry generate -f '' widget_hr.js -o widgetHR.bin
 popd
-mv fossil-hr-watchface/*.bin app/src/main/assets/fossil_hr/
+mv fossil-hr-watchface/*.bin ../app/src/main/assets/fossil_hr/
diff --git a/fossil-hr-watchface b/external/fossil-hr-watchface
similarity index 100%
rename from fossil-hr-watchface
rename to external/fossil-hr-watchface
diff --git a/jerryscript b/external/jerryscript
similarity index 100%
rename from jerryscript
rename to external/jerryscript