diff --git a/HEADS b/HEADS
index 1b857c0..9288942 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "a34995e1b7f93938a273f64a51360dd019369b54"}}
\ No newline at end of file
+{"engine": {"master": "a47cb57da73a27369df2575a432adbeb6f2dd790"}}
\ No newline at end of file
diff --git a/app/ic_application.cpp b/app/ic_application.cpp
index 4998c26..74c9a43 100644
--- a/app/ic_application.cpp
+++ b/app/ic_application.cpp
@@ -7,10 +7,10 @@
 
 #include "core/database/database_manager.h"
 #include "core/file_cache.h"
-#include "core/bry_http/handler_instance.h"
+#include "core/http/handler_instance.h"
 #include "core/html/html_builder.h"
 #include "core/database/query_result.h"
-#include "core/bry_http/request.h"
+#include "core/http/request.h"
 #include "core/utils.h"
 
 void ICApplication::index(Object *instance, Request *request) {
@@ -69,7 +69,7 @@ void ICApplication::engine_docs_page(Object *instance, Request *request) {
 }
 
 void ICApplication::setup_routes() {
-	BryWebApplication::setup_routes();
+	WebApplication::setup_routes();
 
 	index_func = HandlerInstance(index);
 
@@ -79,7 +79,7 @@ void ICApplication::setup_routes() {
 }
 
 void ICApplication::setup_middleware() {
-	BryWebApplication::setup_middleware();
+	WebApplication::setup_middleware();
 
 	//middlewares.push_back(ICApplication::session_middleware_func);
 }
@@ -138,7 +138,7 @@ void ICApplication::load_md(const std::string &file_name, std::string *str) {
 }
 
 ICApplication::ICApplication() :
-		BryWebApplication() {
+		WebApplication() {
 
 	load_md("./engine/Readme.md", &engine_docs);
 	load_md("./Readme.md", &app_docs);
diff --git a/app/ic_application.h b/app/ic_application.h
index 827881f..14de151 100644
--- a/app/ic_application.h
+++ b/app/ic_application.h
@@ -3,14 +3,14 @@
 
 #include <vector>
 
-#include "core/bry_http/bry_web_application.h"
+#include "core/http/web_application.h"
 #include "core/object.h"
 
 #include "modules/message_page/message_page.h"
 #include "modules/list_page/list_page.h"
 #include "modules/paged_article/paged_article.h"
 
-class ICApplication : public BryWebApplication {
+class ICApplication : public WebApplication {
 public:
     static void index(Object *instance, Request *request);
     static void get_sensor_data(Object *instance, Request *request);
diff --git a/main.cpp b/main.cpp
index 1f903d1..e06b787 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <string>
 
-#include "core/bry_http/bry_web_application.h"
+#include "core/http/web_application.h"
 #include "core/file_cache.h"
 #include "core/bry_http/http_server.h"
 
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
 
 	create_databases();
 
-	BryWebApplication *app = new MAIN_CLASS();
+	WebApplication *app = new MAIN_CLASS();
 
 	app->load_settings();
 	app->setup_routes();