diff --git a/core/SCsub b/core/SCsub
index 2fbfa1d..bb20aab 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -10,7 +10,8 @@ env.add_source_files(env.core_sources, "./net/*.cpp")
 env.add_source_files(env.core_sources, "./net/resolvers/*.cpp")
 env.add_source_files(env.core_sources, "./net/connections/*.cpp")
 env.add_source_files(env.core_sources, "./loops/*.cpp")
-env.add_source_files(env.core_sources, "./loops/poller/*.cpp")
+env.add_source_files(env.core_sources, "./polling/poller/*.cpp")
+env.add_source_files(env.core_sources, "./polling/*.cpp")
 env.add_source_files(env.core_sources, "./containers/*.cpp")
 env.add_source_files(env.core_sources, "./log/*.cpp")
 env.add_source_files(env.core_sources, "./os/*.cpp")
diff --git a/core/loops/event_loop.cpp b/core/loops/event_loop.cpp
index ffdf63f..8dd2b8d 100644
--- a/core/loops/event_loop.cpp
+++ b/core/loops/event_loop.cpp
@@ -32,8 +32,8 @@
 #include "event_loop.h"
 #include "core/log/logger.h"
 
-#include "channel.h"
-#include "poller.h"
+#include "core/net/channel.h"
+#include "core/polling/poller.h"
 
 #include "timer_queue.h"
 
diff --git a/core/loops/timer.h b/core/loops/timer.h
index 7cef2ef..49c1c2e 100644
--- a/core/loops/timer.h
+++ b/core/loops/timer.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <atomic>
 #include <chrono>
 #include <functional>
diff --git a/core/loops/timer_queue.cpp b/core/loops/timer_queue.cpp
index 0eda53f..76f316c 100644
--- a/core/loops/timer_queue.cpp
+++ b/core/loops/timer_queue.cpp
@@ -30,7 +30,7 @@
 
 #include "event_loop.h"
 
-#include "channel.h"
+#include "core/net/channel.h"
 #include "timer_queue.h"
 #ifdef __linux__
 #include <sys/timerfd.h>
diff --git a/core/loops/timer_queue.h b/core/loops/timer_queue.h
index 3c73878..32c2988 100644
--- a/core/loops/timer_queue.h
+++ b/core/loops/timer_queue.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "timer.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <atomic>
 #include <memory>
 #include <queue>
diff --git a/core/loops/acceptor.cpp b/core/net/acceptor.cpp
similarity index 100%
rename from core/loops/acceptor.cpp
rename to core/net/acceptor.cpp
diff --git a/core/loops/acceptor.h b/core/net/acceptor.h
similarity index 98%
rename from core/loops/acceptor.h
rename to core/net/acceptor.h
index d336c37..ef549e7 100644
--- a/core/loops/acceptor.h
+++ b/core/net/acceptor.h
@@ -33,7 +33,7 @@
 #include "channel.h"
 #include "core/net/inet_address.h"
 #include "core/net/socket.h"
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 #include <functional>
 
 // Inherit from socket?
diff --git a/core/loops/callbacks.h b/core/net/callbacks.h
similarity index 100%
rename from core/loops/callbacks.h
rename to core/net/callbacks.h
diff --git a/core/loops/channel.cpp b/core/net/channel.cpp
similarity index 98%
rename from core/loops/channel.cpp
rename to core/net/channel.cpp
index 8ed70b8..4a46e93 100644
--- a/core/loops/channel.cpp
+++ b/core/net/channel.cpp
@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "channel.h"
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 
 #ifdef _WIN32
 #include "Wepoll.h"
diff --git a/core/loops/channel.h b/core/net/channel.h
similarity index 100%
rename from core/loops/channel.h
rename to core/net/channel.h
diff --git a/core/net/connections/tcp_connection_impl.cpp b/core/net/connections/tcp_connection_impl.cpp
index fc35606..175dea2 100644
--- a/core/net/connections/tcp_connection_impl.cpp
+++ b/core/net/connections/tcp_connection_impl.cpp
@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "tcp_connection_impl.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #include "core/net/socket.h"
 #ifdef __linux__
 #include <sys/sendfile.h>
diff --git a/core/net/connector.cpp b/core/net/connector.cpp
index 18a7fc3..af8102f 100644
--- a/core/net/connector.cpp
+++ b/core/net/connector.cpp
@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "connector.h"
-#include "core/loops/channel.h"
+#include "channel.h"
 #include "core/net/socket.h"
 
 Connector::Connector(EventLoop *loop, const InetAddress &addr, bool retry) :
diff --git a/core/net/resolvers/ares_resolver.cpp b/core/net/resolvers/ares_resolver.cpp
index a457771..dde3f0d 100644
--- a/core/net/resolvers/ares_resolver.cpp
+++ b/core/net/resolvers/ares_resolver.cpp
@@ -29,7 +29,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ares_resolver.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #include <ares.h>
 #ifdef _WIN32
 #include <winsock2.h>
diff --git a/core/net/tcp_connection.h b/core/net/tcp_connection.h
index 2c25f95..91352f5 100644
--- a/core/net/tcp_connection.h
+++ b/core/net/tcp_connection.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/containers/msg_buffer.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include "core/loops/event_loop.h"
 #include "core/net/inet_address.h"
 #include <functional>
diff --git a/core/net/tcp_server.cpp b/core/net/tcp_server.cpp
index 0e759db..ed71d08 100644
--- a/core/net/tcp_server.cpp
+++ b/core/net/tcp_server.cpp
@@ -30,7 +30,7 @@
 
 #include "core/net/tcp_server.h"
 #include "core/log/logger.h"
-#include "core/loops/acceptor.h"
+#include "core/net/acceptor.h"
 #include "core/net/connections/tcp_connection_impl.h"
 #include <functional>
 #include <vector>
diff --git a/core/net/tcp_server.h b/core/net/tcp_server.h
index 143722d..8c43ef5 100644
--- a/core/net/tcp_server.h
+++ b/core/net/tcp_server.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/log/logger.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include "core/loops/event_loop_thread_pool.h"
 #include "core/loops/timing_wheel.h"
 #include "core/net/inet_address.h"
diff --git a/core/loops/poller.cpp b/core/polling/poller.cpp
similarity index 98%
rename from core/loops/poller.cpp
rename to core/polling/poller.cpp
index a4e8f60..6512d1b 100644
--- a/core/loops/poller.cpp
+++ b/core/polling/poller.cpp
@@ -28,7 +28,8 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "core/loops/poller.h"
+#include "poller.h"
+
 #ifdef __linux__
 #include "poller/epoll_poller.h"
 #elif defined _WIN32
diff --git a/core/loops/poller.h b/core/polling/poller.h
similarity index 98%
rename from core/loops/poller.h
rename to core/polling/poller.h
index 1d86f9f..6963b6a 100644
--- a/core/loops/poller.h
+++ b/core/polling/poller.h
@@ -30,7 +30,7 @@
 
 #pragma once
 
-#include "event_loop.h"
+#include "core/loops/event_loop.h"
 
 #include <map>
 #include <memory>
diff --git a/core/loops/poller/epoll_poller.cpp b/core/polling/poller/epoll_poller.cpp
similarity index 99%
rename from core/loops/poller/epoll_poller.cpp
rename to core/polling/poller/epoll_poller.cpp
index 28d5af0..da31323 100644
--- a/core/loops/poller/epoll_poller.cpp
+++ b/core/polling/poller/epoll_poller.cpp
@@ -30,7 +30,7 @@
 
 #include "epoll_poller.h"
 #include "core/log/logger.h"
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 
 #ifdef __linux__
 #include <assert.h>
