diff --git a/src/server/connectionoperator.cpp b/src/server/connectionoperator.cpp
index 365e9e0..2f34a3f 100644
--- a/src/server/connectionoperator.cpp
+++ b/src/server/connectionoperator.cpp
@@ -6,22 +6,22 @@
 #include <cstdio>
 #include <sstream>
 
-void ConnectionOperator::SendResponse(Connection const & connection, Http::Response const & response) const
+void ConnectionOperator::SendResponse(ClientSocket const & clientSocket, Http::Response const & response) const
 {
 	auto bytesToSend = response.Serialize();
 	try
 	{
-		connection.WriteBytes(bytesToSend);
+		clientSocket.WriteBytes(bytesToSend);
 	}
 	catch(std::runtime_error & e)
 	{
-		logger.Error("Error writing data to connection");
+		logger.Error("Error writing data to clientSocket");
 	}
 }
 
-void ConnectionOperator::HandleNewConnection(Connection const & newConnection)
+void ConnectionOperator::HandleNewConnection(ClientSocket const & newClient)
 {
-	auto requestBytes = newConnection.ReadBytes();
+	auto requestBytes = newClient.ReadBytes();
 	Http::Request request;
 	Http::Response response;
 	try
@@ -37,7 +37,7 @@ void ConnectionOperator::HandleNewConnection(Connection const & newConnection)
 		logger.Error(ss.str());
 
 		response.code = HttpResponse::Code::BAD_REQUEST;
-		SendResponse(newConnection, response);
+		SendResponse(newClient, response);
 		return;
 	}
 
@@ -57,12 +57,12 @@ void ConnectionOperator::HandleNewConnection(Connection const & newConnection)
 		logger.Error(ss.str());
 
 		response.code = HttpResponse::Code::NOT_IMPLEMENTED;
-		SendResponse(newConnection, response);
+		SendResponse(newClient, response);
 		return;
 	}
 
 	auto bytesToSend = response.Serialize();
-	newConnection.WriteBytes(bytesToSend);
+	newClient.WriteBytes(bytesToSend);
 }
 
 ConnectionOperator::ConnectionOperator(Logger & _logger)
diff --git a/src/server/connectionoperator.hpp b/src/server/connectionoperator.hpp
index e5ad9f3..aa8141a 100644
--- a/src/server/connectionoperator.hpp
+++ b/src/server/connectionoperator.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #include "../logger.hpp"
 #include "../middleware/base.hpp"
-#include "connection.hpp"
 #include <memory>
+#include "socket/clientsocket.hpp"
 #include <string>
 #include <vector>
 
@@ -12,10 +12,10 @@ private:
 	Logger & logger;
 	std::vector<std::unique_ptr<Middleware::BaseMiddleware>> middlewares;
 
-	void SendResponse(Connection const & connection, Http::Response const & response) const;
+	void SendResponse(ClientSocket const & clientSocket, Http::Response const & response) const;
 
 public:
-	void HandleNewConnection(Connection const & newConnection);
+	void HandleNewConnection(ClientSocket const & newClient);
 
 	ConnectionOperator(Logger & logger);
 };
\ No newline at end of file
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 6d8fdd0..21ca46c 100755
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -10,12 +10,12 @@ void HttpServer::Execute()
 	{
 		try
 		{
-			Connection newConnection = listeningSocket.AcceptNextConnection();
-			connectionOperator.HandleNewConnection(newConnection);
+			ClientSocket newClient = listeningSocket.AcceptNextConnection();
+			connectionOperator.HandleNewConnection(newClient);
 		}
 		catch (std::runtime_error & e)
 		{
-			logger.Info("Connection dropped on accept");
+			logger.Info("ClientSocket dropped on accept");
 		}
 	}
 }
diff --git a/src/server/server.hpp b/src/server/server.hpp
index 57859e1..fa4bed4 100755
--- a/src/server/server.hpp
+++ b/src/server/server.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../logger.hpp"
 #include "connectionoperator.hpp"
