diff --git a/src/checker/decl.c b/src/check_decl.c
similarity index 100%
rename from src/checker/decl.c
rename to src/check_decl.c
diff --git a/src/checker/expr.c b/src/check_expr.c
similarity index 100%
rename from src/checker/expr.c
rename to src/check_expr.c
diff --git a/src/checker/stmt.c b/src/check_stmt.c
similarity index 99%
rename from src/checker/stmt.c
rename to src/check_stmt.c
index b6bf9b1d0..068f6a2b3 100644
--- a/src/checker/stmt.c
+++ b/src/check_stmt.c
@@ -302,7 +302,7 @@ typedef struct TypeAndToken {
 #define MAP_TYPE TypeAndToken
 #define MAP_PROC map_type_and_token_
 #define MAP_NAME MapTypeAndToken
-#include "../map.c"
+#include "map.c"
 
 void check_when_stmt(Checker *c, AstNodeWhenStmt *ws, u32 flags) {
 	Operand operand = {Addressing_Invalid};
diff --git a/src/checker/checker.c b/src/checker.c
similarity index 99%
rename from src/checker/checker.c
rename to src/checker.c
index 436a89391..6685d56ab 100644
--- a/src/checker/checker.c
+++ b/src/checker.c
@@ -1,11 +1,11 @@
-#include "../exact_value.c"
+#include "exact_value.c"
 #include "entity.c"
 #include "types.c"
 
 #define MAP_TYPE Entity *
 #define MAP_PROC map_entity_
 #define MAP_NAME MapEntity
-#include "../map.c"
+#include "map.c"
 
 typedef enum AddressingMode {
 	Addressing_Invalid,
@@ -216,27 +216,27 @@ typedef struct CheckerContext {
 #define MAP_TYPE TypeAndValue
 #define MAP_PROC map_tav_
 #define MAP_NAME MapTypeAndValue
-#include "../map.c"
+#include "map.c"
 
 #define MAP_TYPE Scope *
 #define MAP_PROC map_scope_
 #define MAP_NAME MapScope
-#include "../map.c"
+#include "map.c"
 
 #define MAP_TYPE DeclInfo *
 #define MAP_PROC map_decl_info_
 #define MAP_NAME MapDeclInfo
-#include "../map.c"
+#include "map.c"
 
 #define MAP_TYPE AstFile *
 #define MAP_PROC map_ast_file_
 #define MAP_NAME MapAstFile
-#include "../map.c"
+#include "map.c"
 
 #define MAP_TYPE ExprInfo
 #define MAP_PROC map_expr_info_
 #define MAP_NAME MapExprInfo
-#include "../map.c"
+#include "map.c"
 
 typedef struct DelayedDecl {
 	Scope *  parent;
@@ -1093,9 +1093,9 @@ void init_preload(Checker *c) {
 
 bool check_arity_match(Checker *c, AstNodeValueDecl *d);
 
-#include "expr.c"
-#include "decl.c"
-#include "stmt.c"
+#include "check_expr.c"
+#include "check_decl.c"
+#include "check_stmt.c"
 
 bool check_arity_match(Checker *c, AstNodeValueDecl *d) {
 	isize lhs = d->names.count;
diff --git a/src/checker/entity.c b/src/entity.c
similarity index 100%
rename from src/checker/entity.c
rename to src/entity.c
diff --git a/src/main.c b/src/main.c
index 9148636ae..157667b52 100644
--- a/src/main.c
+++ b/src/main.c
@@ -9,7 +9,7 @@ extern "C" {
 #include "tokenizer.c"
 #include "parser.c"
 // #include "printer.c"
-#include "checker/checker.c"
+#include "checker.c"
 // #include "ssa.c"
 #include "ir.c"
 #include "ir_opt.c"
diff --git a/src/checker/types.c b/src/types.c
similarity index 100%
rename from src/checker/types.c
rename to src/types.c