diff --git a/lib/redistat.rb b/lib/redistat.rb
index a2505bd..881ec73 100644
--- a/lib/redistat.rb
+++ b/lib/redistat.rb
@@ -16,13 +16,13 @@ require 'time_ext'
 require 'redis'
 require 'json'
 
-require 'redistat/options'
-require 'redistat/synchronize'
+require 'redistat/mixins/options'
+require 'redistat/mixins/synchronize'
+require 'redistat/mixins/database'
+require 'redistat/mixins/date_helper'
 require 'redistat/connection'
-require 'redistat/database'
 require 'redistat/collection'
 require 'redistat/date'
-require 'redistat/date_helper'
 require 'redistat/event'
 require 'redistat/finder'
 require 'redistat/key'
diff --git a/lib/redistat/database.rb b/lib/redistat/mixins/database.rb
similarity index 100%
rename from lib/redistat/database.rb
rename to lib/redistat/mixins/database.rb
diff --git a/lib/redistat/date_helper.rb b/lib/redistat/mixins/date_helper.rb
similarity index 100%
rename from lib/redistat/date_helper.rb
rename to lib/redistat/mixins/date_helper.rb
diff --git a/lib/redistat/options.rb b/lib/redistat/mixins/options.rb
similarity index 100%
rename from lib/redistat/options.rb
rename to lib/redistat/mixins/options.rb
diff --git a/lib/redistat/synchronize.rb b/lib/redistat/mixins/synchronize.rb
similarity index 100%
rename from lib/redistat/synchronize.rb
rename to lib/redistat/mixins/synchronize.rb