diff --git a/components/tvplanit/packages/laz_visualplanit_sqlite3.lpk b/components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
similarity index 85%
rename from components/tvplanit/packages/laz_visualplanit_sqlite3.lpk
rename to components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
index e1e97efe6..c53df4c82 100644
--- a/components/tvplanit/packages/laz_visualplanit_sqlite3.lpk
+++ b/components/tvplanit/source/addons/sqlite3/laz_visualplanit_sqlite3.lpk
@@ -4,12 +4,13 @@
     <PathDelim Value="\"/>
     <Name Value="laz_visualplanit_sqlite3"/>
     <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="W. Pamler"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <OtherUnitFiles Value="..\source"/>
+        <IncludeFiles Value="..\.."/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
@@ -17,13 +18,13 @@
     <Version Major="1" Release="4"/>
     <Files Count="2">
       <Item1>
-        <Filename Value="..\source\vpsqlite3ds.pas"/>
-        <UnitName Value="VpSQLite3DS"/>
-      </Item1>
-      <Item2>
-        <Filename Value="..\source\vpregsqlite3.pas"/>
+        <Filename Value="vpregsqlite3.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="vpregsqlite3"/>
+      </Item1>
+      <Item2>
+        <Filename Value="vpsqlite3ds.pas"/>
+        <Type Value="Include"/>
       </Item2>
     </Files>
     <RequiredPkgs Count="3">
diff --git a/components/tvplanit/source/vpregsqlite3.pas b/components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas
similarity index 100%
rename from components/tvplanit/source/vpregsqlite3.pas
rename to components/tvplanit/source/addons/sqlite3/vpregsqlite3.pas
diff --git a/components/tvplanit/source/vpregsqlite3.res b/components/tvplanit/source/addons/sqlite3/vpregsqlite3.res
similarity index 100%
rename from components/tvplanit/source/vpregsqlite3.res
rename to components/tvplanit/source/addons/sqlite3/vpregsqlite3.res
diff --git a/components/tvplanit/source/vpsqlite3ds.pas b/components/tvplanit/source/addons/sqlite3/vpsqlite3ds.pas
similarity index 100%
rename from components/tvplanit/source/vpsqlite3ds.pas
rename to components/tvplanit/source/addons/sqlite3/vpsqlite3ds.pas
diff --git a/components/tvplanit/packages/laz_visualplanit_zeos.lpk b/components/tvplanit/source/addons/zeos/laz_visualplanit_zeos.lpk
similarity index 83%
rename from components/tvplanit/packages/laz_visualplanit_zeos.lpk
rename to components/tvplanit/source/addons/zeos/laz_visualplanit_zeos.lpk
index 310e220fc..7383d0d64 100644
--- a/components/tvplanit/packages/laz_visualplanit_zeos.lpk
+++ b/components/tvplanit/source/addons/zeos/laz_visualplanit_zeos.lpk
@@ -4,13 +4,13 @@
     <PathDelim Value="\"/>
     <Name Value="laz_visualplanit_zeos"/>
     <Type Value="RunAndDesignTime"/>
+    <AddToProjectUsesSection Value="True"/>
     <Author Value="W. Pamler"/>
     <CompilerOptions>
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="..\source"/>
-        <OtherUnitFiles Value="..\source"/>
+        <IncludeFiles Value="..\.."/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
@@ -18,13 +18,13 @@
     <Version Major="1" Release="4"/>
     <Files Count="2">
       <Item1>
-        <Filename Value="..\source\vpzeosds.pas"/>
-        <UnitName Value="VpZeosDs"/>
-      </Item1>
-      <Item2>
-        <Filename Value="..\source\vpregzeos.pas"/>
+        <Filename Value="vpregzeos.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="VpRegZEOS"/>
+      </Item1>
+      <Item2>
+        <Filename Value="vpzeosds.pas"/>
+        <Type Value="Include"/>
       </Item2>
     </Files>
     <RequiredPkgs Count="3">
diff --git a/components/tvplanit/source/vpregzeos.pas b/components/tvplanit/source/addons/zeos/vpregzeos.pas
similarity index 100%
rename from components/tvplanit/source/vpregzeos.pas
rename to components/tvplanit/source/addons/zeos/vpregzeos.pas
diff --git a/components/tvplanit/source/vpregzeos.res b/components/tvplanit/source/addons/zeos/vpregzeos.res
similarity index 100%
rename from components/tvplanit/source/vpregzeos.res
rename to components/tvplanit/source/addons/zeos/vpregzeos.res
diff --git a/components/tvplanit/source/vpzeosds.pas b/components/tvplanit/source/addons/zeos/vpzeosds.pas
similarity index 100%
rename from components/tvplanit/source/vpzeosds.pas
rename to components/tvplanit/source/addons/zeos/vpzeosds.pas
diff --git a/components/tvplanit/packages/laz_visualplanit.lpk b/components/tvplanit/source/laz_visualplanit.lpk
similarity index 100%
rename from components/tvplanit/packages/laz_visualplanit.lpk
rename to components/tvplanit/source/laz_visualplanit.lpk