diff --git a/assembler/Makefile b/assembler/Makefile
index ebe2965..af647b6 100644
--- a/assembler/Makefile
+++ b/assembler/Makefile
@@ -3,7 +3,7 @@ OUT = gassemble
 
 ### SOURCE FILES ###
 SRCDIR = src
-SRC_FILES = $(shell find $(SRCDIR) -name "*.c")
+SRC_FILES = $(wildcard $(SRCDIR)/*.c)
 OBJ_FILES = $(patsubst %.c,%.o,$(SRC_FILES))
 
 ### WARNINGS ###
diff --git a/assembler/src/conversion/analyzer.c b/assembler/src/analyzer.c
similarity index 100%
rename from assembler/src/conversion/analyzer.c
rename to assembler/src/analyzer.c
diff --git a/assembler/src/conversion/analyzer.h b/assembler/src/analyzer.h
similarity index 100%
rename from assembler/src/conversion/analyzer.h
rename to assembler/src/analyzer.h
diff --git a/assembler/src/conversion/identifiers.c b/assembler/src/identifiers.c
similarity index 100%
rename from assembler/src/conversion/identifiers.c
rename to assembler/src/identifiers.c
diff --git a/assembler/src/conversion/identifiers.h b/assembler/src/identifiers.h
similarity index 100%
rename from assembler/src/conversion/identifiers.h
rename to assembler/src/identifiers.h
diff --git a/assembler/src/conversion/instructions.c b/assembler/src/instructions.c
similarity index 100%
rename from assembler/src/conversion/instructions.c
rename to assembler/src/instructions.c
diff --git a/assembler/src/conversion/instructions.h b/assembler/src/instructions.h
similarity index 100%
rename from assembler/src/conversion/instructions.h
rename to assembler/src/instructions.h
diff --git a/assembler/src/conversion/lexer.c b/assembler/src/lexer.c
similarity index 100%
rename from assembler/src/conversion/lexer.c
rename to assembler/src/lexer.c
diff --git a/assembler/src/conversion/lexer.h b/assembler/src/lexer.h
similarity index 100%
rename from assembler/src/conversion/lexer.h
rename to assembler/src/lexer.h
diff --git a/assembler/src/conversion/tokens.c b/assembler/src/tokens.c
similarity index 100%
rename from assembler/src/conversion/tokens.c
rename to assembler/src/tokens.c
diff --git a/assembler/src/conversion/tokens.h b/assembler/src/tokens.h
similarity index 100%
rename from assembler/src/conversion/tokens.h
rename to assembler/src/tokens.h