diff --git a/modules/web/SCsub b/modules/web/SCsub
index 3bba18f76..a954cfac1 100644
--- a/modules/web/SCsub
+++ b/modules/web/SCsub
@@ -22,14 +22,14 @@ sources = [
     "http/web_server_middleware.cpp",
     "http/web_server_request.cpp",
 
-    "http/http_parser.cpp",
-    "http/http_writer.cpp",
 
     "html/html_builder_bind.cpp",
 
     "http_server_simple/http_server_simple.cpp",
     "http_server_simple/web_server_simple.cpp",
     "http_server_simple/simple_web_server_request.cpp",
+    "http_server_simple/http_parser.cpp",
+    "http_server_simple/http_writer.cpp",
 ]
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
diff --git a/modules/web/config.py b/modules/web/config.py
index 150203292..b949f14ad 100644
--- a/modules/web/config.py
+++ b/modules/web/config.py
@@ -26,8 +26,9 @@ def get_doc_classes():
 	    "WebServerCookie",
 	    "WebServerMiddleware",
 	    "WebServerRequest",
-        "HTTPParser",
-        "HTTPWriter",
+
+        #"HTTPParser",
+        #"HTTPWriter",
 
         "HTMLBuilder",
         "HTMLTag",
diff --git a/modules/web/http/http_parser.cpp b/modules/web/http_server_simple/http_parser.cpp
similarity index 95%
rename from modules/web/http/http_parser.cpp
rename to modules/web/http_server_simple/http_parser.cpp
index 0376907f5..7d4babb11 100644
--- a/modules/web/http/http_parser.cpp
+++ b/modules/web/http_server_simple/http_parser.cpp
@@ -1,6 +1,6 @@
 #include "http_parser.h"
 
-#include "web_server_request.h"
+#include "../http/web_server_request.h"
 
 Ref<WebServerRequest> HTTPParser::get_request() {
 	return _request;
diff --git a/modules/web/http/http_parser.h b/modules/web/http_server_simple/http_parser.h
similarity index 100%
rename from modules/web/http/http_parser.h
rename to modules/web/http_server_simple/http_parser.h
diff --git a/modules/web/http_server_simple/http_server_simple.cpp b/modules/web/http_server_simple/http_server_simple.cpp
index 7f1892b0d..2d479c4e8 100644
--- a/modules/web/http_server_simple/http_server_simple.cpp
+++ b/modules/web/http_server_simple/http_server_simple.cpp
@@ -30,7 +30,7 @@
 
 #include "http_server_simple.h"
 
-#include "../http/http_parser.h"
+#include "http_parser.h"
 #include "simple_web_server_request.h"
 
 void HTTPServerSimple::stop() {
@@ -230,6 +230,9 @@ HTTPServerSimple::HTTPServerSimple() {
 	stop();
 }
 
+HTTPServerSimple::~HTTPServerSimple() {
+}
+
 void HTTPServerSimple::_clear_client() {
 	peer = Ref<StreamPeer>();
 	ssl = Ref<StreamPeerSSL>();
diff --git a/modules/web/http_server_simple/http_server_simple.h b/modules/web/http_server_simple/http_server_simple.h
index 29d6e65df..503aa0983 100644
--- a/modules/web/http_server_simple/http_server_simple.h
+++ b/modules/web/http_server_simple/http_server_simple.h
@@ -49,6 +49,7 @@ public:
 	void poll();
 
 	HTTPServerSimple();
+	~HTTPServerSimple();
 
 private:
 	Ref<TCP_Server> server;
diff --git a/modules/web/http/http_writer.cpp b/modules/web/http_server_simple/http_writer.cpp
similarity index 100%
rename from modules/web/http/http_writer.cpp
rename to modules/web/http_server_simple/http_writer.cpp
diff --git a/modules/web/http/http_writer.h b/modules/web/http_server_simple/http_writer.h
similarity index 100%
rename from modules/web/http/http_writer.h
rename to modules/web/http_server_simple/http_writer.h
diff --git a/modules/web/register_types.cpp b/modules/web/register_types.cpp
index 7024b8cfa..3fe2e4562 100644
--- a/modules/web/register_types.cpp
+++ b/modules/web/register_types.cpp
@@ -29,11 +29,9 @@ SOFTWARE.
 #include "html/html_builder_bind.h"
 
 #include "http/csrf_token.h"
-#include "http/http_parser.h"
 #include "http/http_server_enums.h"
 #include "http/http_session.h"
 #include "http/http_session_manager.h"
-#include "http/http_writer.h"
 #include "http/web_node.h"
 #include "http/web_permission.h"
 #include "http/web_root.h"
@@ -63,9 +61,6 @@ void register_web_types() {
 	ClassDB::register_class<WebServerCookie>();
 	ClassDB::register_class<WebServerMiddleware>();
 	ClassDB::register_class<WebServerRequest>();
-
-	ClassDB::register_class<HTTPParser>();
-	ClassDB::register_class<HTTPWriter>();
 }
 
 void unregister_web_types() {