diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f230a2c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "location_library"]
+	path = location_library
+	url = ssh://dev/srv/git/location_library.git
+[submodule "exception_handler_library"]
+	path = exception_handler_library
+	url = ssh://dev/srv/git/exception_handler_library.git
diff --git a/LocationRinger/project.properties b/LocationRinger/project.properties
index dd39243..69dbb19 100644
--- a/LocationRinger/project.properties
+++ b/LocationRinger/project.properties
@@ -7,8 +7,8 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib
-android.library.reference.2=../../location_library/LocationLib
+android.library.reference.1=../exception_handler_library/ExceptionHandlerLib
+android.library.reference.2=../location_library/LocationLib
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard.cfg
 # Project target.
 target=Google Inc.:Google APIs:16
diff --git a/exception_handler_library b/exception_handler_library
new file mode 160000
index 0000000..ab75dd3
--- /dev/null
+++ b/exception_handler_library
@@ -0,0 +1 @@
+Subproject commit ab75dd3bb19fa67ba536a9b397adf8e8c46f0d8c
diff --git a/location_library b/location_library
new file mode 160000
index 0000000..fc6baf3
--- /dev/null
+++ b/location_library
@@ -0,0 +1 @@
+Subproject commit fc6baf35e1a5c825b5c880359c17e04ad2718f46