diff --git a/autonav_ws/src/autonav_messages/CMakeLists.txt b/autonav_ws/src/autonav_messages/CMakeLists.txt
deleted file mode 100644
index 3beca650..00000000
--- a/autonav_ws/src/autonav_messages/CMakeLists.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-
-project(autonav_messages)
-
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
-endif()
-
-# find dependencies
-find_package(ament_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
-find_package(builtin_interfaces REQUIRED)
-# uncomment the following section in order to fill in
-# further dependencies manually.
-# find_package(<dependency> REQUIRED)
-
-# msgs and srvs 
-rosidl_generate_interfaces(${PROJECT_NAME}
-  "msg/Position.msg"
-  "msg/GPSFeedback.msg"
-  "msg/MotorFeedback.msg"
-  DEPENDENCIES builtin_interfaces
-)
-
-# C++
-
-# Inlcude Cpp "include" directory
-include_directories(include)
-
-# Create Cpp executables
-#add_executable(executable_name path_to_executable/executable.cpp)
-#ament_target_dependencies(executable_name rclcpp other_dependencies)
-
-# Install Cpp executables
-install(TARGETS
-  # install executables by name
-  # executable_name
-  DESTINATION lib/${PROJECT_NAME}
- )
- 
-# Python
-
- # Use only if not using rosidl_generate_interfaces
- # Install Python modules
- #ament_python_install_package(${PROJECT_NAME})
- 
- # Install Python programs
- install(PROGRAMS
-   # add programs in format:
-   #/path_to_program/program.py
-   DESTINATION lib/${PROJECT_NAME}
-)
-
-
-if(BUILD_TESTING)
-  #find_package(ament_lint_auto REQUIRED)
-  # the following line skips the linter which checks for copyrights
-  # comment the line when a copyright and license is added to all source files
-  #set(ament_cmake_copyright_FOUND TRUE)
-  # the following line skips cpplint (only works in a git repo)
-  # comment the line when this package is in a git repo and when
-  # a copyright and license is added to all source files
-  #set(ament_cmake_cpplint_FOUND TRUE)
-  #ament_lint_auto_find_test_dependencies()
-endif()
-
-ament_package()
diff --git a/autonav_ws/src/autonav_messages/msg/GPSFeedback.msg b/autonav_ws/src/autonav_messages/msg/GPSFeedback.msg
deleted file mode 100644
index c4834e9a..00000000
--- a/autonav_ws/src/autonav_messages/msg/GPSFeedback.msg
+++ /dev/null
@@ -1,6 +0,0 @@
-float64 latitude
-float64 longitude
-float64 altitude
-int16 gps_fix
-bool is_locked
-int16 satellites
\ No newline at end of file
diff --git a/autonav_ws/src/autonav_messages/msg/MotorFeedback.msg b/autonav_ws/src/autonav_messages/msg/MotorFeedback.msg
deleted file mode 100644
index 8d4ff2ee..00000000
--- a/autonav_ws/src/autonav_messages/msg/MotorFeedback.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-float64 delta_x 0
-float64 delta_y 0
-float64 delta_theta 0
\ No newline at end of file
diff --git a/autonav_ws/src/autonav_messages/msg/Position.msg b/autonav_ws/src/autonav_messages/msg/Position.msg
deleted file mode 100644
index 4f285e71..00000000
--- a/autonav_ws/src/autonav_messages/msg/Position.msg
+++ /dev/null
@@ -1,5 +0,0 @@
-float64 x 0
-float64 y 0
-float64 theta 0
-float64 latitude
-float64 longitude
\ No newline at end of file
diff --git a/autonav_ws/src/autonav_messages/package.xml b/autonav_ws/src/autonav_messages/package.xml
deleted file mode 100644
index 004bc267..00000000
--- a/autonav_ws/src/autonav_messages/package.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
-<package format="3">
-  <name>autonav_messages</name>
-  <version>0.0.0</version>
-  <description>Contains all ROS2 message structs for autonav 2024</description>
-  <maintainer email="antoniochappell@protonmail.com">Antonio Chappell</maintainer>
-  <license>MIT</license>
-
-  <buildtool_depend>ament_cmake</buildtool_depend>
-  <buildtool_depend>ament_cmake_python</buildtool_depend>
-  
-  <depend>rclcpp</depend>
-  <depend>rclpy</depend>
-  
-  <build_depend>rosidl_default_generators</build_depend>
-  
-  <exec_depend>rosidl_default_runtime</exec_depend>
-  <exec_depend>ros2launch</exec_depend>
-  
-  <member_of_group>rosidl_interface_packages</member_of_group>
-
-  <test_depend>ament_lint_auto</test_depend>
-  <test_depend>ament_lint_common</test_depend>
-
-  <export>
-    <build_type>ament_cmake</build_type>
-  </export>
-</package>
diff --git a/autonav_ws/src/autonav_msgs/CMakeLists.txt b/autonav_ws/src/autonav_msgs/CMakeLists.txt
index a6844d91..ef949a6d 100644
--- a/autonav_ws/src/autonav_msgs/CMakeLists.txt
+++ b/autonav_ws/src/autonav_msgs/CMakeLists.txt
@@ -35,5 +35,24 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   DEPENDENCIES builtin_interfaces
 )
 
+
+# Inlcude Cpp "include" directory
+include_directories(include)
+
+# Install Cpp executables
+install(TARGETS
+  # install executables by name
+  # executable_name
+  DESTINATION lib/${PROJECT_NAME}
+ )
+ 
+# Python
+# Install Python programs
+install(PROGRAMS
+  # add programs in format:
+  #/path_to_program/program.py
+  DESTINATION lib/${PROJECT_NAME}
+)
+
 ament_export_dependencies(rosidl_default_runtime)
 ament_package()
\ No newline at end of file