diff --git a/.gitignore b/.gitignore
index f35239a..cc21741 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 # Don't track the content of these folders #
 ############################################
-src/rrrobot_ws/lib/
-src/rrrobot_ws/build
-src/rrrobot_ws/devel
-src/rrrobot_ws/install
+src/*/lib/
+src/*/build
+src/*/devel
+src/*/install
 .*
 !.gitignore
 
diff --git a/.gitmodules b/.gitmodules
index a5c35f1..380eeba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "ariac_ws/src/universal_robot"]
+[submodule "src/ariac_ws/src/universal_robot"]
 	path = src/ariac_ws/src/universal_robot
 	url = https://github.com/osrf/universal_robot
 	branch = ariac_2019_ur10_moveit_config
diff --git a/src/ariac_ws/src/universal_robot b/src/ariac_ws/src/universal_robot
new file mode 160000
index 0000000..8bb711d
--- /dev/null
+++ b/src/ariac_ws/src/universal_robot
@@ -0,0 +1 @@
+Subproject commit 8bb711dc9f81087306ae962f9e251e69dc31721d