diff --git a/src/types/date.zig b/lib/types/date.zig
similarity index 100%
rename from src/types/date.zig
rename to lib/types/date.zig
diff --git a/src/types/dataType.zig b/lib/types/out.zig
similarity index 67%
rename from src/types/dataType.zig
rename to lib/types/out.zig
index 82c0020..55787e5 100644
--- a/src/types/dataType.zig
+++ b/lib/types/out.zig
@@ -1,3 +1,11 @@
+// This file is just to expose what I need to grab
+
+pub const UUID = @import("uuid.zig").UUID;
+pub const DateTime = @import("date.zig").DateTime;
+pub const OR = @import("uuid.zig").OR;
+pub const AND = @import("uuid.zig").AND;
+pub const s2t = @import("stringToType.zig");
+
 /// Suported dataType for the DB
 /// Maybe start using a unionenum
 pub const DataType = enum {
diff --git a/src/types/stringToType.zig b/lib/types/stringToType.zig
similarity index 100%
rename from src/types/stringToType.zig
rename to lib/types/stringToType.zig
diff --git a/src/types/uuid.zig b/lib/types/uuid.zig
similarity index 100%
rename from src/types/uuid.zig
rename to lib/types/uuid.zig
diff --git a/src/fileEngine.zig b/src/fileEngine.zig
index 1ac8510..cac8776 100644
--- a/src/fileEngine.zig
+++ b/src/fileEngine.zig
@@ -1,22 +1,25 @@
 const std = @import("std");
 const utils = @import("stuffs/utils.zig");
-const s2t = @import("types/stringToType.zig");
+const dtype = @import("dtype");
+const s2t = dtype.s2t;
 const zid = @import("ZipponData");
 const Allocator = std.mem.Allocator;
 
-// TODO: Clean that
-const UUID = @import("types/uuid.zig").UUID;
-const DateTime = @import("types/date.zig").DateTime;
-const DataType = @import("types/dataType.zig").DataType;
+const UUID = dtype.UUID;
+const DateTime = dtype.DateTime;
+const DataType = dtype.DataType;
+
 const FileTokenizer = @import("tokenizers/file.zig").Tokenizer;
 const FileToken = @import("tokenizers/file.zig").Token;
-const SchemaStruct = @import("schemaParser.zig").Parser.SchemaStruct;
-const SchemaParser = @import("schemaParser.zig").Parser;
 const SchemaTokenizer = @import("tokenizers/schema.zig").Tokenizer;
 const SchemaToken = @import("tokenizers/schema.zig").Token;
 const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData;
 const Loc = @import("tokenizers/shared/loc.zig").Loc;
 
+// TODO: Move that to another struct, not in the file engine
+const SchemaStruct = @import("schemaParser.zig").Parser.SchemaStruct;
+const SchemaParser = @import("schemaParser.zig").Parser;
+
 const FileEngineError = @import("stuffs/errors.zig").FileEngineError;
 
 const BUFFER_SIZE = @import("config.zig").BUFFER_SIZE;
@@ -33,7 +36,6 @@ pub const FileEngine = struct {
     null_terminated_schema_buff: [:0]u8,
     struct_array: std.ArrayList(SchemaStruct),
 
-    // TODO: Check is all DATA folder are ok. Meaning there is all struct dir, at least one zippon file and all file are 0.zippondata or csv later
     pub fn init(allocator: Allocator, path: []const u8) FileEngine {
         const path_to_ZipponDB_dir = path;
 
diff --git a/src/main.zig b/src/main.zig
index fd8b3ad..f140e8c 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,16 +1,16 @@
 const std = @import("std");
+const utils = @import("stuffs/utils.zig");
+const send = utils.send;
 const Allocator = std.mem.Allocator;
 
-// TODO: Clean that
-const DateTime = @import("types/date.zig").DateTime;
 const FileEngine = @import("fileEngine.zig").FileEngine;
+
 const cliTokenizer = @import("tokenizers/cli.zig").Tokenizer;
 const cliToken = @import("tokenizers/cli.zig").Token;
+
 const ziqlTokenizer = @import("tokenizers/ziql.zig").Tokenizer;
 const ziqlToken = @import("tokenizers/ziql.zig").Token;
 const ziqlParser = @import("ziqlParser.zig").Parser;
-const utils = @import("stuffs/utils.zig");
-const send = @import("stuffs/utils.zig").send;
 
 const BUFFER_SIZE = @import("config.zig").BUFFER_SIZE;
 const HELP_MESSAGE = @import("config.zig").HELP_MESSAGE;
@@ -47,7 +47,7 @@ pub fn myLog(
 
     const potential_file: ?std.fs.File = std.fs.cwd().openFile(log_path, .{ .mode = .write_only }) catch null;
 
-    const now = DateTime.now();
+    const now = @import("dtype").DateTime.now();
     var date_format_buffer = std.ArrayList(u8).init(log_allocator);
     defer date_format_buffer.deinit();
     now.format("YYYY/MM/DD-HH:mm:ss.SSSS", date_format_buffer.writer()) catch return;
diff --git a/src/schemaParser.zig b/src/schemaParser.zig
index 2c231f8..86b1b35 100644
--- a/src/schemaParser.zig
+++ b/src/schemaParser.zig
@@ -1,6 +1,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const DataType = @import("types/dataType.zig").DataType;
+const DataType = @import("dtype").DataType;
 const Toker = @import("tokenizers/schema.zig").Tokenizer;
 const Token = @import("tokenizers/schema.zig").Token;
 const Loc = @import("tokenizers/shared/loc.zig").Loc;
diff --git a/src/stuffs/queue.zig b/src/stuffs/queue.zig
deleted file mode 100644
index 72a072a..0000000
--- a/src/stuffs/queue.zig
+++ /dev/null
@@ -1,5 +0,0 @@
-pub const Node = struct {
-    prev: ?*Node = null,
-    next: ?*Node = null,
-    query: []const u8,
-};
diff --git a/src/ziqlParser.zig b/src/ziqlParser.zig
index dfdaf62..ba05f70 100644
--- a/src/ziqlParser.zig
+++ b/src/ziqlParser.zig
@@ -4,10 +4,13 @@ const FileEngine = @import("fileEngine.zig").FileEngine;
 const Condition = @import("fileEngine.zig").FileEngine.Condition;
 const Tokenizer = @import("tokenizers/ziql.zig").Tokenizer;
 const Token = @import("tokenizers/ziql.zig").Token;
-const UUID = @import("types/uuid.zig").UUID;
-const AND = @import("types/uuid.zig").AND;
-const OR = @import("types/uuid.zig").OR;
-const DataType = @import("types/dataType.zig").DataType;
+
+const dtype = @import("dtype");
+const UUID = dtype.UUID;
+const AND = dtype.AND;
+const OR = dtype.OR;
+const DataType = dtype.DataType;
+
 const AdditionalData = @import("stuffs/additionalData.zig").AdditionalData;
 const AdditionalDataMember = @import("stuffs/additionalData.zig").AdditionalDataMember;
 const send = @import("stuffs/utils.zig").send;