From 61043fc07eadf31fa5c9c0e59dbc3f84ad1700a5 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:02:39 +0100
Subject: Meta: Rework filesystem structure.

Signed-off-by: Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com>
---
 .gitignore                                        |  2 +-
 .vscode/c_cpp_properties.json                     |  4 +-
 .vscode/tasks.json                                |  2 +-
 Private/External/XIFF.h                           | 41 ---------------
 Private/Frontend/Compiler/.gitignore              | 20 ++++----
 Private/Frontend/Compiler/Apps/.gitkeep           |  0
 Private/Frontend/Compiler/Tests/.gitkeep          |  0
 Private/Frontend/Compiler/bin/.gitkeep            |  0
 Private/Frontend/Compiler/test/.gitkeep           |  0
 Private/Toolchain/.gitignore                      | 62 +++++++++++------------
 Private/Toolchain/Apps/.gitkeep                   |  0
 Private/Toolchain/Apps/Source/16bit_amd64.s       |  5 ++
 Private/Toolchain/Apps/Source/amd64_to_ae.s       |  8 +++
 Private/Toolchain/Apps/Source/hello_amd64.masm    | 19 +++++++
 Private/Toolchain/Apps/Source/hello_inc.64x       | 20 ++++++++
 Private/Toolchain/Apps/Source/hello_world.32x     |  3 ++
 Private/Toolchain/Apps/Source/hello_world.64x     |  7 +++
 Private/Toolchain/Apps/Source/hello_world.cc      |  6 +++
 Private/Toolchain/Apps/Source/hello_world.cxx     |  6 +++
 Private/Toolchain/Apps/Source/hello_world.s       |  9 ++++
 Private/Toolchain/Apps/Source/preprocessor.64x    | 10 ++++
 Private/Toolchain/Apps/Source/preprocessor.64x.pp |  8 +++
 Private/Toolchain/bin/.gitkeep                    |  0
 Private/Toolchain/bin/README.txt                  |  2 -
 Private/Toolchain/bin/Source/16bit_amd64.s        |  5 --
 Private/Toolchain/bin/Source/amd64_to_ae.s        |  8 ---
 Private/Toolchain/bin/Source/hello_amd64.masm     | 19 -------
 Private/Toolchain/bin/Source/hello_inc.64x        | 20 --------
 Private/Toolchain/bin/Source/hello_world.32x      |  3 --
 Private/Toolchain/bin/Source/hello_world.64x      |  7 ---
 Private/Toolchain/bin/Source/hello_world.cc       |  6 ---
 Private/Toolchain/bin/Source/hello_world.cxx      |  6 ---
 Private/Toolchain/bin/Source/hello_world.s        |  9 ----
 Private/Toolchain/bin/Source/preprocessor.64x     | 10 ----
 Private/Toolchain/bin/Source/preprocessor.64x.pp  |  8 ---
 Private/Toolchain/makefile                        | 26 +++++-----
 36 files changed, 159 insertions(+), 202 deletions(-)
 delete mode 100644 Private/External/XIFF.h
 create mode 100644 Private/Frontend/Compiler/Apps/.gitkeep
 create mode 100644 Private/Frontend/Compiler/Tests/.gitkeep
 delete mode 100644 Private/Frontend/Compiler/bin/.gitkeep
 delete mode 100644 Private/Frontend/Compiler/test/.gitkeep
 create mode 100644 Private/Toolchain/Apps/.gitkeep
 create mode 100644 Private/Toolchain/Apps/Source/16bit_amd64.s
 create mode 100644 Private/Toolchain/Apps/Source/amd64_to_ae.s
 create mode 100644 Private/Toolchain/Apps/Source/hello_amd64.masm
 create mode 100644 Private/Toolchain/Apps/Source/hello_inc.64x
 create mode 100644 Private/Toolchain/Apps/Source/hello_world.32x
 create mode 100644 Private/Toolchain/Apps/Source/hello_world.64x
 create mode 100644 Private/Toolchain/Apps/Source/hello_world.cc
 create mode 100644 Private/Toolchain/Apps/Source/hello_world.cxx
 create mode 100644 Private/Toolchain/Apps/Source/hello_world.s
 create mode 100644 Private/Toolchain/Apps/Source/preprocessor.64x
 create mode 100644 Private/Toolchain/Apps/Source/preprocessor.64x.pp
 delete mode 100644 Private/Toolchain/bin/.gitkeep
 delete mode 100644 Private/Toolchain/bin/README.txt
 delete mode 100644 Private/Toolchain/bin/Source/16bit_amd64.s
 delete mode 100644 Private/Toolchain/bin/Source/amd64_to_ae.s
 delete mode 100644 Private/Toolchain/bin/Source/hello_amd64.masm
 delete mode 100644 Private/Toolchain/bin/Source/hello_inc.64x
 delete mode 100644 Private/Toolchain/bin/Source/hello_world.32x
 delete mode 100644 Private/Toolchain/bin/Source/hello_world.64x
 delete mode 100644 Private/Toolchain/bin/Source/hello_world.cc
 delete mode 100644 Private/Toolchain/bin/Source/hello_world.cxx
 delete mode 100644 Private/Toolchain/bin/Source/hello_world.s
 delete mode 100644 Private/Toolchain/bin/Source/preprocessor.64x
 delete mode 100644 Private/Toolchain/bin/Source/preprocessor.64x.pp

