diff --git a/lib/redistat/extensions/date.rb b/lib/redistat/core_ext/date.rb
similarity index 100%
rename from lib/redistat/extensions/date.rb
rename to lib/redistat/core_ext/date.rb
diff --git a/lib/redistat/extensions/fixnum.rb b/lib/redistat/core_ext/fixnum.rb
similarity index 100%
rename from lib/redistat/extensions/fixnum.rb
rename to lib/redistat/core_ext/fixnum.rb
diff --git a/lib/redistat/core_ext/time.rb b/lib/redistat/core_ext/time.rb
new file mode 100644
index 0000000..c264d49
--- /dev/null
+++ b/lib/redistat/core_ext/time.rb
@@ -0,0 +1,27 @@
+class Time
+  include Redistat::DateHelper
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/redistat/extensions/time.rb b/lib/redistat/extensions/time.rb
deleted file mode 100644
index b64495b..0000000
--- a/lib/redistat/extensions/time.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class Time
-  include Redistat::DateHelper
-  
-  # %w[ round floor ceil ].each do |_method|
-  #   define_method _method do |*args|
-  #     seconds = args.first || 60
-  #     Time.at((self.to_f / seconds).send(_method) * seconds)
-  #   end
-  # end
-  
-  DEPTHS = [:year, :month, :day, :hour, :min, :sec, :usec]
-  
-  def floor(unit, multiple = nil)
-    multiple ||= 1
-    new_time = []
-    DEPTHS.each_with_index do |depth, i|
-      index = DEPTHS.index(unit)
-      if i < index
-        new_time << self.send(depth)
-      elsif i > index
-        new_time << 0
-      else
-        new_time << self.send(depth)
-      end
-    end
-    Time.utc(*new_time)
-  end
-
-end
\ No newline at end of file