diff --git a/Makefile b/Makefile
index b8a5c73..7eafd63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,23 @@
-all: main.c scpi_parser.c scpi_parser.h
-	gcc main.c scpi_parser.c scpi_errors.c scpi_regs.c scpi_builtins.c -o main.elf
+SRC = main.c
+SRC+= source/scpi_parser.c
+SRC+= source/scpi_regs.c
+SRC+= source/scpi_builtins.c
+SRC+= source/scpi_errors.c
+
+HDRS= source/scpi_parser.h
+HDRS+= source/scpi_regs.h
+HDRS+= source/scpi_builtins.h
+HDRS+= source/scpi_errors.h
+
+all: $(SRC) $(HDRS)
+	gcc $(SRC) -o main.elf
 
 run: all
 	./main.elf
 
+clean:
+	rm -f *.o *.d *.so *.elf *.bin *.hex
+	cd source
+	rm -f *.o *.d *.so *.elf *.bin *.hex
+
+
diff --git a/main.c b/main.c
index 96ca700..be7a26f 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "scpi_parser.h"
+
+#include "source/scpi_parser.h"
 
 
 void cmd_APPL_SIN_cb(const SCPI_argval_t *args)
diff --git a/scpi.pro b/scpi.pro
index 1f0929e..8a4c31d 100644
--- a/scpi.pro
+++ b/scpi.pro
@@ -4,21 +4,21 @@ CONFIG -= app_bundle
 CONFIG -= qt
 
 SOURCES += \
-    scpi_parser.c \
-    main.c \
-    scpi_errors.c \
-    scpi_regs.c \
-    scpi_builtins.c
+	main.c \
+	source/scpi_parser.c \
+	source/scpi_errors.c \
+	source/scpi_regs.c \
+	source/scpi_builtins.c
 
 DISTFILES += \
-    style.astylerc \
-    .gitignore \
-    LICENSE \
-    README.md \
-    Makefile
+	style.astylerc \
+	.gitignore \
+	LICENSE \
+	README.md \
+	Makefile
 
 HEADERS += \
-    scpi_parser.h \
-    scpi_errors.h \
-    scpi_regs.h \
-    scpi_builtins.h
+	source/scpi_parser.h \
+	source/scpi_errors.h \
+	source/scpi_regs.h \
+	source/scpi_builtins.h
diff --git a/scpi.pro.user b/scpi.pro.user
index 38c04e3..0d0993d 100644
--- a/scpi.pro.user
+++ b/scpi.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.5.1, 2015-12-05T00:30:51. -->
+<!-- Written by QtCreator 3.5.1, 2015-12-05T17:34:08. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/scpi_builtins.c b/source/scpi_builtins.c
similarity index 100%
rename from scpi_builtins.c
rename to source/scpi_builtins.c
diff --git a/scpi_builtins.h b/source/scpi_builtins.h
similarity index 100%
rename from scpi_builtins.h
rename to source/scpi_builtins.h
diff --git a/scpi_errors.c b/source/scpi_errors.c
similarity index 100%
rename from scpi_errors.c
rename to source/scpi_errors.c
diff --git a/scpi_errors.h b/source/scpi_errors.h
similarity index 100%
rename from scpi_errors.h
rename to source/scpi_errors.h
diff --git a/scpi_parser.c b/source/scpi_parser.c
similarity index 100%
rename from scpi_parser.c
rename to source/scpi_parser.c
diff --git a/scpi_parser.h b/source/scpi_parser.h
similarity index 100%
rename from scpi_parser.h
rename to source/scpi_parser.h
diff --git a/scpi_regs.c b/source/scpi_regs.c
similarity index 100%
rename from scpi_regs.c
rename to source/scpi_regs.c
diff --git a/scpi_regs.h b/source/scpi_regs.h
similarity index 100%
rename from scpi_regs.h
rename to source/scpi_regs.h