diff --git a/code_reference/QT/DualScreenTest/.idea/DualScreenTest.iml b/software/code_reference/QT/DualScreenTest/.idea/DualScreenTest.iml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/DualScreenTest.iml
rename to software/code_reference/QT/DualScreenTest/.idea/DualScreenTest.iml
diff --git a/code_reference/QT/DualScreenTest/.idea/deployment.xml b/software/code_reference/QT/DualScreenTest/.idea/deployment.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/deployment.xml
rename to software/code_reference/QT/DualScreenTest/.idea/deployment.xml
diff --git a/code_reference/QT/DualScreenTest/.idea/misc.xml b/software/code_reference/QT/DualScreenTest/.idea/misc.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/misc.xml
rename to software/code_reference/QT/DualScreenTest/.idea/misc.xml
diff --git a/code_reference/QT/DualScreenTest/.idea/modules.xml b/software/code_reference/QT/DualScreenTest/.idea/modules.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/modules.xml
rename to software/code_reference/QT/DualScreenTest/.idea/modules.xml
diff --git a/code_reference/QT/DualScreenTest/.idea/remote-mappings.xml b/software/code_reference/QT/DualScreenTest/.idea/remote-mappings.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/remote-mappings.xml
rename to software/code_reference/QT/DualScreenTest/.idea/remote-mappings.xml
diff --git a/code_reference/QT/DualScreenTest/.idea/webServers.xml b/software/code_reference/QT/DualScreenTest/.idea/webServers.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/webServers.xml
rename to software/code_reference/QT/DualScreenTest/.idea/webServers.xml
diff --git a/code_reference/QT/DualScreenTest/.idea/workspace.xml b/software/code_reference/QT/DualScreenTest/.idea/workspace.xml
similarity index 100%
rename from code_reference/QT/DualScreenTest/.idea/workspace.xml
rename to software/code_reference/QT/DualScreenTest/.idea/workspace.xml
diff --git a/code_reference/QT/DualScreenTest/Resources/UI/RoverGui.ui b/software/code_reference/QT/DualScreenTest/Resources/UI/RoverGui.ui
similarity index 100%
rename from code_reference/QT/DualScreenTest/Resources/UI/RoverGui.ui
rename to software/code_reference/QT/DualScreenTest/Resources/UI/RoverGui.ui
diff --git a/code_reference/QT/DualScreenTest/Resources/UI/RoverGui2.ui b/software/code_reference/QT/DualScreenTest/Resources/UI/RoverGui2.ui
similarity index 100%
rename from code_reference/QT/DualScreenTest/Resources/UI/RoverGui2.ui
rename to software/code_reference/QT/DualScreenTest/Resources/UI/RoverGui2.ui
diff --git a/code_reference/QT/DualScreenTest/main.py b/software/code_reference/QT/DualScreenTest/main.py
similarity index 100%
rename from code_reference/QT/DualScreenTest/main.py
rename to software/code_reference/QT/DualScreenTest/main.py
diff --git a/design_reference/Canadian team's awesome rover diagram - THANKS CANADA!!.png b/software/design_reference/Canadian team's awesome rover diagram - THANKS CANADA!!.png
similarity index 100%
rename from design_reference/Canadian team's awesome rover diagram - THANKS CANADA!!.png
rename to software/design_reference/Canadian team's awesome rover diagram - THANKS CANADA!!.png
diff --git a/design_reference/UI Design/left_screen.svg b/software/design_reference/UI Design/left_screen.svg
similarity index 100%
rename from design_reference/UI Design/left_screen.svg
rename to software/design_reference/UI Design/left_screen.svg
diff --git a/design_reference/UI Design/right_screen.svg b/software/design_reference/UI Design/right_screen.svg
similarity index 100%
rename from design_reference/UI Design/right_screen.svg
rename to software/design_reference/UI Design/right_screen.svg
diff --git a/environment_reference/UDEV Rules/99-rover-cameras.rules b/software/environment_reference/UDEV Rules/99-rover-cameras.rules
similarity index 100%
rename from environment_reference/UDEV Rules/99-rover-cameras.rules
rename to software/environment_reference/UDEV Rules/99-rover-cameras.rules
diff --git a/environment_reference/UDEV Rules/99-rover-usb-serial.rules b/software/environment_reference/UDEV Rules/99-rover-usb-serial.rules
similarity index 100%
rename from environment_reference/UDEV Rules/99-rover-usb-serial.rules
rename to software/environment_reference/UDEV Rules/99-rover-usb-serial.rules
diff --git a/environment_reference/UDEV Rules/install_rules.sh b/software/environment_reference/UDEV Rules/install_rules.sh
similarity index 100%
rename from environment_reference/UDEV Rules/install_rules.sh
rename to software/environment_reference/UDEV Rules/install_rules.sh
diff --git a/environment_reference/ZED Settings/SN2129.conf b/software/environment_reference/ZED Settings/SN2129.conf
similarity index 100%
rename from environment_reference/ZED Settings/SN2129.conf
rename to software/environment_reference/ZED Settings/SN2129.conf
diff --git a/ground_station/.idea/deployment.xml b/software/ground_station/.idea/deployment.xml
similarity index 100%
rename from ground_station/.idea/deployment.xml
rename to software/ground_station/.idea/deployment.xml
diff --git a/ground_station/.idea/dictionaries/caperren.xml b/software/ground_station/.idea/dictionaries/caperren.xml
similarity index 100%
rename from ground_station/.idea/dictionaries/caperren.xml
rename to software/ground_station/.idea/dictionaries/caperren.xml
diff --git a/ground_station/.idea/ground_station.iml b/software/ground_station/.idea/ground_station.iml
similarity index 100%
rename from ground_station/.idea/ground_station.iml
rename to software/ground_station/.idea/ground_station.iml
diff --git a/ground_station/.idea/inspectionProfiles/Project_Default.xml b/software/ground_station/.idea/inspectionProfiles/Project_Default.xml
similarity index 100%
rename from ground_station/.idea/inspectionProfiles/Project_Default.xml
rename to software/ground_station/.idea/inspectionProfiles/Project_Default.xml
diff --git a/ground_station/.idea/inspectionProfiles/profiles_settings.xml b/software/ground_station/.idea/inspectionProfiles/profiles_settings.xml
similarity index 100%
rename from ground_station/.idea/inspectionProfiles/profiles_settings.xml
rename to software/ground_station/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/ground_station/.idea/misc.xml b/software/ground_station/.idea/misc.xml
similarity index 100%
rename from ground_station/.idea/misc.xml
rename to software/ground_station/.idea/misc.xml
diff --git a/ground_station/.idea/modules.xml b/software/ground_station/.idea/modules.xml
similarity index 100%
rename from ground_station/.idea/modules.xml
rename to software/ground_station/.idea/modules.xml
diff --git a/ground_station/.idea/remote-mappings.xml b/software/ground_station/.idea/remote-mappings.xml
similarity index 100%
rename from ground_station/.idea/remote-mappings.xml
rename to software/ground_station/.idea/remote-mappings.xml
diff --git a/ground_station/.idea/webServers.xml b/software/ground_station/.idea/webServers.xml
similarity index 100%
rename from ground_station/.idea/webServers.xml
rename to software/ground_station/.idea/webServers.xml
diff --git a/ground_station/.idea/workspace.xml b/software/ground_station/.idea/workspace.xml
similarity index 100%
rename from ground_station/.idea/workspace.xml
rename to software/ground_station/.idea/workspace.xml
diff --git a/ground_station/Framework/DriveSystems/RoverDriveSender.py b/software/ground_station/Framework/DriveSystems/RoverDriveSender.py
similarity index 100%
rename from ground_station/Framework/DriveSystems/RoverDriveSender.py
rename to software/ground_station/Framework/DriveSystems/RoverDriveSender.py
diff --git a/ground_station/Framework/DriveSystems/__init__.py b/software/ground_station/Framework/DriveSystems/__init__.py
similarity index 100%
rename from ground_station/Framework/DriveSystems/__init__.py
rename to software/ground_station/Framework/DriveSystems/__init__.py
diff --git a/ground_station/Framework/LoggingSystems/Logger.py b/software/ground_station/Framework/LoggingSystems/Logger.py
similarity index 100%
rename from ground_station/Framework/LoggingSystems/Logger.py
rename to software/ground_station/Framework/LoggingSystems/Logger.py
diff --git a/ground_station/Framework/LoggingSystems/__init__.py b/software/ground_station/Framework/LoggingSystems/__init__.py
similarity index 100%
rename from ground_station/Framework/LoggingSystems/__init__.py
rename to software/ground_station/Framework/LoggingSystems/__init__.py
diff --git a/ground_station/Framework/StartupSystems/ROSMasterChecker.py b/software/ground_station/Framework/StartupSystems/ROSMasterChecker.py
similarity index 100%
rename from ground_station/Framework/StartupSystems/ROSMasterChecker.py
rename to software/ground_station/Framework/StartupSystems/ROSMasterChecker.py
diff --git a/ground_station/Framework/StartupSystems/__init__.py b/software/ground_station/Framework/StartupSystems/__init__.py
similarity index 100%
rename from ground_station/Framework/StartupSystems/__init__.py
rename to software/ground_station/Framework/StartupSystems/__init__.py
diff --git a/ground_station/Framework/VideoSystems/RoverVideoCoordinator.py b/software/ground_station/Framework/VideoSystems/RoverVideoCoordinator.py
similarity index 100%
rename from ground_station/Framework/VideoSystems/RoverVideoCoordinator.py
rename to software/ground_station/Framework/VideoSystems/RoverVideoCoordinator.py
diff --git a/ground_station/Framework/VideoSystems/RoverVideoReceiver.py b/software/ground_station/Framework/VideoSystems/RoverVideoReceiver.py
similarity index 100%
rename from ground_station/Framework/VideoSystems/RoverVideoReceiver.py
rename to software/ground_station/Framework/VideoSystems/RoverVideoReceiver.py
diff --git a/ground_station/Framework/VideoSystems/RoverVideoReceiverOld.py b/software/ground_station/Framework/VideoSystems/RoverVideoReceiverOld.py
similarity index 100%
rename from ground_station/Framework/VideoSystems/RoverVideoReceiverOld.py
rename to software/ground_station/Framework/VideoSystems/RoverVideoReceiverOld.py
diff --git a/ground_station/Framework/VideoSystems/__init__.py b/software/ground_station/Framework/VideoSystems/__init__.py
similarity index 100%
rename from ground_station/Framework/VideoSystems/__init__.py
rename to software/ground_station/Framework/VideoSystems/__init__.py
diff --git a/ground_station/Framework/__init__.py b/software/ground_station/Framework/__init__.py
similarity index 100%
rename from ground_station/Framework/__init__.py
rename to software/ground_station/Framework/__init__.py
diff --git a/ground_station/Readme.md b/software/ground_station/Readme.md
similarity index 100%
rename from ground_station/Readme.md
rename to software/ground_station/Readme.md
diff --git a/ground_station/Resources/Ui/left_screen.ui b/software/ground_station/Resources/Ui/left_screen.ui
similarity index 100%
rename from ground_station/Resources/Ui/left_screen.ui
rename to software/ground_station/Resources/Ui/left_screen.ui
diff --git a/ground_station/Resources/Ui/right_screen.ui b/software/ground_station/Resources/Ui/right_screen.ui
similarity index 100%
rename from ground_station/Resources/Ui/right_screen.ui
rename to software/ground_station/Resources/Ui/right_screen.ui
diff --git a/ground_station/RoverGroundStation.py b/software/ground_station/RoverGroundStation.py
similarity index 100%
rename from ground_station/RoverGroundStation.py
rename to software/ground_station/RoverGroundStation.py
diff --git a/rover/CMakeLists.txt b/software/rover/CMakeLists.txt
similarity index 100%
rename from rover/CMakeLists.txt
rename to software/rover/CMakeLists.txt
diff --git a/rover/Readme.md b/software/rover/Readme.md
similarity index 100%
rename from rover/Readme.md
rename to software/rover/Readme.md
diff --git a/rover/drive_test/CMakeLists.txt b/software/rover/drive_test/CMakeLists.txt
similarity index 100%
rename from rover/drive_test/CMakeLists.txt
rename to software/rover/drive_test/CMakeLists.txt
diff --git a/rover/drive_test/HW2.pdf b/software/rover/drive_test/HW2.pdf
similarity index 100%
rename from rover/drive_test/HW2.pdf
rename to software/rover/drive_test/HW2.pdf
diff --git a/rover/drive_test/ReadMe b/software/rover/drive_test/ReadMe
similarity index 100%
rename from rover/drive_test/ReadMe
rename to software/rover/drive_test/ReadMe
diff --git a/rover/drive_test/launch/drive_test.launch b/software/rover/drive_test/launch/drive_test.launch
similarity index 100%
rename from rover/drive_test/launch/drive_test.launch
rename to software/rover/drive_test/launch/drive_test.launch
diff --git a/rover/drive_test/package.xml b/software/rover/drive_test/package.xml
similarity index 100%
rename from rover/drive_test/package.xml
rename to software/rover/drive_test/package.xml
diff --git a/rover/drive_test/src/drive_test.py b/software/rover/drive_test/src/drive_test.py
similarity index 100%
rename from rover/drive_test/src/drive_test.py
rename to software/rover/drive_test/src/drive_test.py
diff --git a/rover/drive_test/worlds/manyDots.pgm b/software/rover/drive_test/worlds/manyDots.pgm
similarity index 100%
rename from rover/drive_test/worlds/manyDots.pgm
rename to software/rover/drive_test/worlds/manyDots.pgm
diff --git a/rover/drive_test/worlds/manyDots.world b/software/rover/drive_test/worlds/manyDots.world
similarity index 100%
rename from rover/drive_test/worlds/manyDots.world
rename to software/rover/drive_test/worlds/manyDots.world
diff --git a/rover/launcher/CMakeLists.txt b/software/rover/launcher/CMakeLists.txt
similarity index 100%
rename from rover/launcher/CMakeLists.txt
rename to software/rover/launcher/CMakeLists.txt
diff --git a/rover/launcher/launch/.test_imu.py.kate-swp b/software/rover/launcher/launch/.test_imu.py.kate-swp
similarity index 100%
rename from rover/launcher/launch/.test_imu.py.kate-swp
rename to software/rover/launcher/launch/.test_imu.py.kate-swp
diff --git a/rover/launcher/launch/launch_everything.launch b/software/rover/launcher/launch/launch_everything.launch
similarity index 100%
rename from rover/launcher/launch/launch_everything.launch
rename to software/rover/launcher/launch/launch_everything.launch
diff --git a/rover/launcher/package.xml b/software/rover/launcher/package.xml
similarity index 100%
rename from rover/launcher/package.xml
rename to software/rover/launcher/package.xml
diff --git a/rover/launcher/random_testing/test_imu.py b/software/rover/launcher/random_testing/test_imu.py
similarity index 100%
rename from rover/launcher/random_testing/test_imu.py
rename to software/rover/launcher/random_testing/test_imu.py
diff --git a/rover/rover_camera/CMakeLists.txt b/software/rover/rover_camera/CMakeLists.txt
similarity index 100%
rename from rover/rover_camera/CMakeLists.txt
rename to software/rover/rover_camera/CMakeLists.txt
diff --git a/rover/rover_camera/launch/example.launch b/software/rover/rover_camera/launch/example.launch
similarity index 100%
rename from rover/rover_camera/launch/example.launch
rename to software/rover/rover_camera/launch/example.launch
diff --git a/rover/rover_camera/package.xml b/software/rover/rover_camera/package.xml
similarity index 100%
rename from rover/rover_camera/package.xml
rename to software/rover/rover_camera/package.xml
diff --git a/rover/rover_camera/src/rover_camera.cpp b/software/rover/rover_camera/src/rover_camera.cpp
similarity index 100%
rename from rover/rover_camera/src/rover_camera.cpp
rename to software/rover/rover_camera/src/rover_camera.cpp
diff --git a/rover/rover_main/CMakeLists.txt b/software/rover/rover_main/CMakeLists.txt
similarity index 100%
rename from rover/rover_main/CMakeLists.txt
rename to software/rover/rover_main/CMakeLists.txt
diff --git a/rover/rover_main/launch/rover_main.launch b/software/rover/rover_main/launch/rover_main.launch
similarity index 100%
rename from rover/rover_main/launch/rover_main.launch
rename to software/rover/rover_main/launch/rover_main.launch
diff --git a/rover/rover_main/launch/rover_nav.launch b/software/rover/rover_main/launch/rover_nav.launch
similarity index 100%
rename from rover/rover_main/launch/rover_nav.launch
rename to software/rover/rover_main/launch/rover_nav.launch
diff --git a/rover/rover_main/package.xml b/software/rover/rover_main/package.xml
similarity index 100%
rename from rover/rover_main/package.xml
rename to software/rover/rover_main/package.xml
diff --git a/rover/ublox-master/.gitignore b/software/rover/ublox-master/.gitignore
similarity index 100%
rename from rover/ublox-master/.gitignore
rename to software/rover/ublox-master/.gitignore
diff --git a/rover/ublox-master/README.md b/software/rover/ublox-master/README.md
similarity index 100%
rename from rover/ublox-master/README.md
rename to software/rover/ublox-master/README.md
diff --git a/rover/ublox-master/ublox/CMakeLists.txt b/software/rover/ublox-master/ublox/CMakeLists.txt
similarity index 100%
rename from rover/ublox-master/ublox/CMakeLists.txt
rename to software/rover/ublox-master/ublox/CMakeLists.txt
diff --git a/rover/ublox-master/ublox/package.xml b/software/rover/ublox-master/ublox/package.xml
similarity index 100%
rename from rover/ublox-master/ublox/package.xml
rename to software/rover/ublox-master/ublox/package.xml
diff --git a/rover/ublox-master/ublox_gps/CMakeLists.txt b/software/rover/ublox-master/ublox_gps/CMakeLists.txt
similarity index 100%
rename from rover/ublox-master/ublox_gps/CMakeLists.txt
rename to software/rover/ublox-master/ublox_gps/CMakeLists.txt
diff --git a/rover/ublox-master/ublox_gps/config/c94_m8p_base.yaml b/software/rover/ublox-master/ublox_gps/config/c94_m8p_base.yaml
similarity index 100%
rename from rover/ublox-master/ublox_gps/config/c94_m8p_base.yaml
rename to software/rover/ublox-master/ublox_gps/config/c94_m8p_base.yaml
diff --git a/rover/ublox-master/ublox_gps/config/c94_m8p_rover.yaml b/software/rover/ublox-master/ublox_gps/config/c94_m8p_rover.yaml
similarity index 100%
rename from rover/ublox-master/ublox_gps/config/c94_m8p_rover.yaml
rename to software/rover/ublox-master/ublox_gps/config/c94_m8p_rover.yaml
diff --git a/rover/ublox-master/ublox_gps/config/m8n_rover.yaml b/software/rover/ublox-master/ublox_gps/config/m8n_rover.yaml
similarity index 100%
rename from rover/ublox-master/ublox_gps/config/m8n_rover.yaml
rename to software/rover/ublox-master/ublox_gps/config/m8n_rover.yaml
diff --git a/rover/ublox-master/ublox_gps/config/nmea.yaml b/software/rover/ublox-master/ublox_gps/config/nmea.yaml
similarity index 100%
rename from rover/ublox-master/ublox_gps/config/nmea.yaml
rename to software/rover/ublox-master/ublox_gps/config/nmea.yaml
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/async_worker.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/async_worker.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/async_worker.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/async_worker.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/callback.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/callback.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/callback.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/callback.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/gps.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/gps.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/gps.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/gps.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/mkgmtime.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/mkgmtime.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/mkgmtime.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/mkgmtime.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/node.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/node.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/node.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/node.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/utils.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/utils.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/utils.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/utils.h
diff --git a/rover/ublox-master/ublox_gps/include/ublox_gps/worker.h b/software/rover/ublox-master/ublox_gps/include/ublox_gps/worker.h
similarity index 100%
rename from rover/ublox-master/ublox_gps/include/ublox_gps/worker.h
rename to software/rover/ublox-master/ublox_gps/include/ublox_gps/worker.h
diff --git a/rover/ublox-master/ublox_gps/launch/ublox_device.launch b/software/rover/ublox-master/ublox_gps/launch/ublox_device.launch
similarity index 100%
rename from rover/ublox-master/ublox_gps/launch/ublox_device.launch
rename to software/rover/ublox-master/ublox_gps/launch/ublox_device.launch
diff --git a/rover/ublox-master/ublox_gps/package.xml b/software/rover/ublox-master/ublox_gps/package.xml
similarity index 100%
rename from rover/ublox-master/ublox_gps/package.xml
rename to software/rover/ublox-master/ublox_gps/package.xml
diff --git a/rover/ublox-master/ublox_gps/src/gps.cpp b/software/rover/ublox-master/ublox_gps/src/gps.cpp
similarity index 100%
rename from rover/ublox-master/ublox_gps/src/gps.cpp
rename to software/rover/ublox-master/ublox_gps/src/gps.cpp
diff --git a/rover/ublox-master/ublox_gps/src/mkgmtime.c b/software/rover/ublox-master/ublox_gps/src/mkgmtime.c
similarity index 100%
rename from rover/ublox-master/ublox_gps/src/mkgmtime.c
rename to software/rover/ublox-master/ublox_gps/src/mkgmtime.c
diff --git a/rover/ublox-master/ublox_gps/src/node.cpp b/software/rover/ublox-master/ublox_gps/src/node.cpp
similarity index 100%
rename from rover/ublox-master/ublox_gps/src/node.cpp
rename to software/rover/ublox-master/ublox_gps/src/node.cpp
diff --git a/rover/ublox-master/ublox_msgs/CMakeLists.txt b/software/rover/ublox-master/ublox_msgs/CMakeLists.txt
similarity index 100%
rename from rover/ublox-master/ublox_msgs/CMakeLists.txt
rename to software/rover/ublox-master/ublox_msgs/CMakeLists.txt
diff --git a/rover/ublox-master/ublox_msgs/include/ublox/serialization/ublox_msgs.h b/software/rover/ublox-master/ublox_msgs/include/ublox/serialization/ublox_msgs.h
similarity index 100%
rename from rover/ublox-master/ublox_msgs/include/ublox/serialization/ublox_msgs.h
rename to software/rover/ublox-master/ublox_msgs/include/ublox/serialization/ublox_msgs.h
diff --git a/rover/ublox-master/ublox_msgs/include/ublox_msgs/ublox_msgs.h b/software/rover/ublox-master/ublox_msgs/include/ublox_msgs/ublox_msgs.h
similarity index 100%
rename from rover/ublox-master/ublox_msgs/include/ublox_msgs/ublox_msgs.h
rename to software/rover/ublox-master/ublox_msgs/include/ublox_msgs/ublox_msgs.h
diff --git a/rover/ublox-master/ublox_msgs/msg/Ack.msg b/software/rover/ublox-master/ublox_msgs/msg/Ack.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/Ack.msg
rename to software/rover/ublox-master/ublox_msgs/msg/Ack.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/AidALM.msg b/software/rover/ublox-master/ublox_msgs/msg/AidALM.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/AidALM.msg
rename to software/rover/ublox-master/ublox_msgs/msg/AidALM.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/AidEPH.msg b/software/rover/ublox-master/ublox_msgs/msg/AidEPH.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/AidEPH.msg
rename to software/rover/ublox-master/ublox_msgs/msg/AidEPH.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/AidHUI.msg b/software/rover/ublox-master/ublox_msgs/msg/AidHUI.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/AidHUI.msg
rename to software/rover/ublox-master/ublox_msgs/msg/AidHUI.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgANT.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgANT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgANT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgANT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgCFG.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgCFG.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgCFG.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgCFG.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgDAT.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgDAT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgDAT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgDAT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgDGNSS.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgDGNSS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgDGNSS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgDGNSS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgGNSS.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgGNSS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgGNSS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgGNSS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgGNSS_Block.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgGNSS_Block.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgGNSS_Block.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgGNSS_Block.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgHNR.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgHNR.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgHNR.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgHNR.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgINF.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgINF.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgINF.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgINF.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgINF_Block.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgINF_Block.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgINF_Block.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgINF_Block.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgMSG.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgMSG.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgMSG.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgMSG.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgNAV5.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgNAV5.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgNAV5.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgNAV5.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgNAVX5.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgNAVX5.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgNAVX5.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgNAVX5.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgNMEA.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgNMEA.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgNMEA.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgNMEA.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgNMEA6.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgNMEA6.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgNMEA6.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgNMEA6.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgNMEA7.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgNMEA7.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgNMEA7.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgNMEA7.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgPRT.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgPRT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgPRT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgPRT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgRATE.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgRATE.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgRATE.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgRATE.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgRST.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgRST.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgRST.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgRST.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgSBAS.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgSBAS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgSBAS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgSBAS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgTMODE3.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgTMODE3.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgTMODE3.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgTMODE3.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/CfgUSB.msg b/software/rover/ublox-master/ublox_msgs/msg/CfgUSB.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/CfgUSB.msg
rename to software/rover/ublox-master/ublox_msgs/msg/CfgUSB.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfINS.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfINS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfINS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfINS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfMEAS.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfMEAS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfMEAS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfMEAS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfRAW.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfRAW.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfRAW.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfRAW.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfRAW_Block.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfRAW_Block.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfRAW_Block.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfRAW_Block.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfSTATUS.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfSTATUS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfSTATUS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfSTATUS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/EsfSTATUS_Sens.msg b/software/rover/ublox-master/ublox_msgs/msg/EsfSTATUS_Sens.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/EsfSTATUS_Sens.msg
rename to software/rover/ublox-master/ublox_msgs/msg/EsfSTATUS_Sens.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/HnrPVT.msg b/software/rover/ublox-master/ublox_msgs/msg/HnrPVT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/HnrPVT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/HnrPVT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/Inf.msg b/software/rover/ublox-master/ublox_msgs/msg/Inf.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/Inf.msg
rename to software/rover/ublox-master/ublox_msgs/msg/Inf.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MgaGAL.msg b/software/rover/ublox-master/ublox_msgs/msg/MgaGAL.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MgaGAL.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MgaGAL.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MonGNSS.msg b/software/rover/ublox-master/ublox_msgs/msg/MonGNSS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MonGNSS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MonGNSS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MonHW.msg b/software/rover/ublox-master/ublox_msgs/msg/MonHW.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MonHW.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MonHW.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MonHW6.msg b/software/rover/ublox-master/ublox_msgs/msg/MonHW6.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MonHW6.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MonHW6.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MonVER.msg b/software/rover/ublox-master/ublox_msgs/msg/MonVER.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MonVER.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MonVER.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/MonVER_Extension.msg b/software/rover/ublox-master/ublox_msgs/msg/MonVER_Extension.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/MonVER_Extension.msg
rename to software/rover/ublox-master/ublox_msgs/msg/MonVER_Extension.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavATT.msg b/software/rover/ublox-master/ublox_msgs/msg/NavATT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavATT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavATT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavCLOCK.msg b/software/rover/ublox-master/ublox_msgs/msg/NavCLOCK.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavCLOCK.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavCLOCK.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavDGPS.msg b/software/rover/ublox-master/ublox_msgs/msg/NavDGPS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavDGPS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavDGPS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavDGPS_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/NavDGPS_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavDGPS_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavDGPS_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavDOP.msg b/software/rover/ublox-master/ublox_msgs/msg/NavDOP.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavDOP.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavDOP.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavPOSECEF.msg b/software/rover/ublox-master/ublox_msgs/msg/NavPOSECEF.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavPOSECEF.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavPOSECEF.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavPOSLLH.msg b/software/rover/ublox-master/ublox_msgs/msg/NavPOSLLH.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavPOSLLH.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavPOSLLH.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavPVT.msg b/software/rover/ublox-master/ublox_msgs/msg/NavPVT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavPVT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavPVT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavPVT7.msg b/software/rover/ublox-master/ublox_msgs/msg/NavPVT7.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavPVT7.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavPVT7.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavRELPOSNED.msg b/software/rover/ublox-master/ublox_msgs/msg/NavRELPOSNED.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavRELPOSNED.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavRELPOSNED.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSAT.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSAT.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSAT.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSAT.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSAT_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSAT_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSAT_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSAT_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSBAS.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSBAS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSBAS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSBAS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSBAS_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSBAS_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSBAS_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSBAS_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSOL.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSOL.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSOL.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSOL.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSTATUS.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSTATUS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSTATUS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSTATUS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSVIN.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSVIN.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSVIN.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSVIN.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSVINFO.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSVINFO.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSVINFO.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSVINFO.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavSVINFO_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/NavSVINFO_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavSVINFO_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavSVINFO_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavTIMEGPS.msg b/software/rover/ublox-master/ublox_msgs/msg/NavTIMEGPS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavTIMEGPS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavTIMEGPS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavTIMEUTC.msg b/software/rover/ublox-master/ublox_msgs/msg/NavTIMEUTC.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavTIMEUTC.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavTIMEUTC.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavVELECEF.msg b/software/rover/ublox-master/ublox_msgs/msg/NavVELECEF.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavVELECEF.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavVELECEF.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/NavVELNED.msg b/software/rover/ublox-master/ublox_msgs/msg/NavVELNED.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/NavVELNED.msg
rename to software/rover/ublox-master/ublox_msgs/msg/NavVELNED.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmALM.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmALM.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmALM.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmALM.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmEPH.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmEPH.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmEPH.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmEPH.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmRAW.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmRAW.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmRAW.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmRAW.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmRAWX.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmRAWX.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmRAWX.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmRAWX.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmRAWX_Meas.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmRAWX_Meas.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmRAWX_Meas.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmRAWX_Meas.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmRAW_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmRAW_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmRAW_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmRAW_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmRTCM.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmRTCM.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmRTCM.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmRTCM.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmSFRB.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmSFRB.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmSFRB.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmSFRB.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmSFRBX.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmSFRBX.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmSFRBX.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmSFRBX.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmSVSI.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmSVSI.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmSVSI.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmSVSI.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/RxmSVSI_SV.msg b/software/rover/ublox-master/ublox_msgs/msg/RxmSVSI_SV.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/RxmSVSI_SV.msg
rename to software/rover/ublox-master/ublox_msgs/msg/RxmSVSI_SV.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/UpdSOS.msg b/software/rover/ublox-master/ublox_msgs/msg/UpdSOS.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/UpdSOS.msg
rename to software/rover/ublox-master/ublox_msgs/msg/UpdSOS.msg
diff --git a/rover/ublox-master/ublox_msgs/msg/UpdSOS_Ack.msg b/software/rover/ublox-master/ublox_msgs/msg/UpdSOS_Ack.msg
similarity index 100%
rename from rover/ublox-master/ublox_msgs/msg/UpdSOS_Ack.msg
rename to software/rover/ublox-master/ublox_msgs/msg/UpdSOS_Ack.msg
diff --git a/rover/ublox-master/ublox_msgs/package.xml b/software/rover/ublox-master/ublox_msgs/package.xml
similarity index 100%
rename from rover/ublox-master/ublox_msgs/package.xml
rename to software/rover/ublox-master/ublox_msgs/package.xml
diff --git a/rover/ublox-master/ublox_msgs/src/ublox_msgs.cpp b/software/rover/ublox-master/ublox_msgs/src/ublox_msgs.cpp
similarity index 100%
rename from rover/ublox-master/ublox_msgs/src/ublox_msgs.cpp
rename to software/rover/ublox-master/ublox_msgs/src/ublox_msgs.cpp
diff --git a/rover/ublox-master/ublox_serialization/CMakeLists.txt b/software/rover/ublox-master/ublox_serialization/CMakeLists.txt
similarity index 100%
rename from rover/ublox-master/ublox_serialization/CMakeLists.txt
rename to software/rover/ublox-master/ublox_serialization/CMakeLists.txt
diff --git a/rover/ublox-master/ublox_serialization/include/ublox/checksum.h b/software/rover/ublox-master/ublox_serialization/include/ublox/checksum.h
similarity index 100%
rename from rover/ublox-master/ublox_serialization/include/ublox/checksum.h
rename to software/rover/ublox-master/ublox_serialization/include/ublox/checksum.h
diff --git a/rover/ublox-master/ublox_serialization/include/ublox/serialization.h b/software/rover/ublox-master/ublox_serialization/include/ublox/serialization.h
similarity index 100%
rename from rover/ublox-master/ublox_serialization/include/ublox/serialization.h
rename to software/rover/ublox-master/ublox_serialization/include/ublox/serialization.h
diff --git a/rover/ublox-master/ublox_serialization/include/ublox/serialization_ros.h b/software/rover/ublox-master/ublox_serialization/include/ublox/serialization_ros.h
similarity index 100%
rename from rover/ublox-master/ublox_serialization/include/ublox/serialization_ros.h
rename to software/rover/ublox-master/ublox_serialization/include/ublox/serialization_ros.h
diff --git a/rover/ublox-master/ublox_serialization/package.xml b/software/rover/ublox-master/ublox_serialization/package.xml
similarity index 100%
rename from rover/ublox-master/ublox_serialization/package.xml
rename to software/rover/ublox-master/ublox_serialization/package.xml
diff --git a/rover/zed_wrapper/CMakeLists.txt b/software/rover/zed_wrapper/CMakeLists.txt
similarity index 100%
rename from rover/zed_wrapper/CMakeLists.txt
rename to software/rover/zed_wrapper/CMakeLists.txt
diff --git a/rover/zed_wrapper/LICENSE b/software/rover/zed_wrapper/LICENSE
similarity index 100%
rename from rover/zed_wrapper/LICENSE
rename to software/rover/zed_wrapper/LICENSE
diff --git a/rover/zed_wrapper/README.md b/software/rover/zed_wrapper/README.md
similarity index 100%
rename from rover/zed_wrapper/README.md
rename to software/rover/zed_wrapper/README.md
diff --git a/rover/zed_wrapper/cfg/Zed.cfg b/software/rover/zed_wrapper/cfg/Zed.cfg
similarity index 100%
rename from rover/zed_wrapper/cfg/Zed.cfg
rename to software/rover/zed_wrapper/cfg/Zed.cfg
diff --git a/rover/zed_wrapper/launch/README.md b/software/rover/zed_wrapper/launch/README.md
similarity index 100%
rename from rover/zed_wrapper/launch/README.md
rename to software/rover/zed_wrapper/launch/README.md
diff --git a/rover/zed_wrapper/launch/display.launch b/software/rover/zed_wrapper/launch/display.launch
similarity index 100%
rename from rover/zed_wrapper/launch/display.launch
rename to software/rover/zed_wrapper/launch/display.launch
diff --git a/rover/zed_wrapper/launch/zed.launch b/software/rover/zed_wrapper/launch/zed.launch
similarity index 100%
rename from rover/zed_wrapper/launch/zed.launch
rename to software/rover/zed_wrapper/launch/zed.launch
diff --git a/rover/zed_wrapper/launch/zed_camera.launch b/software/rover/zed_wrapper/launch/zed_camera.launch
similarity index 100%
rename from rover/zed_wrapper/launch/zed_camera.launch
rename to software/rover/zed_wrapper/launch/zed_camera.launch
diff --git a/rover/zed_wrapper/launch/zed_multi_cam.launch b/software/rover/zed_wrapper/launch/zed_multi_cam.launch
similarity index 100%
rename from rover/zed_wrapper/launch/zed_multi_cam.launch
rename to software/rover/zed_wrapper/launch/zed_multi_cam.launch
diff --git a/rover/zed_wrapper/launch/zed_multi_gpu.launch b/software/rover/zed_wrapper/launch/zed_multi_gpu.launch
similarity index 100%
rename from rover/zed_wrapper/launch/zed_multi_gpu.launch
rename to software/rover/zed_wrapper/launch/zed_multi_gpu.launch
diff --git a/rover/zed_wrapper/nodelet_plugins.xml b/software/rover/zed_wrapper/nodelet_plugins.xml
similarity index 100%
rename from rover/zed_wrapper/nodelet_plugins.xml
rename to software/rover/zed_wrapper/nodelet_plugins.xml
diff --git a/rover/zed_wrapper/package.xml b/software/rover/zed_wrapper/package.xml
similarity index 100%
rename from rover/zed_wrapper/package.xml
rename to software/rover/zed_wrapper/package.xml
diff --git a/rover/zed_wrapper/records/record_depth.sh b/software/rover/zed_wrapper/records/record_depth.sh
similarity index 100%
rename from rover/zed_wrapper/records/record_depth.sh
rename to software/rover/zed_wrapper/records/record_depth.sh
diff --git a/rover/zed_wrapper/records/record_stereo.sh b/software/rover/zed_wrapper/records/record_stereo.sh
similarity index 100%
rename from rover/zed_wrapper/records/record_stereo.sh
rename to software/rover/zed_wrapper/records/record_stereo.sh
diff --git a/rover/zed_wrapper/rviz/zed.rviz b/software/rover/zed_wrapper/rviz/zed.rviz
similarity index 100%
rename from rover/zed_wrapper/rviz/zed.rviz
rename to software/rover/zed_wrapper/rviz/zed.rviz
diff --git a/rover/zed_wrapper/src/zed_wrapper_node.cpp b/software/rover/zed_wrapper/src/zed_wrapper_node.cpp
similarity index 100%
rename from rover/zed_wrapper/src/zed_wrapper_node.cpp
rename to software/rover/zed_wrapper/src/zed_wrapper_node.cpp
diff --git a/rover/zed_wrapper/src/zed_wrapper_nodelet.cpp b/software/rover/zed_wrapper/src/zed_wrapper_nodelet.cpp
similarity index 100%
rename from rover/zed_wrapper/src/zed_wrapper_nodelet.cpp
rename to software/rover/zed_wrapper/src/zed_wrapper_nodelet.cpp
diff --git a/rover/zed_wrapper/urdf/ZED.stl b/software/rover/zed_wrapper/urdf/ZED.stl
similarity index 100%
rename from rover/zed_wrapper/urdf/ZED.stl
rename to software/rover/zed_wrapper/urdf/ZED.stl
diff --git a/rover/zed_wrapper/urdf/zed.urdf b/software/rover/zed_wrapper/urdf/zed.urdf
similarity index 100%
rename from rover/zed_wrapper/urdf/zed.urdf
rename to software/rover/zed_wrapper/urdf/zed.urdf