diff --git a/.gitmodules b/.gitmodules
index fac7ba6..278672f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "src"]
-	path = src
-	url = https://github.com/natto1784/mr-robot
+[submodule "src/MR-Robot_Hardware"]
+	path = src/MR-Robot_Hardware
+	url = https://github.com/atom-robotics-lab/MR-Robot_Hardware
+[submodule "src/MR-Robot"]
+	path = src/MR-Robot
+	url = https://github.com/atom-robotics-lab/MR-Robot
diff --git a/src b/src
deleted file mode 160000
index 54502b8..0000000
--- a/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 54502b8aa5e6bfacbef23085a6d638d16df15124
diff --git a/src/MR-Robot b/src/MR-Robot
new file mode 160000
index 0000000..f5f7453
--- /dev/null
+++ b/src/MR-Robot
@@ -0,0 +1 @@
+Subproject commit f5f74531281a67130295b715002321e5b09b75ee
diff --git a/src/MR-Robot_Hardware b/src/MR-Robot_Hardware
new file mode 160000
index 0000000..45da4ff
--- /dev/null
+++ b/src/MR-Robot_Hardware
@@ -0,0 +1 @@
+Subproject commit 45da4ffd112c882089dcbe8a0941135b975cb98b
diff --git a/src/mr_robot_description b/src/mr_robot_description
new file mode 120000
index 0000000..814ada0
--- /dev/null
+++ b/src/mr_robot_description
@@ -0,0 +1 @@
+MR-Robot/mr_robot_description
\ No newline at end of file
diff --git a/src/mr_robot_firmware b/src/mr_robot_firmware
new file mode 120000
index 0000000..057e38a
--- /dev/null
+++ b/src/mr_robot_firmware
@@ -0,0 +1 @@
+MR-Robot_Hardware/mr_robot_firmware
\ No newline at end of file
diff --git a/src/mr_robot_gazebo b/src/mr_robot_gazebo
new file mode 120000
index 0000000..93d1b29
--- /dev/null
+++ b/src/mr_robot_gazebo
@@ -0,0 +1 @@
+MR-Robot/mr_robot_gazebo
\ No newline at end of file
diff --git a/src/mr_robot_nav b/src/mr_robot_nav
new file mode 120000
index 0000000..f773233
--- /dev/null
+++ b/src/mr_robot_nav
@@ -0,0 +1 @@
+MR-Robot/mr_robot_nav
\ No newline at end of file
diff --git a/src/ydlidar_ros b/src/ydlidar_ros
new file mode 120000
index 0000000..50ff7b4
--- /dev/null
+++ b/src/ydlidar_ros
@@ -0,0 +1 @@
+MR-Robot_Hardware/ydlidar_ros
\ No newline at end of file