diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3528bd..8443d1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,14 +8,16 @@ find_package(ament_cmake REQUIRED)
 find_package(rclcpp REQUIRED)
 find_package(sensor_msgs REQUIRED)
 ##########################################################################
+include_directories(${PIKA_SPARK_BNO085_TARGET} include)
+##########################################################################
 add_subdirectory(sh2)
 ##########################################################################
 add_executable(${PIKA_SPARK_BNO085_TARGET}
-  main.cpp
-  bno085.cpp
-  bno085_hal.cpp
-  spi.cpp
-  gpio-sysfs.cpp
+        src/main.cpp
+        src/bno085.cpp
+        src/bno085_hal.cpp
+        src/spi.cpp
+        src/gpio-sysfs.cpp
 )
 ##########################################################################
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/bno085.h b/include/bno085.h
similarity index 100%
rename from bno085.h
rename to include/bno085.h
diff --git a/bno085_exception.h b/include/bno085_exception.h
similarity index 100%
rename from bno085_exception.h
rename to include/bno085_exception.h
diff --git a/bno085_hal.h b/include/bno085_hal.h
similarity index 100%
rename from bno085_hal.h
rename to include/bno085_hal.h
diff --git a/gpio-sysfs.h b/include/gpio-sysfs.h
similarity index 100%
rename from gpio-sysfs.h
rename to include/gpio-sysfs.h
diff --git a/spi.h b/include/spi.h
similarity index 100%
rename from spi.h
rename to include/spi.h
diff --git a/bno085.cpp b/src/bno085.cpp
similarity index 100%
rename from bno085.cpp
rename to src/bno085.cpp
diff --git a/bno085_hal.cpp b/src/bno085_hal.cpp
similarity index 100%
rename from bno085_hal.cpp
rename to src/bno085_hal.cpp
diff --git a/gpio-sysfs.cpp b/src/gpio-sysfs.cpp
similarity index 100%
rename from gpio-sysfs.cpp
rename to src/gpio-sysfs.cpp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/spi.cpp b/src/spi.cpp
similarity index 100%
rename from spi.cpp
rename to src/spi.cpp