diff --git a/Start_Linux/makefile b/Start_Linux/makefile
index 096695a..a8d8f59 100644
--- a/Start_Linux/makefile
+++ b/Start_Linux/makefile
@@ -1,9 +1,9 @@
 CC = gcc
-CFLAGS = -g -Wall -I$(raylibfolder)
+CFLAGS = -g -Wall
 LDFLAGS = -lGL -lX11 -lm
 BINARIES = ./linux
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -28,7 +28,7 @@ game.o: game.c
 	$(CC) $(CFLAGS) -c game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) $(CFLAGS) -c graphicalGame.c
+	$(CC) $(CFLAGS) -I$(raylibfolder) -c graphicalGame.c
 
 # --------------------------
 # Unit Tests
diff --git a/Start_Mac/macos-x64/libraylib.a b/Start_Mac/macos-x86_64/libraylib.a
similarity index 100%
rename from Start_Mac/macos-x64/libraylib.a
rename to Start_Mac/macos-x86_64/libraylib.a
diff --git a/Start_Mac/macos-x64/libunity.a b/Start_Mac/macos-x86_64/libunity.a
similarity index 100%
rename from Start_Mac/macos-x64/libunity.a
rename to Start_Mac/macos-x86_64/libunity.a
diff --git a/Start_Mac/macos-x64/libwordsalad.a b/Start_Mac/macos-x86_64/libwordsalad.a
similarity index 100%
rename from Start_Mac/macos-x64/libwordsalad.a
rename to Start_Mac/macos-x86_64/libwordsalad.a
diff --git a/Start_Mac/macos-x64/libwordsalad_complete.a b/Start_Mac/macos-x86_64/libwordsalad_complete.a
similarity index 100%
rename from Start_Mac/macos-x64/libwordsalad_complete.a
rename to Start_Mac/macos-x86_64/libwordsalad_complete.a
diff --git a/Start_Mac/makefile b/Start_Mac/makefile
index 49654ae..1d3b4a6 100644
--- a/Start_Mac/makefile
+++ b/Start_Mac/makefile
@@ -4,7 +4,7 @@ LDFLAGS = -framework OpenGL -framework CoreFoundation -framework CoreGraphics -f
 ARCH := $(shell uname -m)
 BINARIES = ./macos-$(ARCH)
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -43,4 +43,4 @@ test: input.o game.o unit_tests.c $(BINARIES)/libunity.a
 # Clean
 # --------------------------
 clean:
-	rm -f *.o wordsalad
+	rm -f *.o wordsalad $(TEST_BIN)
diff --git a/Start_Windows/makefile b/Start_Windows/makefile
index 146a8c6..72cccb7 100644
--- a/Start_Windows/makefile
+++ b/Start_Windows/makefile
@@ -1,9 +1,9 @@
 CC = gcc
-CFLAGS = -g -Wall -I$(raylibfolder)
+CFLAGS = -g -Wall
 LDFLAGS = -lopengl32 -lgdi32 -lwinmm
 BINARIES = ./windows
 
-raylib_folder = ./raylib
+raylibfolder = ./raylib
 unityfolder = ./unity
 
 # --------------------------
@@ -12,7 +12,6 @@ unityfolder = ./unity
 wordsalad_initial:
 	$(CC) -o wordsalad_initial $(BINARIES)/libwordsalad_complete.a $(BINARIES)/libraylib.a $(LDFLAGS)
 
-
 # --------------------------
 # Normales Spiel bauen
 # --------------------------
@@ -23,13 +22,13 @@ main.o: main.c
 	$(CC) -c $(CFLAGS) main.c
 
 input.o: input.c
-	$(CC) -c $(CFLAGS)input.c
+	$(CC) -c $(CFLAGS) input.c
 
 game.o: game.c
 	$(CC) -c $(CFLAGS) game.c
 
 graphicalGame.o: graphicalGame.c
-	$(CC) -I$(raylib_folder) -c $(CFLAGS) graphicalGame.c
+	$(CC) -I$(raylibfolder) -c $(CFLAGS) graphicalGame.c
 
 # --------------------------
 # Unit Tests