diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 13c66b9..8867f44 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,9 @@
 {
-  "name": "ROS 2 NVIDIA Dev Container",
+  "name": "Dev Container",
   "dockerFile": "Dockerfile",
   "context": "../",
-  "workspaceMount": "source=${localWorkspaceFolder},target=/home/ubuntu/ws_ros/src/auv_controllers,type=bind",
-  "workspaceFolder": "/home/ubuntu/ws_ros/src/auv_controllers",
+  "workspaceMount": "source=${localWorkspaceFolder},target=/home/ubuntu/ws_ros/src/hydrodynamics,type=bind",
+  "workspaceFolder": "/home/ubuntu/ws_ros/src/hydrodynamics",
   "remoteUser": "ubuntu",
   "customizations": {
     "vscode": {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8266359..cb30628 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,24 +13,26 @@ add_library(hydrodynamics SHARED)
 target_sources(hydrodynamics
   PRIVATE
     src/hydrodynamics.cpp
+)
+target_include_directories(hydrodynamics
   PUBLIC
-    FILE_SET HEADERS
-    BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
-    FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/include/hydrodynamics/hydrodynamics.hpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/include/hydrodynamics/eigen.hpp
+    $<INSTALL_INTERFACE:include/hydrodynamics>
+    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
 )
-
 target_compile_features(hydrodynamics PUBLIC cxx_std_20)
 target_link_libraries(hydrodynamics Eigen3::Eigen)
 
+install(
+  DIRECTORY include/
+  DESTINATION include/hydrodynamics
+)
+
 install(
   TARGETS hydrodynamics
   EXPORT export_hydrodynamics
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  FILE_SET HEADERS
 )
 
 if(BUILD_TESTING)