diff --git a/SConstruct b/SConstruct
index 1eec737..d8200a1 100644
--- a/SConstruct
+++ b/SConstruct
@@ -490,11 +490,11 @@ if env["generate_bindings"]:
     NoCache(bindings)
 
 # Includes
-env.Append(CPPPATH=[[env.Dir(d) for d in [".", env["headers_dir"], "include", "include/gen", "include/core"]]])
+env.Append(CPPPATH=[[env.Dir(d) for d in [".", env["headers_dir"], "gen", "core"]]])
 
 # Sources to compile
 sources = []
-add_sources(sources, "src/core", "cpp")
+add_sources(sources, "core", "cpp")
 sources.extend(f for f in bindings if str(f).endswith(".cpp"))
 
 arch_suffix = env["bits"]
diff --git a/binding_generator.py b/binding_generator.py
index 444ec9f..ca205a2 100644
--- a/binding_generator.py
+++ b/binding_generator.py
@@ -47,8 +47,8 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
     files = []
     with open(api_filepath) as api_file:
         classes = json.load(api_file)
-    include_gen_folder = Path(output_dir) / "include" / "gen"
-    source_gen_folder = Path(output_dir) / "src" / "gen"
+    include_gen_folder = Path(output_dir) / "gen"
+    source_gen_folder = Path(output_dir) / "gen"
     for _class in classes:
         header_filename = include_gen_folder / (class_name_to_file_name(strip_name(_class["name"])) + ".h")
         source_filename = source_gen_folder / (class_name_to_file_name(strip_name(_class["name"])) + ".cpp")
@@ -90,8 +90,8 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
         classes = json.load(api_file)
 
     icalls = set()
-    include_gen_folder = Path(output_dir) / "include" / "gen"
-    source_gen_folder = Path(output_dir) / "src" / "gen"
+    include_gen_folder = Path(output_dir) / "gen"
+    source_gen_folder = Path(output_dir) / "gen"
 
     include_gen_folder.mkdir(parents=True, exist_ok=True)
     source_gen_folder.mkdir(parents=True, exist_ok=True)