-#include "listeningsocket.hpp"
+#include "socket/listeningsocket.hpp"
 
 class HttpServer
 {
diff --git a/src/server/connection.cpp b/src/server/socket/clientsocket.cpp
similarity index 75%
rename from src/server/connection.cpp
rename to src/server/socket/clientsocket.cpp
index f42b457..cdf6f43 100644
--- a/src/server/connection.cpp
+++ b/src/server/socket/clientsocket.cpp
@@ -1,8 +1,8 @@
-#include "connection.hpp"
+#include "clientsocket.hpp"
 #include <stdexcept>
 #include <unistd.h>
 
-std::vector<char> Connection::ReadBytes(size_t limit) const
+std::vector<char> ClientSocket::ReadBytes(size_t limit) const
 {
 	size_t const readChunkSize = 128;
 
@@ -25,7 +25,7 @@ std::vector<char> Connection::ReadBytes(size_t limit) const
 	return buffer;
 }
 
-size_t Connection::WriteBytes(std::vector<char> const & bytes) const
+size_t ClientSocket::WriteBytes(std::vector<char> const & bytes) const
 {
 	ssize_t totalBytesWritten = 0;
 	size_t const sizeToWrite = bytes.size();
@@ -43,16 +43,16 @@ size_t Connection::WriteBytes(std::vector<char> const & bytes) const
 	return totalBytesWritten;
 }
 
-Connection::Connection(int _fileDescriptor)
+ClientSocket::ClientSocket(int _fileDescriptor)
 	: fileDescriptor(_fileDescriptor)
 {
 	if (_fileDescriptor < 0)
 	{
-		throw std::runtime_error("connection created with invalid file descriptor");
+		throw std::runtime_error("clientSocket created with invalid file descriptor");
 	}
 }
 
-Connection::~Connection()
+ClientSocket::~ClientSocket()
 {
 	if (fileDescriptor >= 0)
 	{
@@ -60,7 +60,7 @@ Connection::~Connection()
 	}
 }
 
-Connection::Connection(Connection && other)
+ClientSocket::ClientSocket(ClientSocket && other)
 {
 	fileDescriptor = other.fileDescriptor;
 
diff --git a/src/server/connection.hpp b/src/server/socket/clientsocket.hpp
similarity index 54%
rename from src/server/connection.hpp
rename to src/server/socket/clientsocket.hpp
index 1fb260b..83f638f 100644
--- a/src/server/connection.hpp
+++ b/src/server/socket/clientsocket.hpp
@@ -2,7 +2,7 @@
 #include <cstdint>
 #include <vector>
 
-class Connection
+class ClientSocket
 {
 private:
 	int fileDescriptor;
@@ -13,11 +13,11 @@ public:
 
 	size_t WriteBytes(std::vector<char> const & bytes) const;
 
-	Connection(int _fileDescriptor);
-	~Connection();
+	ClientSocket(int _fileDescriptor);
+	~ClientSocket();
 
-	Connection(Connection && other);
+	ClientSocket(ClientSocket && other);
 
-	Connection(Connection & other) = delete;
-	Connection & operator=(Connection & other) = delete;
+	ClientSocket(ClientSocket & other) = delete;
+	ClientSocket & operator=(ClientSocket & other) = delete;
 };
\ No newline at end of file
diff --git a/src/server/listeningsocket.cpp b/src/server/socket/listeningsocket.cpp
similarity index 91%
rename from src/server/listeningsocket.cpp
rename to src/server/socket/listeningsocket.cpp
index 0bc1822..c91b7b1 100644
--- a/src/server/listeningsocket.cpp
+++ b/src/server/socket/listeningsocket.cpp
@@ -4,7 +4,7 @@
 
 int const connectionLimit = 10;
 
-Connection ListeningSocket::AcceptNextConnection()
+ClientSocket ListeningSocket::AcceptNextConnection()
 {
 	unsigned sockaddrSize = sizeof(sockaddr_in);
 	int connectionFileDescriptor = accept(
@@ -12,7 +12,7 @@ Connection ListeningSocket::AcceptNextConnection()
 		reinterpret_cast<sockaddr *>(&socketAddress),
 		&sockaddrSize);
 	
-	return Connection(connectionFileDescriptor);
+	return ClientSocket(connectionFileDescriptor);
 }
 
 ListeningSocket::ListeningSocket(int const port)
diff --git a/src/server/listeningsocket.hpp b/src/server/socket/listeningsocket.hpp
similarity index 79%
rename from src/server/listeningsocket.hpp
rename to src/server/socket/listeningsocket.hpp
index e435feb..e187517 100644
--- a/src/server/listeningsocket.hpp
+++ b/src/server/socket/listeningsocket.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "../logger.hpp"
-#include "connection.hpp"
+#include "clientsocket.hpp"
 #include <sys/socket.h>
 #include <netinet/in.h>
 
@@ -11,7 +10,7 @@ private:
 	sockaddr_in socketAddress;
 
 public:
-	Connection AcceptNextConnection();
+	ClientSocket AcceptNextConnection();
 
 	ListeningSocket(int const port);
 	~ListeningSocket();