diff --git a/Makefile b/Makefile
index 5757ea2..da0cc07 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SOURCES = $(wildcard include/**/*.cpp include/*.cpp src/base/**/*.cpp)
+SOURCES = $(wildcard include/**/*.cpp include/*.cpp src/base/*.cpp)
 OBJECTS = $(patsubst %.cpp,%.o, $(SOURCES))
 BASE_LIB = build/base.a
 
@@ -11,7 +11,7 @@ CONFIG_SRC = $(wildcard src/settings/*.cpp)
 CONFIG_OBJ = $(patsubst %.cpp,%.o, $(CONFIG_SRC))
 CONFIG_LIB = build/config.a
 
-WIDGET_SRC = $(wildcard src/settings/*.cpp src/widgets/*.cpp)
+WIDGET_SRC = $(wildcard src/settings/*.cpp src/widgets/*.cpp src/base/widget/*.cpp)
 WIDGET_OBJ = $(patsubst %.cpp,%.o, $(WIDGET_SRC))
 WIDGET_LIB = build/widget.a
 
@@ -24,6 +24,7 @@ CXXFLAGS += -Os -pipe -DNDEBUG $(INC_FLAGS)
 
 TEST_SRC = $(wildcard tests/*Test.cpp)
 TESTS = $(patsubst %.cpp,%.o,$(TEST_SRC))
+TEST_RUNNER = tests/runner
 
 LDLIBS =
 
@@ -175,3 +176,4 @@ clean:
 	rm -f tests/runner
 	find . -name "*.gc*" -exec rm {} \;
 	rm -rf `find . -name "*.dSYM" -print`
+	mkdir -p build
diff --git a/src/base/network/SFTP.cpp b/src/base/SFTP.cpp
similarity index 100%
rename from src/base/network/SFTP.cpp
rename to src/base/SFTP.cpp
diff --git a/src/base/network/SFTP.h b/src/base/SFTP.h
similarity index 97%
rename from src/base/network/SFTP.h
rename to src/base/SFTP.h
index 80ed831..570c863 100644
--- a/src/base/network/SFTP.h
+++ b/src/base/SFTP.h
@@ -8,7 +8,7 @@
 #ifndef SFTP_H
 #define	SFTP_H
 
-#include "../../common.h"
+#include "../common.h"
 
 // Socket includes
 #include <cstring>
diff --git a/src/base/settings/Config.cpp b/src/settings/Config.cpp
similarity index 100%
rename from src/base/settings/Config.cpp
rename to src/settings/Config.cpp
diff --git a/src/base/settings/Config.h b/src/settings/Config.h
similarity index 91%
rename from src/base/settings/Config.h
rename to src/settings/Config.h
index 82bcb5b..1cac70c 100644
--- a/src/base/settings/Config.h
+++ b/src/settings/Config.h
@@ -1,7 +1,7 @@
 #ifndef TYRO_CONFIG_H
 #define	TYRO_CONFIG_H
 
-#include "../../common.h"
+#include "../common.h"
 
 class TyroConfig {
 public:
diff --git a/src/settings/LangConfig.h b/src/settings/LangConfig.h
index e933ae1..c7c00b7 100644
--- a/src/settings/LangConfig.h
+++ b/src/settings/LangConfig.h
@@ -2,7 +2,7 @@
 #define TYRO_LANG_CONFIG_H
 
 #include "../wx_common.h"
-#include "../base/settings/Config.h"
+#include "Config.h"
 
 class LangConfig : TyroConfig {
 public:
diff --git a/src/settings/ThemeConfig.h b/src/settings/ThemeConfig.h
index 5aa5410..a3ccca2 100644
--- a/src/settings/ThemeConfig.h
+++ b/src/settings/ThemeConfig.h
@@ -6,7 +6,7 @@
 #define	TYRO_THEME_CONFIG_H
 
 #include "../wx_common.h"
-#include "../base/settings/Config.h"
+#include "Config.h"
 
 class ThemeConfig : TyroConfig {
 public:
diff --git a/tests/ConfigTest.cpp b/tests/ConfigTest.cpp
index fa40c98..3d57056 100644
--- a/tests/ConfigTest.cpp
+++ b/tests/ConfigTest.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "../src/base/settings/Config.h"
+#include "../src/settings/Config.h"
 
 TEST_CASE ("Base config class load json")
 {
diff --git a/tests/SFTPTest.cpp b/tests/SFTPest.cpp
similarity index 82%
rename from tests/SFTPTest.cpp
rename to tests/SFTPest.cpp
index d845207..8c7b8eb 100644
--- a/tests/SFTPTest.cpp
+++ b/tests/SFTPest.cpp
@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "../src/base/network/SFTP.h"
+#include "../src/base/SFTP.h"
 
 TEST_CASE("SFTP Library")
 {