diff --git a/src/Makefile b/src/Makefile
index 7106e44..dd827a8 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,8 +10,7 @@ CFLAGS  ?= -std=c17 -g\
 all: assemble emulate
 
 assemble: assemble.o
-emulate: emulate.o
+emulate: emulate.o emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o
 
 clean:
-	$(RM) *.o assemble emulate
-	
+	$(RM) *.o assemble emulate emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o
diff --git a/src/emulate.c b/src/emulate.c
index 82245e9..83c58d7 100755
--- a/src/emulate.c
+++ b/src/emulate.c
@@ -1,12 +1,12 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "a64instruction.h"
-#include "emulator.h"
-#include "fileio.h"
+#include "emulator/a64instruction/a64instruction.h"
+#include "emulator/emulator.h"
+#include "emulator/fileio.h"
 #include "global.h"
-#include "print.h"
-#include "decode.h"
-#include "execute.h"
+#include "emulator/print.h"
+#include "emulator/decode.h"
+#include "emulator/execute.h"
 
 extern a64inst_instruction *decode(word w);
 
diff --git a/src/a64instruction.h b/src/emulator/a64instruction/a64instruction.h
similarity index 100%
rename from src/a64instruction.h
rename to src/emulator/a64instruction/a64instruction.h
diff --git a/src/a64instruction_Branch.h b/src/emulator/a64instruction/a64instruction_Branch.h
similarity index 97%
rename from src/a64instruction_Branch.h
rename to src/emulator/a64instruction/a64instruction_Branch.h
index b732d6d..7cfc7e8 100644
--- a/src/a64instruction_Branch.h
+++ b/src/emulator/a64instruction/a64instruction_Branch.h
@@ -1,6 +1,6 @@
 #include <stdbool.h>
 #include "a64instruction_global.h"
-#include "global.h"
+#include "../../global.h"
 
 typedef enum {
     a64inst_UNCONDITIONAL = 0,
diff --git a/src/a64instruction_DP.h b/src/emulator/a64instruction/a64instruction_DP.h
similarity index 100%
rename from src/a64instruction_DP.h
rename to src/emulator/a64instruction/a64instruction_DP.h
diff --git a/src/a64instruction_DPImmediate.h b/src/emulator/a64instruction/a64instruction_DPImmediate.h
similarity index 100%
rename from src/a64instruction_DPImmediate.h
rename to src/emulator/a64instruction/a64instruction_DPImmediate.h
diff --git a/src/a64instruction_DPRegister.h b/src/emulator/a64instruction/a64instruction_DPRegister.h
similarity index 100%
rename from src/a64instruction_DPRegister.h
rename to src/emulator/a64instruction/a64instruction_DPRegister.h
diff --git a/src/a64instruction_Directive.h b/src/emulator/a64instruction/a64instruction_Directive.h
similarity index 69%
rename from src/a64instruction_Directive.h
rename to src/emulator/a64instruction/a64instruction_Directive.h
index 5c70dd4..88a6536 100644
--- a/src/a64instruction_Directive.h
+++ b/src/emulator/a64instruction/a64instruction_Directive.h
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "../../global.h"
 
 typedef struct {
     dword value;
diff --git a/src/a64instruction_Label.h b/src/emulator/a64instruction/a64instruction_Label.h
similarity index 100%
rename from src/a64instruction_Label.h
rename to src/emulator/a64instruction/a64instruction_Label.h
diff --git a/src/a64instruction_SingleTransfer.h b/src/emulator/a64instruction/a64instruction_SingleTransfer.h
similarity index 97%
rename from src/a64instruction_SingleTransfer.h
rename to src/emulator/a64instruction/a64instruction_SingleTransfer.h
index f661116..1b6e2b7 100644
--- a/src/a64instruction_SingleTransfer.h
+++ b/src/emulator/a64instruction/a64instruction_SingleTransfer.h
@@ -1,6 +1,6 @@
 #include <stdbool.h>
 #include "a64instruction_global.h"
-#include "global.h"
+#include "../../global.h"
 
 typedef enum {
     a64inst_SINGLE_TRANSFER_SINGLE_DATA_TRANSFER = 1,
diff --git a/src/a64instruction_global.h b/src/emulator/a64instruction/a64instruction_global.h
similarity index 100%
rename from src/a64instruction_global.h
rename to src/emulator/a64instruction/a64instruction_global.h
diff --git a/src/decode.c b/src/emulator/decode.c
similarity index 100%
rename from src/decode.c
rename to src/emulator/decode.c
diff --git a/src/decode.h b/src/emulator/decode.h
similarity index 97%
rename from src/decode.h
rename to src/emulator/decode.h
index 132130e..5af7046 100644
--- a/src/decode.h
+++ b/src/emulator/decode.h
@@ -1,5 +1,5 @@
-#include "global.h"
-#include "a64instruction.h"
+#include "../global.h"
+#include "a64instruction/a64instruction.h"
 
 #define HALT_WORD 0x8a000000
 
diff --git a/src/emulator.h b/src/emulator/emulator.h
similarity index 96%
rename from src/emulator.h
rename to src/emulator/emulator.h
index facbfd7..3a1e67d 100644
--- a/src/emulator.h
+++ b/src/emulator/emulator.h
@@ -1,6 +1,6 @@
 #ifndef __EMULATOR__
 #define __EMULATOR__
-#include "global.h"
+#include "../global.h"
 #include <stdbool.h>
 
 /************************************
diff --git a/src/execute.c b/src/emulator/execute.c
similarity index 100%
rename from src/execute.c
rename to src/emulator/execute.c
diff --git a/src/execute.h b/src/emulator/execute.h
similarity index 74%
rename from src/execute.h
rename to src/emulator/execute.h
index fcf39ec..8b691e6 100644
--- a/src/execute.h
+++ b/src/emulator/execute.h
@@ -1,6 +1,6 @@
 #ifndef __EXECUTE__
 #define __EXECUTE__
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 #include "emulator.h"
 
 void execute(Machine *state, a64inst_instruction *inst);
diff --git a/src/fileio.c b/src/emulator/fileio.c
similarity index 98%
rename from src/fileio.c
rename to src/emulator/fileio.c
index 1dcdd77..41df962 100644
--- a/src/fileio.c
+++ b/src/emulator/fileio.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "fileio.h"
-#include "global.h"
+#include "../global.h"
 
 /* Loads a binary file located at filePath to memory, taking up a block of exactly memorySize bytes,
    and returns the starting address of the data. If memorySize is insufficient to store the entire file,
diff --git a/src/fileio.h b/src/emulator/fileio.h
similarity index 87%
rename from src/fileio.h
rename to src/emulator/fileio.h
index a2d4262..47aa858 100644
--- a/src/fileio.h
+++ b/src/emulator/fileio.h
@@ -1,7 +1,7 @@
 #ifndef __FILEIO__
 #define __FILEIO__
 #include <stdlib.h>
-#include "global.h"
+#include "../global.h"
 
 #define EXIT_FAILURE 1
 
diff --git a/src/print.c b/src/emulator/print.c
similarity index 99%
rename from src/print.c
rename to src/emulator/print.c
index 88ed6f9..0ec5210 100644
--- a/src/print.c
+++ b/src/emulator/print.c
@@ -1,7 +1,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <string.h>
 #include "print.h"
 #include "emulator.h"
 
diff --git a/src/print.h b/src/emulator/print.h
similarity index 100%
rename from src/print.h
rename to src/emulator/print.h
diff --git a/test.sh b/test.sh
old mode 100644
new mode 100755