diff --git a/spec/std/db/db_spec.cr b/spec/db_spec.cr
similarity index 97%
rename from spec/std/db/db_spec.cr
rename to spec/db_spec.cr
index b840f92..0fb8f4c 100644
--- a/spec/std/db/db_spec.cr
+++ b/spec/db_spec.cr
@@ -1,6 +1,4 @@
-require "spec"
-require "db"
-require "./dummy_driver"
+require "./spec_helper"
 
 private def connections
   DummyDriver::DummyConnection.connections
diff --git a/spec/std/db/dummy_driver.cr b/spec/dummy_driver.cr
similarity index 99%
rename from spec/std/db/dummy_driver.cr
rename to spec/dummy_driver.cr
index b721c14..6500ad7 100644
--- a/spec/std/db/dummy_driver.cr
+++ b/spec/dummy_driver.cr
@@ -1,4 +1,5 @@
 require "spec"
+require "../src/db"
 
 class DummyDriver < DB::Driver
   def build_connection(db : DB::Database) : DB::Connection
diff --git a/spec/std/db/dummy_driver_spec.cr b/spec/dummy_driver_spec.cr
similarity index 98%
rename from spec/std/db/dummy_driver_spec.cr
rename to spec/dummy_driver_spec.cr
index ca6e727..d9bf76d 100644
--- a/spec/std/db/dummy_driver_spec.cr
+++ b/spec/dummy_driver_spec.cr
@@ -1,6 +1,4 @@
-require "spec"
-require "db"
-require "./dummy_driver"
+require "./spec_helper"
 
 describe DummyDriver do
   it "with_dummy executes the block with a database" do
diff --git a/spec/std/db/result_set_spec.cr b/spec/result_set_spec.cr
similarity index 85%
rename from spec/std/db/result_set_spec.cr
rename to spec/result_set_spec.cr
index eabfb7f..64a7d58 100644
--- a/spec/std/db/result_set_spec.cr
+++ b/spec/result_set_spec.cr
@@ -1,6 +1,4 @@
-require "spec"
-require "db"
-require "./dummy_driver"
+require "./spec_helper"
 
 describe DB::ResultSet do
   it "should enumerate records using each" do
diff --git a/spec/spec_helper.cr b/spec/spec_helper.cr
new file mode 100644
index 0000000..a3a537d
--- /dev/null
+++ b/spec/spec_helper.cr
@@ -0,0 +1,3 @@
+require "spec"
+require "./dummy_driver"
+require "../src/db"
diff --git a/spec/std/db/statement_spec.cr b/spec/statement_spec.cr
similarity index 98%
rename from spec/std/db/statement_spec.cr
rename to spec/statement_spec.cr
index 216d305..5232621 100644
--- a/spec/std/db/statement_spec.cr
+++ b/spec/statement_spec.cr
@@ -1,6 +1,4 @@
-require "spec"
-require "db"
-require "./dummy_driver"
+require "./spec_helper"
 
 describe DB::Statement do
   it "should prepare statements" do
diff --git a/src/db/db.cr b/src/db.cr
similarity index 95%
rename from src/db/db.cr
rename to src/db.cr
index 149e367..0ae50e7 100644
--- a/src/db/db.cr
+++ b/src/db.cr
@@ -118,10 +118,10 @@ module DB
   end
 end
 
-require "./query_methods"
-require "./disposable"
-require "./database"
-require "./driver"
-require "./connection"
-require "./statement"
-require "./result_set"
+require "./db/query_methods"
+require "./db/disposable"
+require "./db/database"
+require "./db/driver"
+require "./db/connection"
+require "./db/statement"
+require "./db/result_set"