diff --git a/source/tycho/CMakeLists.txt b/source/tycho/CMakeLists.txt
index 1c25ec3..088f05d 100644
--- a/source/tycho/CMakeLists.txt
+++ b/source/tycho/CMakeLists.txt
@@ -22,13 +22,13 @@ add_library(
    SHARED
    $ENV{OUT_DIR}/bindings.cc
    $ENV{OUT_DIR}/bindings.h
-   headers/mapprops.h
-   headers/menu.h
-   headers/tycho.h
+   cc_headers/mapprops.h
+   cc_headers/menu.h
+   cc_headers/tycho.h
+   cc_source/main.cc
+   cc_source/mapprops.cc
+   cc_source/menu.cc
    resources/resources.qrc
-   source/main.cc
-   source/mapprops.cc
-   source/menu.cc
    ui/about.ui
    ui/mapprops.ui
    ui/mapview.ui
@@ -46,7 +46,7 @@ set_target_properties(
 target_include_directories(
    maraiah-tycho-hermes
    PUBLIC
-      headers
+      cc_headers
       $ENV{OUT_DIR}
 )
 
diff --git a/source/tycho/Cargo.toml b/source/tycho/Cargo.toml
index 3779ded..16b1334 100644
--- a/source/tycho/Cargo.toml
+++ b/source/tycho/Cargo.toml
@@ -16,4 +16,4 @@ rust_qt_binding_generator = "0.3"
 
 [[bin]]
 name = "tycho"
-path = "main.rs"
+path = "source/main.rs"
diff --git a/source/tycho/headers/mapprops.h b/source/tycho/cc_headers/mapprops.h
similarity index 100%
rename from source/tycho/headers/mapprops.h
rename to source/tycho/cc_headers/mapprops.h
diff --git a/source/tycho/headers/menu.h b/source/tycho/cc_headers/menu.h
similarity index 100%
rename from source/tycho/headers/menu.h
rename to source/tycho/cc_headers/menu.h
diff --git a/source/tycho/headers/tycho.h b/source/tycho/cc_headers/tycho.h
similarity index 100%
rename from source/tycho/headers/tycho.h
rename to source/tycho/cc_headers/tycho.h
diff --git a/source/tycho/source/main.cc b/source/tycho/cc_source/main.cc
similarity index 100%
rename from source/tycho/source/main.cc
rename to source/tycho/cc_source/main.cc
diff --git a/source/tycho/source/mapprops.cc b/source/tycho/cc_source/mapprops.cc
similarity index 100%
rename from source/tycho/source/mapprops.cc
rename to source/tycho/cc_source/mapprops.cc
diff --git a/source/tycho/source/menu.cc b/source/tycho/cc_source/menu.cc
similarity index 100%
rename from source/tycho/source/menu.cc
rename to source/tycho/cc_source/menu.cc
diff --git a/source/tycho/main.rs b/source/tycho/source/main.rs
similarity index 100%
rename from source/tycho/main.rs
rename to source/tycho/source/main.rs