diff --git a/core/SCsub b/core/SCsub
index 50be750..ea8cfdb 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -6,7 +6,7 @@ env.core_sources = []
 
 env.add_source_files(env.core_sources, "*.cpp")
 env.add_source_files(env.core_sources, "./html/*.cpp")
-env.add_source_files(env.core_sources, "./http/*.cpp")
+env.add_source_files(env.core_sources, "./bry_http/*.cpp")
 env.add_source_files(env.core_sources, "./database/*.cpp")
 
 # Build it all as a library
diff --git a/core/bry_web_application.cpp b/core/bry_http/bry_web_application.cpp
similarity index 99%
rename from core/bry_web_application.cpp
rename to core/bry_http/bry_web_application.cpp
index e8943c7..35a996c 100644
--- a/core/bry_web_application.cpp
+++ b/core/bry_http/bry_web_application.cpp
@@ -5,7 +5,7 @@
 
 #include "request.h"
 
-#include "file_cache.h"
+#include "core/file_cache.h"
 
 #include <iostream>
 
diff --git a/core/bry_web_application.h b/core/bry_http/bry_web_application.h
similarity index 98%
rename from core/bry_web_application.h
rename to core/bry_http/bry_web_application.h
index 1b0c4f3..01499f4 100644
--- a/core/bry_web_application.h
+++ b/core/bry_http/bry_web_application.h
@@ -1,7 +1,7 @@
 #ifndef BRY_WEB_APPLICATION_H
 #define BRY_WEB_APPLICATION_H
 
-#include "object.h"
+#include "core/object.h"
 #include <functional>
 #include <map>
 #include <string>
diff --git a/core/handler_instance.cpp b/core/bry_http/handler_instance.cpp
similarity index 91%
rename from core/handler_instance.cpp
rename to core/bry_http/handler_instance.cpp
index e1c9288..d00ae1b 100644
--- a/core/handler_instance.cpp
+++ b/core/bry_http/handler_instance.cpp
@@ -1,7 +1,7 @@
 #include "handler_instance.h"
 
 #include "request.h"
-#include "object.h"
+#include "core/object.h"
 
 HandlerInstance::HandlerInstance() {
 	instance = nullptr;
diff --git a/core/handler_instance.h b/core/bry_http/handler_instance.h
similarity index 100%
rename from core/handler_instance.h
rename to core/bry_http/handler_instance.h
diff --git a/core/http/http_server.cpp b/core/bry_http/http_server.cpp
similarity index 98%
rename from core/http/http_server.cpp
rename to core/bry_http/http_server.cpp
index 7ab1653..4e3a32c 100644
--- a/core/http/http_server.cpp
+++ b/core/bry_http/http_server.cpp
@@ -1,7 +1,7 @@
 #include "http_server.h"
 
-#include "core/bry_web_application.h"
-#include "core/request.h"
+#include "bry_web_application.h"
+#include "request.h"
 
 #define LOG_VERBOSE 0
 
diff --git a/core/http/http_server.h b/core/bry_http/http_server.h
similarity index 100%
rename from core/http/http_server.h
rename to core/bry_http/http_server.h
diff --git a/core/request.cpp b/core/bry_http/request.cpp
similarity index 100%
rename from core/request.cpp
rename to core/bry_http/request.cpp
diff --git a/core/request.h b/core/bry_http/request.h
similarity index 100%
rename from core/request.h
rename to core/bry_http/request.h
diff --git a/modules/list_page/list_page.h b/modules/list_page/list_page.h
index c274926..38a31de 100644
--- a/modules/list_page/list_page.h
+++ b/modules/list_page/list_page.h
@@ -6,7 +6,7 @@
 
 #include "core/object.h"
 
-#include "core/request.h"
+#include "core/bry_http/request.h"
 
 
 class ListPage : public Object {
diff --git a/modules/message_page/message_page.h b/modules/message_page/message_page.h
index 7671eaf..523fb08 100644
--- a/modules/message_page/message_page.h
+++ b/modules/message_page/message_page.h
@@ -6,7 +6,7 @@
 
 #include "core/object.h"
 
-#include "core/request.h"
+#include "core/bry_http/request.h"
 
 
 class MessagePage : public Object {
diff --git a/modules/paged_article/paged_article.cpp b/modules/paged_article/paged_article.cpp
index e8bf701..498f94e 100644
--- a/modules/paged_article/paged_article.cpp
+++ b/modules/paged_article/paged_article.cpp
@@ -8,7 +8,7 @@
 #include <tinydir/tinydir.h>
 #include <iostream>
 
-#include "core/bry_web_application.h"
+#include "core/bry_http/bry_web_application.h"
 
 void PagedArticle::index(Request *request) {
 	const std::string r = request->get_current_path_segment();
diff --git a/modules/paged_article/paged_article.h b/modules/paged_article/paged_article.h
index e0a9fd1..ea3b676 100644
--- a/modules/paged_article/paged_article.h
+++ b/modules/paged_article/paged_article.h
@@ -8,7 +8,7 @@
 #include "core/file_cache.h"
 #include "core/object.h"
 
-#include "core/request.h"
+#include "core/bry_http/request.h"
 
 struct Article {
 	std::string url;