diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2a92f2..22552de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,15 +15,15 @@ FetchContent_Declare(
 
 
 add_library(clay
-        src/color.c
-        src/context.c
-        src/debug.c
-        src/document.c
-        src/flex.c
-        src/layout.c
-        src/property.c
-        src/render.c
-        src/text.c
+        src/clay/color.c
+        src/clay/context.c
+        src/clay/debug.c
+        src/clay/document.c
+        src/clay/flex.c
+        src/clay/layout.c
+        src/clay/property.c
+        src/clay/render.c
+        src/clay/text.c
         )
 
 target_include_directories(clay PUBLIC include)
@@ -33,6 +33,6 @@ target_link_libraries(clay PRIVATE cairo)
 target_compile_options(clay PRIVATE -Wall -Werror)
 
 if (PROJECT_IS_TOP_LEVEL)
-    add_executable(clay-demo src/demo.c)
+    add_executable(clay-demo src/clay-demo/demo.c)
     target_link_libraries(clay-demo PRIVATE clay)
 endif ()
\ No newline at end of file
diff --git a/src/demo.c b/src/clay-demo/demo.c
similarity index 100%
rename from src/demo.c
rename to src/clay-demo/demo.c
diff --git a/src/clay-list.h b/src/clay/clay-list.h
similarity index 100%
rename from src/clay-list.h
rename to src/clay/clay-list.h
diff --git a/src/clay-map.h b/src/clay/clay-map.h
similarity index 100%
rename from src/clay-map.h
rename to src/clay/clay-map.h
diff --git a/src/cmoball.h b/src/clay/cmoball.h
similarity index 100%
rename from src/cmoball.h
rename to src/clay/cmoball.h
diff --git a/src/color.c b/src/clay/color.c
similarity index 100%
rename from src/color.c
rename to src/clay/color.c
diff --git a/src/color.h b/src/clay/color.h
similarity index 100%
rename from src/color.h
rename to src/clay/color.h
diff --git a/src/context.c b/src/clay/context.c
similarity index 100%
rename from src/context.c
rename to src/clay/context.c
diff --git a/src/context.h b/src/clay/context.h
similarity index 100%
rename from src/context.h
rename to src/clay/context.h
diff --git a/src/debug.c b/src/clay/debug.c
similarity index 100%
rename from src/debug.c
rename to src/clay/debug.c
diff --git a/src/document.c b/src/clay/document.c
similarity index 100%
rename from src/document.c
rename to src/clay/document.c
diff --git a/src/flex.c b/src/clay/flex.c
similarity index 100%
rename from src/flex.c
rename to src/clay/flex.c
diff --git a/src/layout.c b/src/clay/layout.c
similarity index 100%
rename from src/layout.c
rename to src/clay/layout.c
diff --git a/src/layout.h b/src/clay/layout.h
similarity index 100%
rename from src/layout.h
rename to src/clay/layout.h
diff --git a/src/property.c b/src/clay/property.c
similarity index 100%
rename from src/property.c
rename to src/clay/property.c
diff --git a/src/property.h b/src/clay/property.h
similarity index 100%
rename from src/property.h
rename to src/clay/property.h
diff --git a/src/render.c b/src/clay/render.c
similarity index 100%
rename from src/render.c
rename to src/clay/render.c
diff --git a/src/text.c b/src/clay/text.c
similarity index 100%
rename from src/text.c
rename to src/clay/text.c