diff --git a/LibGui/Makefile b/LibGui/Makefile
index 4b35168..2c0f011 100644
--- a/LibGui/Makefile
+++ b/LibGui/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-Wall -Werror -pedantic -fpic -g -std=c89
 
 
 LIBSDIR=-L/usr/lib -L../Libs
-INCLUDEDIR=-I/usr/include -I. -I../LibAutomaton
+INCLUDEDIR=-I/usr/include -I. -I../LibMatrix
 
 #Library variables
 LIBTARGET=libGui.so
@@ -11,8 +11,8 @@ LIBSOURCE=pixel
 LIBSOURCECFILE=$(LIBSOURCE:=.c)
 LIBSOURCEOFILE=$(LIBSOURCE:=.o)
 
-DEPENDENCELIST=libAutomaton.so
-DEPENDENCENAMELIST=Automaton
+DEPENDENCELIST=libMatrix.so
+DEPENDENCENAMELIST=Matrix
 
 EXTLIBS=`sdl2-config --cflags --libs`
 
diff --git a/LibGui/pixel.c b/LibGui/pixel.c
index 3320610..9ae1003 100644
--- a/LibGui/pixel.c
+++ b/LibGui/pixel.c
@@ -2,7 +2,7 @@
 * @Author: klmp200
 * @Date:   2016-12-27 19:59:21
 * @Last Modified by:   klmp200
-* @Last Modified time: 2016-12-27 20:09:56
+* @Last Modified time: 2016-12-28 18:48:54
 */
 
 #include <stdio.h>
diff --git a/LibAutomaton/CellElement.c b/LibMatrix/CellElement.c
similarity index 100%
rename from LibAutomaton/CellElement.c
rename to LibMatrix/CellElement.c
diff --git a/LibAutomaton/CellElement.h b/LibMatrix/CellElement.h
similarity index 100%
rename from LibAutomaton/CellElement.h
rename to LibMatrix/CellElement.h
diff --git a/LibAutomaton/Makefile b/LibMatrix/Makefile
similarity index 95%
rename from LibAutomaton/Makefile
rename to LibMatrix/Makefile
index 5f9c04e..165a286 100644
--- a/LibAutomaton/Makefile
+++ b/LibMatrix/Makefile
@@ -6,7 +6,7 @@ LIBSDIR=-L/usr/lib -L../Libs
 INCLUDEDIR=-I/usr/include -I.
 
 #Library variables
-LIBTARGET=libAutomaton.so
+LIBTARGET=libMatrix.so
 LIBSOURCE=list CellElement matrix
 LIBSOURCECFILE=$(LIBSOURCE:=.c)
 LIBSOURCEOFILE=$(LIBSOURCE:=.o)
diff --git a/LibAutomaton/list.c b/LibMatrix/list.c
similarity index 100%
rename from LibAutomaton/list.c
rename to LibMatrix/list.c
diff --git a/LibAutomaton/list.h b/LibMatrix/list.h
similarity index 100%
rename from LibAutomaton/list.h
rename to LibMatrix/list.h
diff --git a/LibAutomaton/matrix.c b/LibMatrix/matrix.c
similarity index 100%
rename from LibAutomaton/matrix.c
rename to LibMatrix/matrix.c
diff --git a/LibAutomaton/matrix.h b/LibMatrix/matrix.h
similarity index 100%
rename from LibAutomaton/matrix.h
rename to LibMatrix/matrix.h
diff --git a/Makefile b/Makefile
index 69be545..8f92b9a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,37 +8,33 @@ CFLAGS=-Wall -Werror -pedantic -fpic -g -std=c89
 EXTLIBS=`sdl2-config --cflags --libs`
 
 LIBSDIR=-L/usr/lib -L./Libs
-INCLUDEDIR=-I/usr/include -I. -I./LibAutomaton -I./LibGui
+INCLUDEDIR=-I/usr/include -I. -I./LibMatrix -I./LibGui
 
 #Exe test variables
-TARGET=main
-SOURCE=main
+TARGET=Matrix.exe
+SOURCE=matrixmain
 
 SOURCECFILE=$(SOURCE:=.c)
 SOURCEOFILE=$(SOURCE:=.o)
 
-DEPENDENCELIST=libAutomaton.so libGui.so
-DEPENDENCENAMEONE=Automaton
+DEPENDENCELIST=libMatrix.so libGui.so
+DEPENDENCENAMEONE=Matrix
 DEPENDENCENAMETWO=Gui
 
 
 all: $(TARGET)
 #Generating the main.exe
-$(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib
+$(TARGET): $(SOURCEOFILE) lib
 	@echo "\n Generating the " $(TARGET) " binary"
 	mkdir -p build
 	$(CC) $(SOURCEOFILE) $(LIBSDIR) $(EXTLIBS) -l$(DEPENDENCENAMEONE) -l$(DEPENDENCENAMETWO) -o ./build/$(TARGET)
 
 #Generating the library binary
 lib:
-	@echo "\n Generating the automaton library binary"
-	$(MAKE) -C LibGui
-
-$(DEPENDENCELIST):
-	@echo "\n Generating the automaton library binary"
+	@echo "\n Generating the gui library binary"
 	mkdir -p Libs
-	$(MAKE) -C LibAutomaton
-
+	$(MAKE) -C LibMatrix
+	$(MAKE) -C LibGui
 
 #Generating object files
 .c.o:
@@ -49,5 +45,6 @@ $(DEPENDENCELIST):
 #Cleaning
 clean:
 	@echo "\n Cleaning"
-	rm -rf *.o ./Libs/*.so *.exe
-	$(MAKE) -C LibAutomaton clean
+	rm -rf *.o ./Libs/*.so ./build/$(TARGET)
+	$(MAKE) -C LibMatrix clean
+	$(MAKE) -C LibGui clean
diff --git a/main.c b/matrixmain.c
similarity index 100%
rename from main.c
rename to matrixmain.c