diff --git a/Makefile b/Makefile
index a58784f..dcf9fd6 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,21 @@ JAVADOC_OPTIONS=-Xdoclint:all -private -encoding UTF-8 -charset UTF-8 -docencodi
 BUILDS=builds
 DOC=doc
 CLASSPATH=src
-LIBARIES=\
+LIBRARIES=\
 lib/jansi-1.16.jar
 CLASSES=\
-src\game\Main.java \
-src\game\Game.java \
-src\game\GameHistory.java \
-src\game\GameEntry.java \
-src\game\PlayerObject.java \
-src\player\Player.java \
-src\player\Human.java \
-src\player\malte\MalteAI.java \
-src\player\malte\Pattern.java \
-src\player\malte\PatternGenerator.java \
-src\player\malte\Item.java \
-src\player\maurizio\MaurizioAI.java
+src/game/Main.java \
+src/game/Game.java \
+src/game/GameHistory.java \
+src/game/GameEntry.java \
+src/game/PlayerObject.java \
+src/player/Player.java \
+src/player/Human.java \
+src/player/malte/MalteAI.java \
+src/player/malte/Pattern.java \
+src/player/malte/PatternGenerator.java \
+src/player/malte/Item.java \
+src/player/maurizio/MaurizioAI.java
 
 OBJECTS=$($(subst $(CLASSPATH),$(BUILDS),$(CLASSES)):.java=.class)
 
@@ -37,13 +37,13 @@ P2=
 
 
 all: $(CLASSES) $(FXMLS_BUILD)
-	$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH) $(CLASSES) -d $(BUILDS)
+	$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBRARIES) $(CLASSES) -d $(BUILDS)
 
 run: $(CLASSES)
-	$(JAVA) -cp $(BUILDS) $(MAIN) $(P1) $(P2)
+	$(JAVA) -cp $(BUILDS):$(LIBRARIES) $(MAIN) $(P1) $(P2)
 
 simulate: $(CLASSES)
-	$(JAVA) -cp $(BUILDS) $(MAIN) $(N)
+	$(JAVA) -cp $(BUILDS):$(LIBRARIES) $(MAIN) $(N)
 
 doc: $(CLASSES)
 	$(JAVADOC) $(JAVADOC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(DOC)