diff --git a/src/emulate.c b/src/emulate.c
index ba6bbea..fc508a0 100755
--- a/src/emulate.c
+++ b/src/emulate.c
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "shared/a64instruction/a64instruction.h"
-#include "shared/a64instruction/a64instruction_global.h"
+#include "a64instruction/a64instruction.h"
+#include "a64instruction/a64instruction_global.h"
 #include "emulator/emulator.h"
-#include "emulator/fileio.h"
+#include "util/fileio.h"
 #include "global.h"
 #include "emulator/print.h"
 #include "emulator/decode.h"
diff --git a/src/emulator/execute.c b/src/emulator/execute.c
index abb6e0e..b1a6663 100644
--- a/src/emulator/execute.c
+++ b/src/emulator/execute.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include "execute.h"
 #include "print.h"
-#include "../shared/binary_util.h"
+#include "../util/binary_util.h"
 #include "machine_util.h"
 
 // Defines the maximum value that can be held in a register
diff --git a/src/emulator/execute.h b/src/emulator/execute.h
index be82de6..3acc17b 100644
--- a/src/emulator/execute.h
+++ b/src/emulator/execute.h
@@ -1,6 +1,6 @@
 #ifndef __EXECUTE__
 #define __EXECUTE__
-#include "../shared/a64instruction/a64instruction.h"
+#include "../a64instruction/a64instruction.h"
 #include "emulator.h"
 
 void execute(Machine *state, a64inst_instruction *inst);
diff --git a/src/emulator/machine_util.c b/src/emulator/machine_util.c
index 9db8525..3a27c89 100644
--- a/src/emulator/machine_util.c
+++ b/src/emulator/machine_util.c
@@ -1,10 +1,10 @@
 /** Machine Util */
 #include "assert.h"
 #include "machine_util.h"
-#include "../shared/a64instruction/a64instruction_global.h"
+#include "../a64instruction/a64instruction_global.h"
 #include "../global.h"
 #include "emulator.h"
-#include "../shared/binary_util.h"
+#include "../util/binary_util.h"
 
 // Returns the dword starting at address. The value is truncated if regType is a 64-bit register.
 dword readMemory(byte *memory, uint32_t address, a64inst_regType regType) {
diff --git a/src/emulator/machine_util.h b/src/emulator/machine_util.h
index 89733e6..14306dc 100644
--- a/src/emulator/machine_util.h
+++ b/src/emulator/machine_util.h
@@ -1,7 +1,7 @@
 #ifndef __MACHINE_UTIL__
 #define __MACHINE_UTIL__
 #include "../global.h"
-#include "../shared/a64instruction/a64instruction_global.h"
+#include "../a64instruction/a64instruction_global.h"
 #include "emulator.h"
 
 
diff --git a/src/emulator/print.c b/src/emulator/print.c
index 457aa7e..36c7632 100644
--- a/src/emulator/print.c
+++ b/src/emulator/print.c
@@ -2,7 +2,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include "print.h"
-#include "../shared/a64instruction/a64instruction_global.h"
+#include "../a64instruction/a64instruction_global.h"
 #include "emulator.h"
 #include "machine_util.h"