diff --git a/..gitignore.swp b/..gitignore.swp
deleted file mode 100644
index 24f090d..0000000
Binary files a/..gitignore.swp and /dev/null differ
diff --git a/driver/drv/dot.h.gch b/driver/drv/dot.h.gch
deleted file mode 100644
index 2f362f8..0000000
Binary files a/driver/drv/dot.h.gch and /dev/null differ
diff --git a/driver/Makefile b/driver/src/Makefile
similarity index 78%
rename from driver/Makefile
rename to driver/src/Makefile
index 4df8f4f..9c3e8d2 100644
--- a/driver/Makefile
+++ b/driver/src/Makefile
@@ -18,7 +18,9 @@ OBJECTS_UI   = ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info.o ui/v
 
 COMPILE = $(COMPILER_PATH) $(CFLAGS)
 
-main: $(OBJECTS_DRV) $(OBJ_MAIN)
+all: drv cli
+
+drv: $(OBJECTS_DRV) $(OBJ_MAIN)
 	@echo "Linking..."
 	$(COMPILE) $(OBJ_MAIN) $(OBJECTS_DRV) -o $(OUT_MAIN) $(LDFLAGS)
 
@@ -27,9 +29,10 @@ cli: $(OBJECTS_DRV) $(OBJECTS_UI) $(OBJ_CLI)
 	$(COMPILE) $(OBJ_CLI) $(OBJECTS_DRV) $(OBJECTS_UI) -o $(OUT_CLI) $(LDFLAGS)
 
 help:
-	@echo "This Makefile has the following rules:"
-	@echo "make main .... to compile main.cpp"
-	@echo "make cli  .... to compile Command Line Interface"
+	@echo "This Makefile compiles the b15f driver and command line interface (CLI):"
+	@echo "make ......... to compile all"
+	@echo "make drv ..... to compile the b15f driver"
+	@echo "make cli  .... to compile the cli"
 	@echo "make clean ... to delete objects and executables"
 	
 clean:
diff --git a/driver/cli.cpp b/driver/src/cli.cpp
similarity index 100%
rename from driver/cli.cpp
rename to driver/src/cli.cpp
diff --git a/driver/drv/b15f.cpp b/driver/src/drv/b15f.cpp
similarity index 100%
rename from driver/drv/b15f.cpp
rename to driver/src/drv/b15f.cpp
diff --git a/driver/drv/b15f.h b/driver/src/drv/b15f.h
similarity index 100%
rename from driver/drv/b15f.h
rename to driver/src/drv/b15f.h
diff --git a/driver/drv/dot.cpp b/driver/src/drv/dot.cpp
similarity index 100%
rename from driver/drv/dot.cpp
rename to driver/src/drv/dot.cpp
diff --git a/driver/drv/dot.h b/driver/src/drv/dot.h
similarity index 100%
rename from driver/drv/dot.h
rename to driver/src/drv/dot.h
diff --git a/driver/drv/driverexception.h b/driver/src/drv/driverexception.h
similarity index 100%
rename from driver/drv/driverexception.h
rename to driver/src/drv/driverexception.h
diff --git a/driver/drv/plottyfile.cpp b/driver/src/drv/plottyfile.cpp
similarity index 100%
rename from driver/drv/plottyfile.cpp
rename to driver/src/drv/plottyfile.cpp
diff --git a/driver/drv/plottyfile.h b/driver/src/drv/plottyfile.h
similarity index 100%
rename from driver/drv/plottyfile.h
rename to driver/src/drv/plottyfile.h
diff --git a/driver/drv/timeoutexception.h b/driver/src/drv/timeoutexception.h
similarity index 100%
rename from driver/drv/timeoutexception.h
rename to driver/src/drv/timeoutexception.h
diff --git a/driver/drv/usart.cpp b/driver/src/drv/usart.cpp
similarity index 100%
rename from driver/drv/usart.cpp
rename to driver/src/drv/usart.cpp
diff --git a/driver/drv/usart.h b/driver/src/drv/usart.h
similarity index 100%
rename from driver/drv/usart.h
rename to driver/src/drv/usart.h
diff --git a/driver/drv/usartexception.h b/driver/src/drv/usartexception.h
similarity index 100%
rename from driver/drv/usartexception.h
rename to driver/src/drv/usartexception.h
diff --git a/driver/gnuplotscript.gp b/driver/src/gnuplotscript.gp
similarity index 100%
rename from driver/gnuplotscript.gp
rename to driver/src/gnuplotscript.gp
diff --git a/driver/graph b/driver/src/graph
similarity index 100%
rename from driver/graph
rename to driver/src/graph
diff --git a/driver/main.cpp b/driver/src/main.cpp
similarity index 100%
rename from driver/main.cpp
rename to driver/src/main.cpp
diff --git a/driver/plotty b/driver/src/plotty
similarity index 100%
rename from driver/plotty
rename to driver/src/plotty
diff --git a/driver/test_plot b/driver/src/test_plot
similarity index 100%
rename from driver/test_plot
rename to driver/src/test_plot
diff --git a/driver/ui/ui.cpp b/driver/src/ui/ui.cpp
similarity index 100%
rename from driver/ui/ui.cpp
rename to driver/src/ui/ui.cpp
diff --git a/driver/ui/ui.h b/driver/src/ui/ui.h
similarity index 100%
rename from driver/ui/ui.h
rename to driver/src/ui/ui.h
diff --git a/driver/ui/view.cpp b/driver/src/ui/view.cpp
similarity index 100%
rename from driver/ui/view.cpp
rename to driver/src/ui/view.cpp
diff --git a/driver/ui/view.h b/driver/src/ui/view.h
similarity index 100%
rename from driver/ui/view.h
rename to driver/src/ui/view.h
diff --git a/driver/ui/view_info.cpp b/driver/src/ui/view_info.cpp
similarity index 100%
rename from driver/ui/view_info.cpp
rename to driver/src/ui/view_info.cpp
diff --git a/driver/ui/view_info.h b/driver/src/ui/view_info.h
similarity index 100%
rename from driver/ui/view_info.h
rename to driver/src/ui/view_info.h
diff --git a/driver/ui/view_monitor.cpp b/driver/src/ui/view_monitor.cpp
similarity index 100%
rename from driver/ui/view_monitor.cpp
rename to driver/src/ui/view_monitor.cpp
diff --git a/driver/ui/view_monitor.h b/driver/src/ui/view_monitor.h
similarity index 100%
rename from driver/ui/view_monitor.h
rename to driver/src/ui/view_monitor.h
diff --git a/driver/ui/view_promt.cpp b/driver/src/ui/view_promt.cpp
similarity index 100%
rename from driver/ui/view_promt.cpp
rename to driver/src/ui/view_promt.cpp
diff --git a/driver/ui/view_promt.h b/driver/src/ui/view_promt.h
similarity index 100%
rename from driver/ui/view_promt.h
rename to driver/src/ui/view_promt.h
diff --git a/driver/ui/view_selection.cpp b/driver/src/ui/view_selection.cpp
similarity index 100%
rename from driver/ui/view_selection.cpp
rename to driver/src/ui/view_selection.cpp
diff --git a/driver/ui/view_selection.h b/driver/src/ui/view_selection.h
similarity index 100%
rename from driver/ui/view_selection.h
rename to driver/src/ui/view_selection.h