diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8c7b4f3..27839b1d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ FILE(GLOB sources ${PROJECT_SOURCE_DIR}/sway/*.c)
 
 include_directories(
    ${WLC_INCLUDE_DIRS}
-   sway/
+   include/
 )
 
 add_executable(sway
diff --git a/sway/commands.h b/include/commands.h
similarity index 100%
rename from sway/commands.h
rename to include/commands.h
diff --git a/sway/config.h b/include/config.h
similarity index 100%
rename from sway/config.h
rename to include/config.h
diff --git a/sway/container.h b/include/container.h
similarity index 100%
rename from sway/container.h
rename to include/container.h
diff --git a/sway/handlers.h b/include/handlers.h
similarity index 100%
rename from sway/handlers.h
rename to include/handlers.h
diff --git a/sway/layout.h b/include/layout.h
similarity index 100%
rename from sway/layout.h
rename to include/layout.h
diff --git a/sway/list.h b/include/list.h
similarity index 100%
rename from sway/list.h
rename to include/list.h
diff --git a/sway/log.h b/include/log.h
similarity index 100%
rename from sway/log.h
rename to include/log.h
diff --git a/sway/movement.h b/include/movement.h
similarity index 100%
rename from sway/movement.h
rename to include/movement.h
diff --git a/sway/readline.h b/include/readline.h
similarity index 100%
rename from sway/readline.h
rename to include/readline.h
diff --git a/sway/stringop.h b/include/stringop.h
similarity index 100%
rename from sway/stringop.h
rename to include/stringop.h
diff --git a/sway/workspace.h b/include/workspace.h
similarity index 100%
rename from sway/workspace.h
rename to include/workspace.h