diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 3c78aec94..1df24222c 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -20,19 +20,19 @@ file(GLOB cmds
 add_executable(sway
 	commands.c
 	${cmds}
+	tree/container.c
+	tree/criteria.c
+	tree/focus.c
+	tree/output.c
+	tree/workspace.c
+	tree/layout.c
 	base64.c
 	config.c
-	container.c
-	criteria.c
 	debug_log.c
-	focus.c
 	input_state.c
 	ipc-json.c
 	ipc-server.c
-	layout.c
 	main.c
-	output.c
-	workspace.c
 	border.c
 	security.c
     server.c
diff --git a/sway/container.c b/sway/tree/container.c
similarity index 100%
rename from sway/container.c
rename to sway/tree/container.c
diff --git a/sway/criteria.c b/sway/tree/criteria.c
similarity index 100%
rename from sway/criteria.c
rename to sway/tree/criteria.c
diff --git a/sway/focus.c b/sway/tree/focus.c
similarity index 100%
rename from sway/focus.c
rename to sway/tree/focus.c
diff --git a/sway/layout.c b/sway/tree/layout.c
similarity index 100%
rename from sway/layout.c
rename to sway/tree/layout.c
diff --git a/sway/output.c b/sway/tree/output.c
similarity index 100%
rename from sway/output.c
rename to sway/tree/output.c
diff --git a/sway/workspace.c b/sway/tree/workspace.c
similarity index 100%
rename from sway/workspace.c
rename to sway/tree/workspace.c