diff --git a/Modules.Database/Firebird.vb b/Modules.Database/Adapters/Firebird.vb
similarity index 100%
rename from Modules.Database/Firebird.vb
rename to Modules.Database/Adapters/Firebird.vb
diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/Adapters/MSSQLServer.vb
similarity index 100%
rename from Modules.Database/MSSQLServer.vb
rename to Modules.Database/Adapters/MSSQLServer.vb
diff --git a/Modules.Database/ODBC.vb b/Modules.Database/Adapters/ODBC.vb
similarity index 100%
rename from Modules.Database/ODBC.vb
rename to Modules.Database/Adapters/ODBC.vb
diff --git a/Modules.Database/Oracle.vb b/Modules.Database/Adapters/Oracle.vb
similarity index 100%
rename from Modules.Database/Oracle.vb
rename to Modules.Database/Adapters/Oracle.vb
diff --git a/Modules.Database/Database.vbproj b/Modules.Database/Database.vbproj
index d305914a..045a799c 100644
--- a/Modules.Database/Database.vbproj
+++ b/Modules.Database/Database.vbproj
@@ -93,11 +93,11 @@
   <ItemGroup>
     <Compile Include="Constants.vb" />
     <Compile Include="Exceptions.vb" />
-    <Compile Include="Firebird.vb" />
+    <Compile Include="Adapters\Firebird.vb" />
     <Compile Include="IDatabase.vb" />
-    <Compile Include="ODBC.vb" />
-    <Compile Include="Oracle.vb" />
-    <Compile Include="MSSQLServer.vb" />
+    <Compile Include="Adapters\ODBC.vb" />
+    <Compile Include="Adapters\Oracle.vb" />
+    <Compile Include="Adapters\MSSQLServer.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -113,6 +113,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="TableCache.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">
diff --git a/Modules.Database/TableCache.vb b/Modules.Database/TableCache.vb
new file mode 100644
index 00000000..28a1e39d
--- /dev/null
+++ b/Modules.Database/TableCache.vb
@@ -0,0 +1,17 @@
+Public Class TableCache
+    Private Items As New Dictionary(Of String, DataTable)
+
+    Public Function [Get](SQLCommand As String)
+        Dim oKey As String = SQLCommand.ToUpper
+        If Items.ContainsKey(oKey) Then
+            Return Items.Item(oKey)
+        Else
+
+        End If
+    End Function
+
+    Private Function SaveTable()
+
+    End Function
+
+End Class