diff --git a/core/lib.rs b/core/lib.rs
index 255575fb5..c7b7e42bd 100644
--- a/core/lib.rs
+++ b/core/lib.rs
@@ -1,4 +1,3 @@
-mod datetime;
 mod error;
 mod function;
 mod io;
diff --git a/core/datetime.rs b/core/vdbe/datetime.rs
similarity index 100%
rename from core/datetime.rs
rename to core/vdbe/datetime.rs
diff --git a/core/vdbe/mod.rs b/core/vdbe/mod.rs
index e6099d1e3..8f807d030 100644
--- a/core/vdbe/mod.rs
+++ b/core/vdbe/mod.rs
@@ -21,7 +21,8 @@ pub mod builder;
 pub mod explain;
 pub mod sorter;
 
-use crate::datetime::{exec_date, exec_time};
+mod datetime;
+
 use crate::error::LimboError;
 use crate::function::{AggFunc, ScalarFunc};
 use crate::pseudo::PseudoCursor;
@@ -31,6 +32,8 @@ use crate::storage::{btree::BTreeCursor, pager::Pager};
 use crate::types::{AggContext, Cursor, CursorResult, OwnedRecord, OwnedValue, Record};
 use crate::Result;
 
+use datetime::{exec_date, exec_time};
+
 use regex::Regex;
 use std::borrow::BorrowMut;
 use std::cell::RefCell;
@@ -1277,9 +1280,8 @@ impl Program {
                     }
                     ScalarFunc::Date => {
                         if *start_reg == 0 {
-                            let date_str = exec_date(&OwnedValue::Text(Rc::new(
-                                "now".to_string(),
-                            )))?;
+                            let date_str =
+                                exec_date(&OwnedValue::Text(Rc::new("now".to_string())))?;
                             state.registers[*dest] = OwnedValue::Text(Rc::new(date_str));
                         } else {
                             let time_value = &state.registers[*start_reg];
@@ -1300,9 +1302,8 @@ impl Program {
                     }
                     ScalarFunc::Time => {
                         if *start_reg == 0 {
-                            let time_str = exec_time(&OwnedValue::Text(
-                                Rc::new("now".to_string()),
-                            ))?;
+                            let time_str =
+                                exec_time(&OwnedValue::Text(Rc::new("now".to_string())))?;
                             state.registers[*dest] = OwnedValue::Text(Rc::new(time_str));
                         } else {
                             let datetime_value = &state.registers[*start_reg];