diff --git a/includes/default.hpp b/includes/default.hpp
deleted file mode 100644
index fc55644..0000000
--- a/includes/default.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   default.hpp                                        :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/02/11 13:42:04 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:43:13 by mmoussou         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-#pragma once
-
-#ifndef __WEBSERV_DEFAULT_HPP__
-# define __WEBSERV_DEFAULT_HPP__
-
-using namespace webserv; // oh no, cringo D:
-
-#endif //__WEBSERV_DEFAULT_HPP__
diff --git a/includes/requests/HttpIMessage.hpp b/includes/requests/HttpIMessage.hpp
new file mode 100644
index 0000000..1b1cc19
--- /dev/null
+++ b/includes/requests/HttpIMessage.hpp
@@ -0,0 +1,45 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   HttpIMessage.hpp                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2025/02/11 22:13:38 by mmoussou          #+#    #+#             */
+/*   Updated: 2025/02/11 22:20:53 by mmoussou         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#pragma once
+#ifndef __WEBSERV_REQUESTS_HTTP_IMESSAGE_HPP__
+# define __WEBSERV_REQUESTS_HTTP_IMESSAGE_HPP__
+
+#include <map>
+#include <string>
+
+namespace webserv {
+namespace http {
+
+class IMessage {
+public:
+	virtual std::map<std::string, std::string>	getHeaders(void) const;
+	virtual std::string							getBody(void) const;
+
+	virtual void	setHeaders(std::map<std::string, std::string> const headers);
+	virtual void	setBody(std::string const body);
+
+	virtual void	addHeader(std::string const name, std::string const value);
+	virtual void	rmHeader(std::string const name);
+
+	virtual std::string	str(void) const = 0;
+
+protected:
+	std::map<std::string, std::string>	_headers;
+	std::string							_body;
+
+};
+
+} // -namespace http
+} // -namespace webserv
+
+#endif // __WEBSERV_REQUESTS_HTTP_IMESSAGE_HPP__
diff --git a/includes/requests/HttpRequest.hpp b/includes/requests/HttpRequest.hpp
index 18b60c8..7b4911c 100644
--- a/includes/requests/HttpRequest.hpp
+++ b/includes/requests/HttpRequest.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 17:23:00 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:49:50 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 22:18:34 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,12 @@
 #ifndef __WEBSERV_REQUESTS_HTTP_REQUEST_HPP__
 # define __WEBSERV_REQUESTS_HTTP_REQUEST_HPP__
 
-#include "requests/default.hpp"
+#include <fstream>
+#include <sstream>
+#include <iostream>
+
+#include <requests/HttpIMessage.hpp>
+#include <requests/HttpResponse.hpp>
 
 namespace webserv {
 namespace http {
diff --git a/includes/requests/HttpResponse.hpp b/includes/requests/HttpResponse.hpp
index b618248..9db5b92 100644
--- a/includes/requests/HttpResponse.hpp
+++ b/includes/requests/HttpResponse.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 17:21:20 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:43:52 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 22:21:52 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,7 +14,7 @@
 #ifndef __WEBSERV_REQUESTS_HTTP_RESPONSE_HPP__
 # define __WEBSERV_REQUESTS_HTTP_RESPONSE_HPP__
 
-#include "requests/default.hpp"
+#include <requests/HttpIMessage.hpp>
 
 namespace webserv {
 namespace http {
@@ -41,6 +41,8 @@ public:
 	void	setStatusCode(size_t const status_code);
 	void	setStatusText(std::string const status_text);
 
+	std::string	str(void) const;
+
 private:
 	std::string							_protocol;
 	size_t								_status_code;
diff --git a/includes/requests/default.hpp b/includes/requests/default.hpp
index 220f40c..946cda1 100644
--- a/includes/requests/default.hpp
+++ b/includes/requests/default.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 15:48:22 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:50:43 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 22:21:21 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,37 +14,7 @@
 #ifndef __WEBSERV_REQUESTS_DEFAULT_HPP__
 # define __WEBSERV_REQUESTS_DEFAULT_HPP__
 
-#include <map>
-#include <string>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-
-#include "default.hpp"
-#include "requests/HttpRequest.hpp"
-#include "requests/HttpResponse.hpp"
-
-namespace webserv {
-namespace http {
-
-class IMessage {
-public:
-	virtual std::map<std::string, std::string>	getHeaders(void) const;
-	virtual std::string							getBody(void) const;
-
-	virtual void	setHeaders(std::map<std::string, std::string> const headers);
-	virtual void	setBody(std::string const body);
-
-	virtual void	addHeader(std::string const name, std::string const value);
-	virtual void	rmHeader(std::string const name);
-
-protected:
-	std::map<std::string, std::string>	_headers;
-	std::string							_body;
-
-};
-
-} // -namespace http
-} // -namespace webserv
+#include <requests/HttpRequest.hpp>
+#include <requests/HttpResponse.hpp>
 
 #endif // __WEBSERV_REQUESTS_DEFAULT_HPP__
diff --git a/includes/server/default.hpp b/includes/server/default.hpp
index 5ca19f5..f648bec 100644
--- a/includes/server/default.hpp
+++ b/includes/server/default.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/11 13:29:05 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:43:26 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 15:00:15 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,8 +14,6 @@
 #ifndef __WEBSERV_SERVER_DEFAULT_HPP__
 # define __WEBSERV_SERVER_DEFAULT_HPP__
 
-#include "default.hpp"
-
 namespace webserv {
 namespace server {
 
diff --git a/includes/webserv.hpp b/includes/webserv.hpp
index da5d284..f5e354f 100644
--- a/includes/webserv.hpp
+++ b/includes/webserv.hpp
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/11 13:29:21 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:43:20 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 15:00:10 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/main.cpp b/src/main.cpp
index 190f426..4bbd0f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,12 +6,12 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/02/03 15:45:07 by mmoussou          #+#    #+#             */
-/*   Updated: 2025/02/11 13:39:14 by mmoussou         ###   ########.fr       */
+/*   Updated: 2025/02/11 14:54:22 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "webserv.hpp"
-#include "requests/default.hpp"
+#include <webserv.hpp>
+#include <requests/default.hpp>
 
 #define PORT 8080
 #define BUFFER_SIZE 4096