diff --git a/src/core/aabb.cpp b/core/aabb.cpp
similarity index 100%
rename from src/core/aabb.cpp
rename to core/aabb.cpp
diff --git a/include/core/aabb.h b/core/aabb.h
similarity index 100%
rename from include/core/aabb.h
rename to core/aabb.h
diff --git a/src/core/array.cpp b/core/array.cpp
similarity index 100%
rename from src/core/array.cpp
rename to core/array.cpp
diff --git a/include/core/array.h b/core/array.h
similarity index 100%
rename from include/core/array.h
rename to core/array.h
diff --git a/src/core/basis.cpp b/core/basis.cpp
similarity index 100%
rename from src/core/basis.cpp
rename to core/basis.cpp
diff --git a/include/core/basis.h b/core/basis.h
similarity index 100%
rename from include/core/basis.h
rename to core/basis.h
diff --git a/src/core/color.cpp b/core/color.cpp
similarity index 100%
rename from src/core/color.cpp
rename to core/color.cpp
diff --git a/include/core/color.h b/core/color.h
similarity index 100%
rename from include/core/color.h
rename to core/color.h
diff --git a/include/core/core_types.h b/core/core_types.h
similarity index 100%
rename from include/core/core_types.h
rename to core/core_types.h
diff --git a/include/core/defs.h b/core/defs.h
similarity index 100%
rename from include/core/defs.h
rename to core/defs.h
diff --git a/src/core/dictionary.cpp b/core/dictionary.cpp
similarity index 100%
rename from src/core/dictionary.cpp
rename to core/dictionary.cpp
diff --git a/include/core/dictionary.h b/core/dictionary.h
similarity index 100%
rename from include/core/dictionary.h
rename to core/dictionary.h
diff --git a/include/core/math_funcs.h b/core/math_funcs.h
similarity index 100%
rename from include/core/math_funcs.h
rename to core/math_funcs.h
diff --git a/src/core/node_path.cpp b/core/node_path.cpp
similarity index 100%
rename from src/core/node_path.cpp
rename to core/node_path.cpp
diff --git a/include/core/node_path.h b/core/node_path.h
similarity index 100%
rename from include/core/node_path.h
rename to core/node_path.h
diff --git a/include/core/pandemonium.h b/core/pandemonium.h
similarity index 100%
rename from include/core/pandemonium.h
rename to core/pandemonium.h
diff --git a/src/core/pandemonium_global.cpp b/core/pandemonium_global.cpp
similarity index 100%
rename from src/core/pandemonium_global.cpp
rename to core/pandemonium_global.cpp
diff --git a/include/core/pandemonium_global.h b/core/pandemonium_global.h
similarity index 100%
rename from include/core/pandemonium_global.h
rename to core/pandemonium_global.h
diff --git a/src/core/pandemonium_profiling.cpp b/core/pandemonium_profiling.cpp
similarity index 100%
rename from src/core/pandemonium_profiling.cpp
rename to core/pandemonium_profiling.cpp
diff --git a/include/core/pandemonium_profiling.h b/core/pandemonium_profiling.h
similarity index 100%
rename from include/core/pandemonium_profiling.h
rename to core/pandemonium_profiling.h
diff --git a/src/core/plane.cpp b/core/plane.cpp
similarity index 100%
rename from src/core/plane.cpp
rename to core/plane.cpp
diff --git a/include/core/plane.h b/core/plane.h
similarity index 100%
rename from include/core/plane.h
rename to core/plane.h
diff --git a/src/core/pool_arrays.cpp b/core/pool_arrays.cpp
similarity index 100%
rename from src/core/pool_arrays.cpp
rename to core/pool_arrays.cpp
diff --git a/include/core/pool_arrays.h b/core/pool_arrays.h
similarity index 100%
rename from include/core/pool_arrays.h
rename to core/pool_arrays.h
diff --git a/src/core/projection.cpp b/core/projection.cpp
similarity index 100%
rename from src/core/projection.cpp
rename to core/projection.cpp
diff --git a/include/core/projection.h b/core/projection.h
similarity index 100%
rename from include/core/projection.h
rename to core/projection.h
diff --git a/src/core/quaternion.cpp b/core/quaternion.cpp
similarity index 100%
rename from src/core/quaternion.cpp
rename to core/quaternion.cpp
diff --git a/include/core/quaternion.h b/core/quaternion.h
similarity index 100%
rename from include/core/quaternion.h
rename to core/quaternion.h
diff --git a/src/core/rect2.cpp b/core/rect2.cpp
similarity index 100%
rename from src/core/rect2.cpp
rename to core/rect2.cpp
diff --git a/include/core/rect2.h b/core/rect2.h
similarity index 100%
rename from include/core/rect2.h
rename to core/rect2.h
diff --git a/src/core/rect2i.cpp b/core/rect2i.cpp
similarity index 100%
rename from src/core/rect2i.cpp
rename to core/rect2i.cpp
diff --git a/include/core/rect2i.h b/core/rect2i.h
similarity index 100%
rename from include/core/rect2i.h
rename to core/rect2i.h
diff --git a/include/core/ref.h b/core/ref.h
similarity index 100%
rename from include/core/ref.h
rename to core/ref.h
diff --git a/src/core/rid.cpp b/core/rid.cpp
similarity index 100%
rename from src/core/rid.cpp
rename to core/rid.cpp
diff --git a/include/core/rid.h b/core/rid.h
similarity index 100%
rename from include/core/rid.h
rename to core/rid.h
diff --git a/src/core/string_name.cpp b/core/string_name.cpp
similarity index 100%
rename from src/core/string_name.cpp
rename to core/string_name.cpp
diff --git a/include/core/string_name.h b/core/string_name.h
similarity index 100%
rename from include/core/string_name.h
rename to core/string_name.h
diff --git a/src/core/tag_db.cpp b/core/tag_db.cpp
similarity index 100%
rename from src/core/tag_db.cpp
rename to core/tag_db.cpp
diff --git a/include/core/tag_db.h b/core/tag_db.h
similarity index 100%
rename from include/core/tag_db.h
rename to core/tag_db.h
diff --git a/src/core/transform.cpp b/core/transform.cpp
similarity index 100%
rename from src/core/transform.cpp
rename to core/transform.cpp
diff --git a/include/core/transform.h b/core/transform.h
similarity index 100%
rename from include/core/transform.h
rename to core/transform.h
diff --git a/src/core/transform_2d.cpp b/core/transform_2d.cpp
similarity index 100%
rename from src/core/transform_2d.cpp
rename to core/transform_2d.cpp
diff --git a/include/core/transform_2d.h b/core/transform_2d.h
similarity index 100%
rename from include/core/transform_2d.h
rename to core/transform_2d.h
diff --git a/src/core/ustring.cpp b/core/ustring.cpp
similarity index 100%
rename from src/core/ustring.cpp
rename to core/ustring.cpp
diff --git a/include/core/ustring.h b/core/ustring.h
similarity index 100%
rename from include/core/ustring.h
rename to core/ustring.h
diff --git a/src/core/variant.cpp b/core/variant.cpp
similarity index 100%
rename from src/core/variant.cpp
rename to core/variant.cpp
diff --git a/include/core/variant.h b/core/variant.h
similarity index 100%
rename from include/core/variant.h
rename to core/variant.h
diff --git a/src/core/vector2.cpp b/core/vector2.cpp
similarity index 100%
rename from src/core/vector2.cpp
rename to core/vector2.cpp
diff --git a/include/core/vector2.h b/core/vector2.h
similarity index 100%
rename from include/core/vector2.h
rename to core/vector2.h
diff --git a/src/core/vector2i.cpp b/core/vector2i.cpp
similarity index 100%
rename from src/core/vector2i.cpp
rename to core/vector2i.cpp
diff --git a/include/core/vector2i.h b/core/vector2i.h
similarity index 100%
rename from include/core/vector2i.h
rename to core/vector2i.h
diff --git a/src/core/vector3.cpp b/core/vector3.cpp
similarity index 100%
rename from src/core/vector3.cpp
rename to core/vector3.cpp
diff --git a/include/core/vector3.h b/core/vector3.h
similarity index 100%
rename from include/core/vector3.h
rename to core/vector3.h
diff --git a/src/core/vector3i.cpp b/core/vector3i.cpp
similarity index 100%
rename from src/core/vector3i.cpp
rename to core/vector3i.cpp
diff --git a/include/core/vector3i.h b/core/vector3i.h
similarity index 100%
rename from include/core/vector3i.h
rename to core/vector3i.h
diff --git a/src/core/vector4.cpp b/core/vector4.cpp
similarity index 100%
rename from src/core/vector4.cpp
rename to core/vector4.cpp
diff --git a/include/core/vector4.h b/core/vector4.h
similarity index 100%
rename from include/core/vector4.h
rename to core/vector4.h
diff --git a/src/core/vector4i.cpp b/core/vector4i.cpp
similarity index 100%
rename from src/core/vector4i.cpp
rename to core/vector4i.cpp
diff --git a/include/core/vector4i.h b/core/vector4i.h
similarity index 100%
rename from include/core/vector4i.h
rename to core/vector4i.h
diff --git a/include/core/wrapped.h b/core/wrapped.h
similarity index 100%
rename from include/core/wrapped.h
rename to core/wrapped.h
diff --git a/include/gen/.gitignore b/gen/.gitignore
similarity index 100%
rename from include/gen/.gitignore
rename to gen/.gitignore
diff --git a/src/gen/.gitignore b/src/gen/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/src/gen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore