diff --git a/source/eventcore/core.d b/source/eventcore/core.d
index a816f5b..14bde46 100644
--- a/source/eventcore/core.d
+++ b/source/eventcore/core.d
@@ -2,8 +2,8 @@ module eventcore.core;
 
 public import eventcore.driver;
 
-import eventcore.epoll;
-import eventcore.select;
+import eventcore.drivers.epoll;
+import eventcore.drivers.select;
 
 alias NativeEventDriver = SelectEventDriver;
 
diff --git a/source/eventcore/epoll.d b/source/eventcore/drivers/epoll.d
similarity index 97%
rename from source/eventcore/epoll.d
rename to source/eventcore/drivers/epoll.d
index a4da4eb..9c390e1 100644
--- a/source/eventcore/epoll.d
+++ b/source/eventcore/drivers/epoll.d
@@ -1,9 +1,9 @@
-module eventcore.epoll;
+module eventcore.drivers.epoll;
 @safe: /*@nogc:*/ nothrow:
 
 version (linux):
 
-public import eventcore.posix;
+public import eventcore.drivers.posix;
 import eventcore.internal.utils;
 
 import core.time : Duration;
diff --git a/source/eventcore/posix.d b/source/eventcore/drivers/posix.d
similarity index 99%
rename from source/eventcore/posix.d
rename to source/eventcore/drivers/posix.d
index 1460c56..3aa1fd7 100644
--- a/source/eventcore/posix.d
+++ b/source/eventcore/drivers/posix.d
@@ -1,8 +1,8 @@
-module eventcore.posix;
+module eventcore.drivers.posix;
 @safe: /*@nogc:*/ nothrow:
 
 public import eventcore.driver;
-import eventcore.timer;
+import eventcore.drivers.timer;
 import eventcore.internal.utils;
 
 import std.socket : Address, AddressFamily, UnknownAddress;
diff --git a/source/eventcore/select.d b/source/eventcore/drivers/select.d
similarity index 96%
rename from source/eventcore/select.d
rename to source/eventcore/drivers/select.d
index 2edb321..fea136a 100644
--- a/source/eventcore/select.d
+++ b/source/eventcore/drivers/select.d
@@ -1,7 +1,7 @@
-module eventcore.select;
+module eventcore.drivers.select;
 @safe: /*@nogc:*/ nothrow:
 
-public import eventcore.posix;
+public import eventcore.drivers.posix;
 import eventcore.internal.utils;
 
 import core.time : Duration;
diff --git a/source/eventcore/timer.d b/source/eventcore/drivers/timer.d
similarity index 99%
rename from source/eventcore/timer.d
rename to source/eventcore/drivers/timer.d
index d04b550..2a853e7 100644
--- a/source/eventcore/timer.d
+++ b/source/eventcore/drivers/timer.d
@@ -1,4 +1,4 @@
-module eventcore.timer;
+module eventcore.drivers.timer;
 
 import eventcore.driver;