diff --git a/src/Database/Eloquent/Builder.php b/src/Database/Eloquent/Builder.php
index e69de29..36dc4d3 100644
--- a/src/Database/Eloquent/Builder.php
+++ b/src/Database/Eloquent/Builder.php
@@ -0,0 +1,23 @@
+<?php namespace filemaker_laravel\Database\Eloquent;
+
+use laravel_filemaker\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Eloquent\Builder as EloBuilder;
+
+class Builder extends EloBuilder
+{
+    /**
+     * Create a new Eloquent query builder instance.
+     *
+     * @param  \Illuminate\Database\Query\Builder  $query
+     * @return void
+     */
+    public function __construct(QueryBuilder $query)
+    {
+        $this->query = $query;
+    }
+    
+    public function testElo()
+    {
+        echo 'eloquent builder';
+    }
+}
\ No newline at end of file
diff --git a/src/Database/Query/Builder.php b/src/Database/Query/Builder.php
new file mode 100644
index 0000000..cda0992
--- /dev/null
+++ b/src/Database/Query/Builder.php
@@ -0,0 +1,11 @@
+<?php namespace laravel_filemaker\Database\Query;
+
+use Illuminate\Database\Query\Builder as BaseBuilder;
+
+class Builder extends BaseBuilder
+{
+    public function test()
+    {
+        echo 'testBuilder';
+    }
+}
\ No newline at end of file
diff --git a/src/Query/Grammar.php b/src/Database/Query/Grammar.php
similarity index 100%
rename from src/Query/Grammar.php
rename to src/Database/Query/Grammar.php
diff --git a/src/Query/Processor.php b/src/Database/Query/Processor.php
similarity index 100%
rename from src/Query/Processor.php
rename to src/Database/Query/Processor.php
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
deleted file mode 100644
index e69de29..0000000