diff --git a/lib/make/datetime.js b/lib/make/datetime.js
deleted file mode 100644
index 4e81c99..0000000
--- a/lib/make/datetime.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const make = require('../make')
-const random = require('../random')
-
-class datetime extends make {
-  static object () {
-    switch (random.number(2)) {
-      case 0:
-        return new Date(new Date().getTime() + random.number())
-      case 1:
-        return new Date(new Date().getTime() - random.number())
-    }
-  }
-
-  static date () {
-    return this.object().toDateString()
-  }
-
-  static time () {
-    return this.object().toTimeString()
-  }
-
-  static iso () {
-    return this.object().toISOString()
-  }
-
-  static epoch () {
-    return Math.floor(this.object() / 1000)
-  }
-}
-
-module.exports = datetime
diff --git a/lib/make/index.js b/lib/make/index.js
index 99d31b9..b78f984 100644
--- a/lib/make/index.js
+++ b/lib/make/index.js
@@ -27,10 +27,6 @@ class make {
     return require('./crypto')
   }
 
-  static get datetime () {
-    return require('./datetime')
-  }
-
   static get files () {
     return require('./files')
   }
diff --git a/lib/make/time.js b/lib/make/time.js
index aad6c08..4105dd6 100644
--- a/lib/make/time.js
+++ b/lib/make/time.js
@@ -12,8 +12,33 @@ class time extends make {
     ])
   }
 
+  static datetime () {
+    switch (random.number(2)) {
+      case 0:
+        return new Date(new Date().getTime() + random.number())
+      case 1:
+        return new Date(new Date().getTime() - random.number())
+    }
+  }
+
+  static date () {
+    return time.datetime().toDateString()
+  }
+
+  static time () {
+    return time.datetime().toTimeString()
+  }
+
+  static iso () {
+    return time.datetime().toISOString()
+  }
+
+  static epoch () {
+    return Math.floor(time.object() / 1000)
+  }
+
   static any () {
-    return make.number.any() + this.unit()
+    return make.number.any() + time.unit()
   }
 }
 
diff --git a/package.json b/package.json
index 6411f15..2551879 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mozillasecurity/octo",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "",
   "keywords": [
     "fuzzing",