Reorganized ✅

.gitignore

@@ -25,3 +25,5 @@ vs_Community.exe
 !.vscode/extensions.json
 art/build_html.bat
 art/build_html-debug.bat
+
+scsource/scfunkin/backend/gamejolt/GJKeys.hx

Project.xml

@@ -49,7 +49,7 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
 	<set name="BUILD_DIR" value="export/debug-telemetry" if="debug telemetry" />
 	<set name="NO_PRECOMPILED_HEADERS" value="1"/>
 
-	<source path="funkinscsource" />
+	<source path="scsource" />
 
 	<!-- PSYCH && SCE CUSTOMIZATION -->
 
@@ -270,6 +270,8 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
 	<haxelib name="FlxPartialSound"/>
 	<haxelib name="flxsoundfilters" />
 
+	<define name="FunkinModcharting" />
+
 	<!--<define name="FunkinModcharting" /> --> <!--Not used because SCE adapter is not public-->
 	<section if="FunkinModcharting">
 		<haxedef name="FM_ENGINE" value="SCE"/>
@@ -292,18 +294,12 @@ xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/
 		Ensure additional class packages are available at runtime (some only really used by scripts).
 		Ignore packages we can't include.
 	-->
-	<haxeflag name="--macro" value="include('flixel', true, [ 'flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*' ])" />
-	<haxeflag name="--macro" value="modchart.core.macros.Macro.includeFiles()" if="FunkinModchart"/>
 
 	<section if="COMPILE_ALL_CLASSES">
 		<haxeflag name="-dce" value="no" />
-		<haxeflag name="--macro" value="codenameengine.macros.Macros.addAdditionalClasses()" />
+		<haxeflag name="--macro" value="scfunkin.backend.macros.Macros.inclusiveMacro()" />
 	</section>
 
-	<!--Macro fixes-->
-	<haxeflag name="--macro" value="allowPackage('flash')" />
-	<haxeflag name="--macro" value="include('my.pack')" />
-
 	<!-- Haxe 4.3.0+: Enable pretty syntax errors and stuff. -->
 	<!-- pretty (haxeflixel default), indent, classic (haxe compiler default) -->
 	<haxedef name="message.reporting" value="pretty" />

docs/files/TODO.md

@@ -1,5 +1,5 @@
 # TODO:
-- [ ] Reorganize source code.
+- [x] Reorganize source code.
 - - [ ] Remove unnecessary lines to each file.
 
 - [ ] Update all documentation. (New file changes for everything).

docs/files/TemplateScript.hx

@@ -1,4 +1,4 @@
-package docs;
+package docs.files;
 
 // HScript stuff