diff --git a/makefile b/makefile
index 4238502..52ec0fd 100644
--- a/makefile
+++ b/makefile
@@ -5,7 +5,7 @@ CC=avr-g++
 OBJCOPY=avr-objcopy
 CFLAGS=-Wall -g -mmcu=${MCU} -DF_CPU=${F_CPU} -I.
 TARGET=main
-SRCS=*.cpp
+SRCS=src/lcd.cpp test/main.cpp
 
 default: build flash
 
diff --git a/lcd.cpp b/src/lcd.cpp
similarity index 100%
rename from lcd.cpp
rename to src/lcd.cpp
diff --git a/lcd.h b/src/lcd.h
similarity index 100%
rename from lcd.h
rename to src/lcd.h
diff --git a/main.cpp b/test/main.cpp
similarity index 94%
rename from main.cpp
rename to test/main.cpp
index 9af9a69..b8a6799 100644
--- a/main.cpp
+++ b/test/main.cpp
@@ -1,7 +1,7 @@
 #define F_CPU 8000000UL			/* Define CPU Frequency e.g. here 8MHz */
 #include <avr/io.h>			/* Include AVR std. library file */
 #include <util/delay.h>			/* Include Delay header file */
-#include "lcd.h"
+#include "../src/lcd.h"
 
 
 
@@ -15,4 +15,4 @@ int main()
 	lcd::command(0xC0);		/* Go to 2nd line*/
 	lcd::string("Hello World");	/* Write string on 2nd line*/
 	while(1);
-}
\ No newline at end of file
+}