diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5abd355..2df18a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ project(TheBartender VERSION 1.0)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # Create an executable
-add_executable(${PROJECT_NAME} src/main.cpp src/Commands.cpp)
+add_executable(${PROJECT_NAME} src/Base/Entry.cpp src/Commands.cpp)
 
 # Find our pre-installed DPP package (using FindDPP.cmake).
 find_package(DPP REQUIRED)
diff --git a/src/main.cpp b/src/Base/Entry.cpp
similarity index 93%
rename from src/main.cpp
rename to src/Base/Entry.cpp
index ee6c527..7b94e82 100644
--- a/src/main.cpp
+++ b/src/Base/Entry.cpp
@@ -1,6 +1,6 @@
-#include "../languages/locale_en.hpp"
-#include "../token.h"
-#include "Commands.hpp"
+#include "../../languages/locale_en.hpp"
+#include "../../token.h"
+#include "../Commands.hpp"
 #include "SQL.hpp"
 
 #include <dpp/cluster.h>
diff --git a/src/SQL.hpp b/src/Base/SQL.hpp
similarity index 100%
rename from src/SQL.hpp
rename to src/Base/SQL.hpp