23 files changed, 45 insertions, 28 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f8c0315..c6adabf 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,10 +1,12 @@
 add_library(daw_core
-  cleanup.c
-  dltools.c
-  harness.c
-  init.c
-  logging.c
-  loop.c
-  memory.c
-  state.c
+  src/cleanup.c
+  src/dltools.c
+  src/harness.c
+  src/init.c
+  src/logging.c
+  src/loop.c
+  src/memory.c
+  src/state.c
   )
+
+target_include_directories(daw_core PRIVATE include)
diff --git a/include/engine/dltools.h b/src/core/include/engine/core/dltools.h
index 5a53f49..5a53f49 100644
--- a/include/engine/dltools.h
+++ b/src/core/include/engine/core/dltools.h
diff --git a/include/engine/logging.h b/src/core/include/engine/core/logging.h
index d1c5890..d1c5890 100644
--- a/include/engine/logging.h
+++ b/src/core/include/engine/core/logging.h
diff --git a/include/engine/memory.h b/src/core/include/engine/core/memory.h
index 04c24d5..04c24d5 100644
--- a/include/engine/memory.h
+++ b/src/core/include/engine/core/memory.h
diff --git a/include/engine/state.h b/src/core/include/engine/core/state.h
index 13593ed..13593ed 100644
--- a/include/engine/state.h
+++ b/src/core/include/engine/core/state.h
diff --git a/include/engine/types.h b/src/core/include/engine/core/types.h
index 934cb63..934cb63 100644
--- a/include/engine/types.h
+++ b/src/core/include/engine/core/types.h
diff --git a/include/engine/engine.h b/src/core/include/engine/engine.h
index e8a5ace..e8a5ace 100644
--- a/include/engine/engine.h
+++ b/src/core/include/engine/engine.h
diff --git a/src/ctrl/CMakeLists.txt b/src/ctrl/CMakeLists.txt
index e086f07..7a449d6 100644
--- a/src/ctrl/CMakeLists.txt
+++ b/src/ctrl/CMakeLists.txt
@@ -1,7 +1,9 @@
 add_library(daw_ctrl
-  controller.c
-  ctx.c
-  input.c
-  keyboard.c
-  mouse.c
+  src/controller.c
+  src/ctx.c
+  src/input.c
+  src/keyboard.c
+  src/mouse.c
   )
+
+target_include_directories(daw_ctrl PRIVATE include)
diff --git a/include/engine/input.h b/src/ctrl/include/engine/ctrl/input.h
index 49b3a96..49b3a96 100644
--- a/include/engine/input.h
+++ b/src/ctrl/include/engine/ctrl/input.h
diff --git a/src/rendering/CMakeLists.txt b/src/rendering/CMakeLists.txt
index a7313e9..e04d858 100644
--- a/src/rendering/CMakeLists.txt
+++ b/src/rendering/CMakeLists.txt
@@ -1,6 +1,13 @@
 add_library(daw_rendering
-  gl.c
-  rendering.c
-  text.c
-  window.c
+  src/gl.c
+  src/rendering.c
+  src/text.c
+  src/window.c
+  )
+
+target_include_directories(daw_rendering PRIVATE include)
+target_link_libraries(daw_rendering PRIVATE
+  OpenGL::GL
+  cglm
+  glfw
   )
diff --git a/include/engine/rendering.h b/src/rendering/include/engine/rendering/rendering.h
index ff24412..ff24412 100644
--- a/include/engine/rendering.h
+++ b/src/rendering/include/engine/rendering/rendering.h
diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
index 7fe5cac..02ab1ca 100644
--- a/src/resources/CMakeLists.txt
+++ b/src/resources/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_library(daw_resources
-  fonts.c
-  scripts.c
-  textures.c
+  src/fonts.c
+  src/scripts.c
+  src/textures.c
   )
+
+target_include_directories(daw_resources PRIVATE include)
diff --git a/include/engine/resources.h b/src/resources/include/engine/resources/resources.h
index 1689544..1689544 100644
--- a/include/engine/resources.h
+++ b/src/resources/include/engine/resources/resources.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 05b2648..23dcae6 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_library(daw_ui
-  positioning.c
-  rendering.c
+  src/positioning.c
+  src/rendering.c
   )
+
+target_include_directories(daw_ui PRIVATE include)
diff --git a/include/engine/ui.h b/src/ui/include/engine/ui/ui.h
index 4a3cd3e..4a3cd3e 100644
--- a/include/engine/ui.h
+++ b/src/ui/include/engine/ui/ui.h
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 3274f55..7508d26 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -1,8 +1,10 @@
 add_library(daw_utils
-  btree.c
-  fov.c
-  hashmap.c
-  misc.c
-  stack.c
-  vector.c
+  src/btree.c
+  src/fov.c
+  src/hashmap.c
+  src/misc.c
+  src/stack.c
+  src/vector.c
   )
+
+target_include_directories(daw_utils PRIVATE include)
diff --git a/include/engine/btree.h b/src/utils/include/engine/utils/btree.h
index 04f9ff8..04f9ff8 100644
--- a/include/engine/btree.h
+++ b/src/utils/include/engine/utils/btree.h
diff --git a/include/engine/fov.h b/src/utils/include/engine/utils/fov.h
index 15ef38b..15ef38b 100644
--- a/include/engine/fov.h
+++ b/src/utils/include/engine/utils/fov.h
diff --git a/include/engine/hashmap.h b/src/utils/include/engine/utils/hashmap.h
index bf1d87c..bf1d87c 100644
--- a/include/engine/hashmap.h
+++ b/src/utils/include/engine/utils/hashmap.h
diff --git a/include/engine/list.h b/src/utils/include/engine/utils/list.h
index 37857f0..37857f0 100644
--- a/include/engine/list.h
+++ b/src/utils/include/engine/utils/list.h
diff --git a/include/engine/stack.h b/src/utils/include/engine/utils/stack.h
index 69975df..69975df 100644
--- a/include/engine/stack.h
+++ b/src/utils/include/engine/utils/stack.h
diff --git a/include/engine/utils.h b/src/utils/include/engine/utils/utils.h
index e537f52..e537f52 100644
--- a/include/engine/utils.h
+++ b/src/utils/include/engine/utils/utils.h
diff --git a/include/engine/vector.h b/src/utils/include/engine/utils/vector.h
index 58bb0a2..58bb0a2 100644
--- a/include/engine/vector.h
+++ b/src/utils/include/engine/utils/vector.h