diff --git a/src/Makefile b/src/Makefile
index dd827a8..3a1441a 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,7 +10,7 @@ CFLAGS  ?= -std=c17 -g\
 all: assemble emulate
 
 assemble: assemble.o
-emulate: emulate.o emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o
+emulate: emulate.o util/fileio.o emulator/execute.o emulator/decode.o emulator/print.o emulator/machine_util.o util/binary_util.o
 
 clean:
-	$(RM) *.o assemble emulate emulator/fileio.o emulator/execute.o emulator/decode.o emulator/print.o
+	$(RM) *.o assemble emulate emulator/execute.o emulator/decode.o 
diff --git a/src/shared/a64instruction/a64instruction.h b/src/a64instruction/a64instruction.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction.h
rename to src/a64instruction/a64instruction.h
diff --git a/src/shared/a64instruction/a64instruction_Branch.h b/src/a64instruction/a64instruction_Branch.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_Branch.h
rename to src/a64instruction/a64instruction_Branch.h
diff --git a/src/shared/a64instruction/a64instruction_DP.h b/src/a64instruction/a64instruction_DP.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_DP.h
rename to src/a64instruction/a64instruction_DP.h
diff --git a/src/shared/a64instruction/a64instruction_DPImmediate.h b/src/a64instruction/a64instruction_DPImmediate.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_DPImmediate.h
rename to src/a64instruction/a64instruction_DPImmediate.h
diff --git a/src/shared/a64instruction/a64instruction_DPRegister.h b/src/a64instruction/a64instruction_DPRegister.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_DPRegister.h
rename to src/a64instruction/a64instruction_DPRegister.h
diff --git a/src/shared/a64instruction/a64instruction_Directive.h b/src/a64instruction/a64instruction_Directive.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_Directive.h
rename to src/a64instruction/a64instruction_Directive.h
diff --git a/src/shared/a64instruction/a64instruction_Label.h b/src/a64instruction/a64instruction_Label.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_Label.h
rename to src/a64instruction/a64instruction_Label.h
diff --git a/src/shared/a64instruction/a64instruction_SingleTransfer.h b/src/a64instruction/a64instruction_SingleTransfer.h
similarity index 100%
rename from src/shared/a64instruction/a64instruction_SingleTransfer.h
rename to src/a64instruction/a64instruction_SingleTransfer.h
diff --git a/src/shared/a64instruction/a64instruction_global.h b/src/a64instruction/a64instruction_global.h
similarity index 92%
rename from src/shared/a64instruction/a64instruction_global.h
rename to src/a64instruction/a64instruction_global.h
index 629843d..b50ab67 100644
--- a/src/shared/a64instruction/a64instruction_global.h
+++ b/src/a64instruction/a64instruction_global.h
@@ -1,7 +1,7 @@
 #ifndef __A64INSTRUCTION_GLOBAL__
 #define __A64INSTRUCTION_GLOBAL__
 #include <stdint.h>
-#include "../../global.h"
+#include "../global.h"
 
 // Specifies the register being referred to
 typedef uint8_t a64inst_regSpecifier;
diff --git a/src/emulator/decode.c b/src/emulator/decode.c
index 78dcbac..39fde3b 100644
--- a/src/emulator/decode.c
+++ b/src/emulator/decode.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "decode.h"
-#include "../shared/binary_util.h"
+#include "../util/binary_util.h"
 
 // Macro that calls getBit() for a bitfield whose constants follow the format
 // FIELDNAME_LSB and FIELDNAME_MSB, storing the result in the variable wrd
diff --git a/src/emulator/decode.h b/src/emulator/decode.h
index d3d4330..668e06e 100644
--- a/src/emulator/decode.h
+++ b/src/emulator/decode.h
@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../shared/a64instruction/a64instruction.h"
+#include "../a64instruction/a64instruction.h"
 
 #define HALT_WORD 0x8a000000
 
diff --git a/src/shared/binary_util.c b/src/util/binary_util.c
similarity index 100%
rename from src/shared/binary_util.c
rename to src/util/binary_util.c
diff --git a/src/shared/binary_util.h b/src/util/binary_util.h
similarity index 87%
rename from src/shared/binary_util.h
rename to src/util/binary_util.h
index 8438ef9..2fc0439 100644
--- a/src/shared/binary_util.h
+++ b/src/util/binary_util.h
@@ -2,7 +2,7 @@
 #define __BINARY_UTIL__
 
 #include "../global.h"
-#include "a64instruction/a64instruction_global.h"
+#include "../a64instruction/a64instruction_global.h"
 
 word getBits(word wrd, uint8_t lsb, uint8_t msb);
 
diff --git a/src/emulator/fileio.c b/src/util/fileio.c
similarity index 100%
rename from src/emulator/fileio.c
rename to src/util/fileio.c
diff --git a/src/emulator/fileio.h b/src/util/fileio.h
similarity index 100%
rename from src/emulator/fileio.h
rename to src/util/fileio.h