diff --git a/core/loops/poller/epoll_poller.h b/core/polling/poller/epoll_poller.h
similarity index 98%
rename from core/loops/poller/epoll_poller.h
rename to core/polling/poller/epoll_poller.h
index 9272daa..c4d05ff 100644
--- a/core/loops/poller/epoll_poller.h
+++ b/core/polling/poller/epoll_poller.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include "core/loops/event_loop.h"
-#include "core/loops/poller.h"
+#include "core/polling/poller.h"
 
 #if defined __linux__ || defined _WIN32
 #include <map>
diff --git a/core/loops/poller/kqueue.cpp b/core/polling/poller/kqueue.cpp
similarity index 99%
rename from core/loops/poller/kqueue.cpp
rename to core/polling/poller/kqueue.cpp
index b40064a..1d8dd4d 100644
--- a/core/loops/poller/kqueue.cpp
+++ b/core/polling/poller/kqueue.cpp
@@ -31,7 +31,7 @@
 
 #include "kqueue.h"
 
-#include "core/loops/channel.h"
+#include "core/net/channel.h"
 #ifdef USE_KQUEUE
 #include "core/log/logger.h"
 #include <poll.h>
diff --git a/core/loops/poller/kqueue.h b/core/polling/poller/kqueue.h
similarity index 98%
rename from core/loops/poller/kqueue.h
rename to core/polling/poller/kqueue.h
index 83edb0c..1468a4e 100644
--- a/core/loops/poller/kqueue.h
+++ b/core/polling/poller/kqueue.h
@@ -30,7 +30,7 @@
 
 #pragma once
 #include "core/loops/event_loop.h"
-#include "core/loops/poller.h"
+#include "core/polling/poller.h"
 
 #if (defined(__unix__) && !defined(__linux__)) || \
 		(defined(__APPLE__) && defined(__MACH__))
diff --git a/core/loops/poller/wepoll/LICENSE b/core/polling/poller/wepoll/LICENSE
similarity index 100%
rename from core/loops/poller/wepoll/LICENSE
rename to core/polling/poller/wepoll/LICENSE
diff --git a/core/loops/poller/wepoll/README.md b/core/polling/poller/wepoll/README.md
similarity index 100%
rename from core/loops/poller/wepoll/README.md
rename to core/polling/poller/wepoll/README.md
diff --git a/core/loops/poller/wepoll/Wepoll.c b/core/polling/poller/wepoll/Wepoll.c
similarity index 100%
rename from core/loops/poller/wepoll/Wepoll.c
rename to core/polling/poller/wepoll/Wepoll.c
diff --git a/core/loops/poller/wepoll/Wepoll.h b/core/polling/poller/wepoll/Wepoll.h
similarity index 100%
rename from core/loops/poller/wepoll/Wepoll.h
rename to core/polling/poller/wepoll/Wepoll.h
diff --git a/web_backends/drogon/drogon/lib/src/HttpServer.h b/web_backends/drogon/drogon/lib/src/HttpServer.h
index ce6e3a9..106e5f7 100644
--- a/web_backends/drogon/drogon/lib/src/HttpServer.h
+++ b/web_backends/drogon/drogon/lib/src/HttpServer.h
@@ -16,7 +16,7 @@
 
 #include "impl_forwards.h"
 #include "core/net/tcp_server.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <trantor/utils/NonCopyable.h>
 #include <functional>
 #include <string>
diff --git a/web_backends/drogon/drogon/lib/src/ListenerManager.h b/web_backends/drogon/drogon/lib/src/ListenerManager.h
index 5185d5d..b03fa84 100644
--- a/web_backends/drogon/drogon/lib/src/ListenerManager.h
+++ b/web_backends/drogon/drogon/lib/src/ListenerManager.h
@@ -16,7 +16,7 @@
 
 #include "impl_forwards.h"
 #include "core/loops/event_loop_thread_pool.h"
-#include "core/loops/callbacks.h"
+#include "core/net/callbacks.h"
 #include <trantor/utils/NonCopyable.h>
 #include <memory>
 #include <string>