diff --git a/src/a64instruction.h b/src/a64instruction/a64instruction.h
similarity index 100%
rename from src/a64instruction.h
rename to src/a64instruction/a64instruction.h
diff --git a/src/a64instruction_Branch.h b/src/a64instruction/a64instruction_Branch.h
similarity index 97%
rename from src/a64instruction_Branch.h
rename to src/a64instruction/a64instruction_Branch.h
index b732d6d..2e525bb 100644
--- a/src/a64instruction_Branch.h
+++ b/src/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/a64instruction/a64instruction_DP.h
similarity index 100%
rename from src/a64instruction_DP.h
rename to src/a64instruction/a64instruction_DP.h
diff --git a/src/a64instruction_DPImmediate.h b/src/a64instruction/a64instruction_DPImmediate.h
similarity index 100%
rename from src/a64instruction_DPImmediate.h
rename to src/a64instruction/a64instruction_DPImmediate.h
diff --git a/src/a64instruction_DPRegister.h b/src/a64instruction/a64instruction_DPRegister.h
similarity index 100%
rename from src/a64instruction_DPRegister.h
rename to src/a64instruction/a64instruction_DPRegister.h
diff --git a/src/a64instruction_Directive.h b/src/a64instruction/a64instruction_Directive.h
similarity index 71%
rename from src/a64instruction_Directive.h
rename to src/a64instruction/a64instruction_Directive.h
index da36624..5506b80 100644
--- a/src/a64instruction_Directive.h
+++ b/src/a64instruction/a64instruction_Directive.h
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "../global.h"
 
 typedef struct {
     word value;
diff --git a/src/a64instruction_Label.h b/src/a64instruction/a64instruction_Label.h
similarity index 100%
rename from src/a64instruction_Label.h
rename to src/a64instruction/a64instruction_Label.h
diff --git a/src/a64instruction_SingleTransfer.h b/src/a64instruction/a64instruction_SingleTransfer.h
similarity index 98%
rename from src/a64instruction_SingleTransfer.h
rename to src/a64instruction/a64instruction_SingleTransfer.h
index f661116..cbd7529 100644
--- a/src/a64instruction_SingleTransfer.h
+++ b/src/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/a64instruction/a64instruction_global.h
similarity index 100%
rename from src/a64instruction_global.h
rename to src/a64instruction/a64instruction_global.h
diff --git a/src/assemble.c b/src/assemble.c
index 4ed2733..856a097 100755
--- a/src/assemble.c
+++ b/src/assemble.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "parser.c"
-#include "fileio.c"
+#include "parser.h"
+#include "fileio.h"
 
 int main(int argc, char **argv) {
   return EXIT_SUCCESS;
diff --git a/src/decode.h b/src/decode.h
index 132130e..d509ae1 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 
 #define HALT_WORD 0x8a000000
 
diff --git a/src/emulate.c b/src/emulate.c
index be41f56..4c7f42e 100644
--- a/src/emulate.c
+++ b/src/emulate.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 #include "emulator.h"
 #include "fileio.h"
 #include "global.h"
diff --git a/src/execute.h b/src/execute.h
index fcf39ec..8b691e6 100644
--- a/src/execute.h
+++ b/src/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/parser.c b/src/parser.c
index fcef57b..807f591 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include "parser.h"
 
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 
 //takes input string, read from asm file and returns
 //input as an a64 instruction
diff --git a/src/twopassassembly.c b/src/twopassassembly.c
index be94e5c..7f13f95 100644
--- a/src/twopassassembly.c
+++ b/src/twopassassembly.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "a64instruction.h"
+#include "a64instruction/a64instruction.h"
 #include "symboltable.h"
 //generates assembled code based on two pass assembly method