Change directory structure of files w/ S

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 

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;

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

src/emulator/decode.h

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../shared/a64instruction/a64instruction.h"
+#include "../a64instruction/a64instruction.h"
 
 #define HALT_WORD 0x8a000000
 

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);