diff --git a/database_cleaner-core.gemspec b/database_cleaner-core.gemspec
index 65b5119..467710f 100644
--- a/database_cleaner-core.gemspec
+++ b/database_cleaner-core.gemspec
@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license     = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
+    f.match(%r{^(test|spec|features|examples)/})
+  end - ["lib/database_cleaner.rb"] # should only exist in database_cleaner gem
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -27,4 +27,3 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "cucumber"
 end
-
diff --git a/database_cleaner.gemspec b/database_cleaner.gemspec
index e8c7a06..f6b9a54 100644
--- a/database_cleaner.gemspec
+++ b/database_cleaner.gemspec
@@ -11,5 +11,8 @@ Gem::Specification.new do |spec|
   spec.homepage    = "https://github.com/DatabaseCleaner/database_cleaner"
   spec.license     = "MIT"
 
+  spec.files       = ["lib/database_cleaner.rb"]
+  spec.require_paths = ["lib"]
+
   spec.add_dependency "database_cleaner-active_record"
 end
diff --git a/examples/features/support/env.rb b/examples/features/support/env.rb
index 2ca27d5..bb6350f 100644
--- a/examples/features/support/env.rb
+++ b/examples/features/support/env.rb
@@ -1,12 +1,11 @@
 #Hilarious as it seems, this is necessary so bundle exec cucumber works for mongoid cukeage (I'm assuming mongomapper is automatically present because its a git repo)
 Object.send(:remove_const, 'MongoMapper')  if defined?(::MongoMapper)
 
-require 'rubygems'
 require 'bundler'
 
 Bundler.setup
 require 'rspec/expectations'
-#require 'ruby-debug'
+#require 'byebug'
 
 DB_DIR = "#{File.dirname(__FILE__)}/../../db"
 
@@ -29,7 +28,7 @@ if orm && strategy
     require "database_cleaner-#{orm.underscore}"
   else
     $:.unshift(File.dirname(__FILE__) + '/../../../lib')
-    require "database_cleaner"
+    require "database_cleaner-core"
   end
 
   if another_orm
diff --git a/features/support/env.rb b/features/support/env.rb
index b96546a..ce8a338 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'database_cleaner'
+require 'database_cleaner-core'
 
 require 'rspec/expectations'
diff --git a/lib/database_cleaner-core.rb b/lib/database_cleaner-core.rb
index 9b65f62..f2e121a 100644
--- a/lib/database_cleaner-core.rb
+++ b/lib/database_cleaner-core.rb
@@ -1 +1 @@
-# empty file to avoid LoadError if someone requires database_cleaner-core directly
+require "database_cleaner/core"
diff --git a/lib/database_cleaner.rb b/lib/database_cleaner.rb
index 6210a7a..484e99c 100644
--- a/lib/database_cleaner.rb
+++ b/lib/database_cleaner.rb
@@ -1,34 +1,2 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
-require 'database_cleaner/version'
-require 'database_cleaner/configuration'
-require 'database_cleaner/deprecation'
-require 'forwardable'
+require "database_cleaner/active_record"
 
-module DatabaseCleaner
-  class << self
-    extend Forwardable
-    delegate [
-      :[],
-      :app_root=,
-      :app_root,
-      :logger=,
-      :logger,
-      :cleaners,
-      :cleaners=,
-      :strategy=,
-      :orm=,
-      :start,
-      :clean,
-      :clean_with,
-      :cleaning,
-    ] => :configuration
-
-    attr_accessor :allow_remote_database_url, :allow_production, :url_whitelist
-
-    private
-
-    def configuration
-      @configuration ||= Configuration.new
-    end
-  end
-end
diff --git a/lib/database_cleaner/core.rb b/lib/database_cleaner/core.rb
new file mode 100644
index 0000000..925fc9e
--- /dev/null
+++ b/lib/database_cleaner/core.rb
@@ -0,0 +1,30 @@
+require 'database_cleaner/version'
+require 'database_cleaner/configuration'
+require 'database_cleaner/deprecation'
+require 'forwardable'
+
+module DatabaseCleaner
+  class << self
+    extend Forwardable
+    delegate [
+      :[],
+      :cleaners,
+      :cleaners=,
+      :strategy=,
+      :orm=,
+      :start,
+      :clean,
+      :clean_with,
+      :cleaning,
+    ] => :configuration
+
+    attr_accessor :allow_remote_database_url, :allow_production, :url_whitelist
+
+    private
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+  end
+end
+
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 362950c..bbdceaa 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
 require "bundler/setup"
-require "database_cleaner"
+require "database_cleaner-core"
 require "byebug"
 
 RSpec.configure do |config|