diff --git a/src/Core_Events.php b/src/Events/Core_Events.php
similarity index 98%
rename from src/Core_Events.php
rename to src/Events/Core_Events.php
index 7aaaa29..2fa09b5 100644
--- a/src/Core_Events.php
+++ b/src/Events/Core_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Main set of events for WordPress core
diff --git a/src/Genesis_Events.php b/src/Events/Genesis_Events.php
similarity index 97%
rename from src/Genesis_Events.php
rename to src/Events/Genesis_Events.php
index c3f9470..7ff4384 100644
--- a/src/Genesis_Events.php
+++ b/src/Events/Genesis_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Events for Genesis Framework based themes
diff --git a/src/Hybrid_Events.php b/src/Events/Hybrid_Events.php
similarity index 97%
rename from src/Hybrid_Events.php
rename to src/Events/Hybrid_Events.php
index cb82b3b..1aef7d2 100644
--- a/src/Hybrid_Events.php
+++ b/src/Events/Hybrid_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Events for Hybrid Core based themes
diff --git a/src/Laps_Events.php b/src/Events/Laps_Events.php
similarity index 94%
rename from src/Laps_Events.php
rename to src/Events/Laps_Events.php
index 50ad0e3..6af9f65 100644
--- a/src/Laps_Events.php
+++ b/src/Events/Laps_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Base class for bulk event providers
diff --git a/src/THA_Events.php b/src/Events/THA_Events.php
similarity index 96%
rename from src/THA_Events.php
rename to src/Events/THA_Events.php
index a43d746..9138de1 100644
--- a/src/THA_Events.php
+++ b/src/Events/THA_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Events for Theme Hook Alliance
diff --git a/src/Yoast_Events.php b/src/Events/Yoast_Events.php
similarity index 94%
rename from src/Yoast_Events.php
rename to src/Events/Yoast_Events.php
index 7f7da7f..8e17739 100644
--- a/src/Yoast_Events.php
+++ b/src/Events/Yoast_Events.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
+namespace Rarst\Laps\Events;
 
 /**
  * Events for Yoast plugins
diff --git a/src/Laps.php b/src/Laps.php
index 8b8635e..7df7ffe 100644
--- a/src/Laps.php
+++ b/src/Laps.php
@@ -2,6 +2,8 @@
 
 namespace Rarst\Laps;
 
+use Rarst\Laps\Events\Core_Events;
+use Rarst\Laps\Events\Laps_Events;
 use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
@@ -178,7 +180,7 @@ class Laps {
 
 		foreach ( [ 'THA', 'Hybrid', 'Genesis', 'Yoast' ] as $vendor ) {
 
-			$class = "Rarst\\Laps\\{$vendor}_Events";
+			$class = "Rarst\\Laps\\Events\\{$vendor}_Events";
 			/** @var Laps_Events $events */
 			$events = new $class;
 			$this->add_events( $events->get() );