diff --git a/src/boomerang-plugins/codegen/CMakeLists.txt b/src/boomerang-plugins/codegen/CMakeLists.txt
index 7c29de720..dbf3f88fc 100644
--- a/src/boomerang-plugins/codegen/CMakeLists.txt
+++ b/src/boomerang-plugins/codegen/CMakeLists.txt
@@ -15,14 +15,15 @@ include_directories(
 BOOMERANG_ADD_CODEGEN(
     NAME "C"
     SOURCES
-        c/ASTNode.cpp
-        c/ASTNode.h
+        c/ast/ASTNode.cpp
+        c/ast/ASTNode.h
+        c/ast/StmtASTNode.cpp
+        c/ast/StmtASTNode.h
+
         c/CCodeGenerator.cpp
         c/CCodeGenerator.h
         c/CodeWriter.cpp
         c/CodeWriter.h
         c/ControlFlowAnalyzer.cpp
         c/ControlFlowAnalyzer.h
-        c/StmtASTNode.cpp
-        c/StmtASTNode.h
 )
diff --git a/src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h b/src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h
index a6e86a830..b99485c90 100644
--- a/src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h
+++ b/src/boomerang-plugins/codegen/c/ControlFlowAnalyzer.h
@@ -10,7 +10,7 @@
 #pragma once
 
 
-#include "StmtASTNode.h"
+#include "ast/StmtASTNode.h"
 
 #include <map>
 #include <unordered_map>
diff --git a/src/boomerang-plugins/codegen/c/ASTNode.cpp b/src/boomerang-plugins/codegen/c/ast/ASTNode.cpp
similarity index 100%
rename from src/boomerang-plugins/codegen/c/ASTNode.cpp
rename to src/boomerang-plugins/codegen/c/ast/ASTNode.cpp
diff --git a/src/boomerang-plugins/codegen/c/ASTNode.h b/src/boomerang-plugins/codegen/c/ast/ASTNode.h
similarity index 100%
rename from src/boomerang-plugins/codegen/c/ASTNode.h
rename to src/boomerang-plugins/codegen/c/ast/ASTNode.h
diff --git a/src/boomerang-plugins/codegen/c/StmtASTNode.cpp b/src/boomerang-plugins/codegen/c/ast/StmtASTNode.cpp
similarity index 100%
rename from src/boomerang-plugins/codegen/c/StmtASTNode.cpp
rename to src/boomerang-plugins/codegen/c/ast/StmtASTNode.cpp
diff --git a/src/boomerang-plugins/codegen/c/StmtASTNode.h b/src/boomerang-plugins/codegen/c/ast/StmtASTNode.h
similarity index 100%
rename from src/boomerang-plugins/codegen/c/StmtASTNode.h
rename to src/boomerang-plugins/codegen/c/ast/StmtASTNode.h