diff --git a/.gitignore b/.gitignore
index a3a2d3b..255be04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,7 @@ replay_pid*
 
 *.cdfs
 
-Drivers/bin/Tests/*.masm
+Drivers/Apps/Tests/*.masm
 
 .vs
 
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 6dbde33..02ddeba 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -6,7 +6,7 @@
                 "${workspaceFolder}/Private/**"
             ],
             "defines": [],
-            "compilerPath": "/usr/bin/clang",
+            "compilerPath": "/usr/Apps/clang",
             "cStandard": "c17",
             "cppStandard": "c++20",
             "intelliSenseMode": "macos-clang-arm64"
@@ -17,7 +17,7 @@
                 "${workspaceFolder}/Private/**"
             ],
             "defines": [],
-            "compilerPath": "C:/cygwin64/bin/g++.exe",
+            "compilerPath": "C:/cygwin64/Apps/g++.exe",
             "cStandard": "c17",
             "cppStandard": "c++20",
             "intelliSenseMode": "windows-clang-x64"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 4ede37a..cb7a33f 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -3,7 +3,7 @@
         {
             "type": "cppbuild",
             "label": "C/C++: clang build active file",
-            "command": "/usr/bin/clang",
+            "command": "/usr/Apps/clang",
             "args": [
                 "-fcolor-diagnostics",
                 "-fansi-escape-codes",
diff --git a/Private/External/XIFF.h b/Private/External/XIFF.h
deleted file mode 100644
index 59fe388..0000000
--- a/Private/External/XIFF.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/** ===========================================
- (C) Mahrouss Logic
-    ===========================================*/
-
-#pragma once
-
-/** ---------------------------------------------------
-
-    * THIS FILE CONTAINS CODE FOR THE eXtended Information File Format.
-    * XIFF is used to make setup programs/audio/video files.
-
-------------------------------------------------------- */
-
-/***
- * @brief Generic XIFF header
- * Used by XIFF based containers.
- */
-
-struct __attribute__((packed)) XiffHeader {
-  unsigned char mag[4];      // XIFF string (includes \0)
-  unsigned int size;         // overall size of header (XiffHeader) in bytes
-  unsigned int format_type;  // format type. generic
-  unsigned char specific_mag[4];      // The sub header magic
-  unsigned int specific_size;         // length of the format data
-  unsigned int specific_format_type;  // format type. generic
-};
-
-/* video file */
-#define kXIFFVideo "XVFF"
-
-/* audio file */
-#define kXIFFAudio "XAFF"
-
-/* install buddy program. */
-#define kXIFFInstaller "XnFF"
-
-/* generic container */
-#define kXIFFGeneric "XIFF"
-
-/* binary with metadata. */
-#define kXIFFFlatBinary "XEFF"
diff --git a/Private/Frontend/Compiler/.gitignore b/Private/Frontend/Compiler/.gitignore
index a2e1573..ba4320e 100644
--- a/Private/Frontend/Compiler/.gitignore
+++ b/Private/Frontend/Compiler/.gitignore
@@ -1,13 +1,13 @@
-bin/elf2pef
-bin/ld
-bin/cpp
-bin/cc
-bin/masm
-bin/mkcdfs
-bin/ccplus
-bin/cppfront
-bin/cc
-bin/bpp
+Apps/elf2pef
+Apps/ld
+Apps/cpp
+Apps/cc
+Apps/masm
+Apps/mkcdfs
+Apps/ccplus
+Apps/cppfront
+Apps/cc
+Apps/bpp
 test/*.cc
 test/*.64x
 *.c.pp
diff --git a/Private/Frontend/Compiler/Apps/.gitkeep b/Private/Frontend/Compiler/Apps/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Private/Frontend/Compiler/Tests/.gitkeep b/Private/Frontend/Compiler/Tests/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Private/Frontend/Compiler/bin/.gitkeep b/Private/Frontend/Compiler/bin/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Private/Frontend/Compiler/test/.gitkeep b/Private/Frontend/Compiler/test/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Private/Toolchain/.gitignore b/Private/Toolchain/.gitignore
index 1ea0357..7bb537d 100644
--- a/Private/Toolchain/.gitignore
+++ b/Private/Toolchain/.gitignore
@@ -1,35 +1,35 @@
-bin/ld
-bin/mld
-bin/cpp
-bin/bpp
-bin/cc
-bin/masm
-bin/64ld
-bin/32ld
-bin/64asm
-bin/mkcdfs
-bin/ccplus
-bin/link
-bin/x86_64-ccplus
-bin/x86_64-pef-ccplus
-bin/cppfront
-bin/cc
-bin/i64asm
+Apps/ld
+Apps/mld
+Apps/cpp
+Apps/bpp
+Apps/cc
+Apps/masm
+Apps/64ld
+Apps/32ld
+Apps/64asm
+Apps/mkcdfs
+Apps/ccplus
+Apps/link
+Apps/x86_64-ccplus
+Apps/x86_64-pef-ccplus
+Apps/cppfront
+Apps/cc
+Apps/i64asm
 
-bin/Assembly.*
+Apps/Assembly.*
 
-bin/SourceUnitTest/*.c.pp
-bin/SourceUnitTest/*.c
-bin/SourceUnitTest/*.cc
-bin/SourceUnitTest/*.cc.pp
-bin/SourceUnitTest/*.cc.pp
-bin/SourceUnitTest/*.cc
-bin/SourceUnitTest/*.cpp.pp
-bin/SourceUnitTest/*.cpp
-bin/SourceUnitTest/*.cxx.pp
-bin/SourceUnitTest/*.cxx
-bin/SourceUnitTest/*.masm
-bin/SourceUnitTest/*.h
-bin/SourceUnitTest/*.64x
+Apps/SourceUnitTest/*.c.pp
+Apps/SourceUnitTest/*.c
+Apps/SourceUnitTest/*.cc
+Apps/SourceUnitTest/*.cc.pp
+Apps/SourceUnitTest/*.cc.pp
+Apps/SourceUnitTest/*.cc
+Apps/SourceUnitTest/*.cpp.pp
+Apps/SourceUnitTest/*.cpp
+Apps/SourceUnitTest/*.cxx.pp
+Apps/SourceUnitTest/*.cxx
+Apps/SourceUnitTest/*.masm
+Apps/SourceUnitTest/*.h
+Apps/SourceUnitTest/*.64x
 
 *.cxx.pp
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/.gitkeep b/Private/Toolchain/Apps/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Private/Toolchain/Apps/Source/16bit_amd64.s b/Private/Toolchain/Apps/Source/16bit_amd64.s
new file mode 100644
index 0000000..a22248b
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/16bit_amd64.s
@@ -0,0 +1,5 @@
+#bits 16
+
+export .text BIOSStartup
+
+mov cx, ax
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/amd64_to_ae.s b/Private/Toolchain/Apps/Source/amd64_to_ae.s
new file mode 100644
index 0000000..6b5de94
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/amd64_to_ae.s
@@ -0,0 +1,8 @@
+#bits 16
+#org 0x7c00
+
+export .text BIOSStartup
+    mov ax, cx
+    cli
+    hlt
+    jmp 0x7c00
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/hello_amd64.masm b/Private/Toolchain/Apps/Source/hello_amd64.masm
new file mode 100644
index 0000000..0178ad4
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_amd64.masm
@@ -0,0 +1,19 @@
+!org 0x1000
+!bits 64
+
+export .text MySampleFoo
+cli
+mov rsp, rsp 
+int 0x80
+jmp 0x100000
+sti
+retf
+
+export .text __start
+cli
+mov rax, rdx
+int 0x80
+jmp 0x100000
+sti
+retf
+
diff --git a/Private/Toolchain/Apps/Source/hello_inc.64x b/Private/Toolchain/Apps/Source/hello_inc.64x
new file mode 100644
index 0000000..edd9b58
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_inc.64x
@@ -0,0 +1,20 @@
+;; org: 0
+
+export .text dec_until_zero_return
+    pla
+    jlr
+
+export .text dec_until_zero
+    pha
+    ldw r2, 10
+    ldw r1, 1
+    lda r3, dec_until_zero_return
+export .text dec_until_zero_loop
+    dec r2, r1
+    beq r2, r0, r3
+    jrl dec_until_zero_loop
+    jlr 
+
+export .text __start
+    jrl dec_until_zero
+    jlr
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/hello_world.32x b/Private/Toolchain/Apps/Source/hello_world.32x
new file mode 100644
index 0000000..e8c7d31
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_world.32x
@@ -0,0 +1,3 @@
+foo:
+    nop
+    jmp $
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/hello_world.64x b/Private/Toolchain/Apps/Source/hello_world.64x
new file mode 100644
index 0000000..c218bee
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_world.64x
@@ -0,0 +1,7 @@
+# Path: Source/hello_world.cxx
+# Language: RISC 64x0 MultiProcessor Assembly (Generated from C++)
+# Build Date: 2024-1-27
+
+export .text _CppZ_MPUX_int@main
+mv r1, r2
+jlr
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/hello_world.cc b/Private/Toolchain/Apps/Source/hello_world.cc
new file mode 100644
index 0000000..8a179b4
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_world.cc
@@ -0,0 +1,6 @@
+/// this should throw an error.
+
+MyClass& MyClass::foo()
+{
+    return cls;
+}
diff --git a/Private/Toolchain/Apps/Source/hello_world.cxx b/Private/Toolchain/Apps/Source/hello_world.cxx
new file mode 100644
index 0000000..829dfc8
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_world.cxx
@@ -0,0 +1,6 @@
+int main(int argc, const char** argv) 
+{
+    int x = 50;
+
+    return 0;
+}
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/hello_world.s b/Private/Toolchain/Apps/Source/hello_world.s
new file mode 100644
index 0000000..1833695
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/hello_world.s
@@ -0,0 +1,9 @@
+# Path: Source/hello_world.cc
+# Language: MultiProcessor Assembly. (Generated from C++)
+# Build Date: 2024-3-21
+
+%bits 64 
+
+export .text _CZZ_MAHR_MANGLEMyClass&@MyClass::foo
+mov rax, rcx
+ret
\ No newline at end of file
diff --git a/Private/Toolchain/Apps/Source/preprocessor.64x b/Private/Toolchain/Apps/Source/preprocessor.64x
new file mode 100644
index 0000000..2f7a404
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/preprocessor.64x
@@ -0,0 +1,10 @@
+%def ra r19
+%warning stuff
+
+export .text foo
+  pha
+  lda r2, 0x1000
+  mv ra, r2
+  jrl
+  pla
+  jlr
diff --git a/Private/Toolchain/Apps/Source/preprocessor.64x.pp b/Private/Toolchain/Apps/Source/preprocessor.64x.pp
new file mode 100644
index 0000000..face9bf
--- /dev/null
+++ b/Private/Toolchain/Apps/Source/preprocessor.64x.pp
@@ -0,0 +1,8 @@
+
+export .text foo
+  pha
+  lda r2, 0x1000
+  mv r19, r2
+  jrl
+  pla
+  jlr
diff --git a/Private/Toolchain/bin/.gitkeep b/Private/Toolchain/bin/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/Private/Toolchain/bin/README.txt b/Private/Toolchain/bin/README.txt
deleted file mode 100644
index 3b12775..0000000
--- a/Private/Toolchain/bin/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The C compilers (ccplus, cc) are work in progress.
-    - Amlal
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/16bit_amd64.s b/Private/Toolchain/bin/Source/16bit_amd64.s
deleted file mode 100644
index a22248b..0000000
--- a/Private/Toolchain/bin/Source/16bit_amd64.s
+++ /dev/null
@@ -1,5 +0,0 @@
-#bits 16
-
-export .text BIOSStartup
-
-mov cx, ax
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/amd64_to_ae.s b/Private/Toolchain/bin/Source/amd64_to_ae.s
deleted file mode 100644
index 6b5de94..0000000
--- a/Private/Toolchain/bin/Source/amd64_to_ae.s
+++ /dev/null
@@ -1,8 +0,0 @@
-#bits 16
-#org 0x7c00
-
-export .text BIOSStartup
-    mov ax, cx
-    cli
-    hlt
-    jmp 0x7c00
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/hello_amd64.masm b/Private/Toolchain/bin/Source/hello_amd64.masm
deleted file mode 100644
index 0178ad4..0000000
--- a/Private/Toolchain/bin/Source/hello_amd64.masm
+++ /dev/null
@@ -1,19 +0,0 @@
-!org 0x1000
-!bits 64
-
-export .text MySampleFoo
-cli
-mov rsp, rsp 
-int 0x80
-jmp 0x100000
-sti
-retf
-
-export .text __start
-cli
-mov rax, rdx
-int 0x80
-jmp 0x100000
-sti
-retf
-
diff --git a/Private/Toolchain/bin/Source/hello_inc.64x b/Private/Toolchain/bin/Source/hello_inc.64x
deleted file mode 100644
index edd9b58..0000000
--- a/Private/Toolchain/bin/Source/hello_inc.64x
+++ /dev/null
@@ -1,20 +0,0 @@
-;; org: 0
-
-export .text dec_until_zero_return
-    pla
-    jlr
-
-export .text dec_until_zero
-    pha
-    ldw r2, 10
-    ldw r1, 1
-    lda r3, dec_until_zero_return
-export .text dec_until_zero_loop
-    dec r2, r1
-    beq r2, r0, r3
-    jrl dec_until_zero_loop
-    jlr 
-
-export .text __start
-    jrl dec_until_zero
-    jlr
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/hello_world.32x b/Private/Toolchain/bin/Source/hello_world.32x
deleted file mode 100644
index e8c7d31..0000000
--- a/Private/Toolchain/bin/Source/hello_world.32x
+++ /dev/null
@@ -1,3 +0,0 @@
-foo:
-    nop
-    jmp $
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/hello_world.64x b/Private/Toolchain/bin/Source/hello_world.64x
deleted file mode 100644
index c218bee..0000000
--- a/Private/Toolchain/bin/Source/hello_world.64x
+++ /dev/null
@@ -1,7 +0,0 @@
-# Path: Source/hello_world.cxx
-# Language: RISC 64x0 MultiProcessor Assembly (Generated from C++)
-# Build Date: 2024-1-27
-
-export .text _CppZ_MPUX_int@main
-mv r1, r2
-jlr
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/hello_world.cc b/Private/Toolchain/bin/Source/hello_world.cc
deleted file mode 100644
index 8a179b4..0000000
--- a/Private/Toolchain/bin/Source/hello_world.cc
+++ /dev/null
@@ -1,6 +0,0 @@
-/// this should throw an error.
-
-MyClass& MyClass::foo()
-{
-    return cls;
-}
diff --git a/Private/Toolchain/bin/Source/hello_world.cxx b/Private/Toolchain/bin/Source/hello_world.cxx
deleted file mode 100644
index 829dfc8..0000000
--- a/Private/Toolchain/bin/Source/hello_world.cxx
+++ /dev/null
@@ -1,6 +0,0 @@
-int main(int argc, const char** argv) 
-{
-    int x = 50;
-
-    return 0;
-}
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/hello_world.s b/Private/Toolchain/bin/Source/hello_world.s
deleted file mode 100644
index 1833695..0000000
--- a/Private/Toolchain/bin/Source/hello_world.s
+++ /dev/null
@@ -1,9 +0,0 @@
-# Path: Source/hello_world.cc
-# Language: MultiProcessor Assembly. (Generated from C++)
-# Build Date: 2024-3-21
-
-%bits 64 
-
-export .text _CZZ_MAHR_MANGLEMyClass&@MyClass::foo
-mov rax, rcx
-ret
\ No newline at end of file
diff --git a/Private/Toolchain/bin/Source/preprocessor.64x b/Private/Toolchain/bin/Source/preprocessor.64x
deleted file mode 100644
index 2f7a404..0000000
--- a/Private/Toolchain/bin/Source/preprocessor.64x
+++ /dev/null
@@ -1,10 +0,0 @@
-%def ra r19
-%warning stuff
-
-export .text foo
-  pha
-  lda r2, 0x1000
-  mv ra, r2
-  jrl
-  pla
-  jlr
diff --git a/Private/Toolchain/bin/Source/preprocessor.64x.pp b/Private/Toolchain/bin/Source/preprocessor.64x.pp
deleted file mode 100644
index face9bf..0000000
--- a/Private/Toolchain/bin/Source/preprocessor.64x.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-
-export .text foo
-  pha
-  lda r2, 0x1000
-  mv r19, r2
-  jrl
-  pla
-  jlr
diff --git a/Private/Toolchain/makefile b/Private/Toolchain/makefile
index e48e496..3733365 100644
--- a/Private/Toolchain/makefile
+++ b/Private/Toolchain/makefile
@@ -16,28 +16,28 @@ LINK_CC=x86_64-w64-mingw32-g++ -std=c++20
 endif
 
 LINK_SRC=link.cc
-LINK_OUTPUT=bin/link.exe
-LINK_ALT_OUTPUT=bin/64link.exe
-LINK_ALT_3_OUTPUT=bin/i64link.exe
-LINK_ALT_2_OUTPUT=bin/32link.exe
+LINK_OUTPUT=Apps/link.exe
+LINK_ALT_OUTPUT=Apps/64link.exe
+LINK_ALT_3_OUTPUT=Apps/i64link.exe
+LINK_ALT_2_OUTPUT=Apps/32link.exe
 
 PP_SRC=bpp.cc
-PP_OUTPUT=bin/bpp.exe
+PP_OUTPUT=Apps/bpp.exe
 
 # C Compiler
 CC_SRC=cc.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc
-CC_OUTPUT=bin/cc.exe
+CC_OUTPUT=Apps/cc.exe
 
 # C++ Compiler
 CXX_SRC=ccplus.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc
-CXX_OUTPUT=bin/ccplus.exe
+CXX_OUTPUT=Apps/ccplus.exe
 
 # Assembler
 ASM_SRC=64asm.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc
-ASM_OUTPUT=bin/64asm.exe
+ASM_OUTPUT=Apps/64asm.exe
 
 IASM_SRC=i64asm.cc ../CompilerKit/StdKit/*.cc ../CompilerKit/AsmKit/*.cc
-IASM_OUTPUT=bin/i64asm.exe
+IASM_OUTPUT=Apps/i64asm.exe
 
 .PHONY: all
 all:
@@ -69,9 +69,9 @@ help:
 
 .PHONY: clean
 clean:
-	rm bin/$(MKCDFS_OUTPUT)
-	rm bin/$(CC_OUTPUT)
-	rm bin/$(PP_OUTPUT)
-	rm bin/$(LINK_OUTPUT)
+	rm Apps/$(MKCDFS_OUTPUT)
+	rm Apps/$(CC_OUTPUT)
+	rm Apps/$(PP_OUTPUT)
+	rm Apps/$(LINK_OUTPUT)
 
 # Last rev 8-1-24
-- 
cgit v1.2.3