diff --git a/components/tvplanit/examples/fulldemo/mormotdatamodule.lfm b/components/tvplanit/examples/mormot/fulldemo/mormotdatamodule.lfm
similarity index 100%
rename from components/tvplanit/examples/fulldemo/mormotdatamodule.lfm
rename to components/tvplanit/examples/mormot/fulldemo/mormotdatamodule.lfm
diff --git a/components/tvplanit/examples/fulldemo/mormotdatamodule.pas b/components/tvplanit/examples/mormot/fulldemo/mormotdatamodule.pas
similarity index 98%
rename from components/tvplanit/examples/fulldemo/mormotdatamodule.pas
rename to components/tvplanit/examples/mormot/fulldemo/mormotdatamodule.pas
index e0b5d5d45..df9759a4b 100644
--- a/components/tvplanit/examples/fulldemo/mormotdatamodule.pas
+++ b/components/tvplanit/examples/mormot/fulldemo/mormotdatamodule.pas
@@ -21,7 +21,7 @@ type
   public
     Datastore: TVpmORMotDatastore;
     constructor Create(AOwner: TComponent); override;
-    destructor Destroy;
+    destructor Destroy; override;
   end;
 
 var
diff --git a/components/tvplanit/examples/fulldemo/mormotdemo.lpi b/components/tvplanit/examples/mormot/fulldemo/mormotdemo.lpi
similarity index 76%
rename from components/tvplanit/examples/fulldemo/mormotdemo.lpi
rename to components/tvplanit/examples/mormot/fulldemo/mormotdemo.lpi
index c70d57c71..e1df65da2 100644
--- a/components/tvplanit/examples/fulldemo/mormotdemo.lpi
+++ b/components/tvplanit/examples/mormot/fulldemo/mormotdemo.lpi
@@ -39,7 +39,7 @@
         <PackageName Value="LCL"/>
       </Item3>
     </RequiredPackages>
-    <Units Count="5">
+    <Units Count="10">
       <Unit0>
         <Filename Value="mormotdemo.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -70,6 +70,28 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="DataModule"/>
       </Unit4>
+      <Unit5>
+        <Filename Value="..\..\fulldemo\demomain.lfm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit5>
+      <Unit6>
+        <Filename Value="..\..\fulldemo\demomain.pas"/>
+        <IsPartOfProject Value="True"/>
+        <HasResources Value="True"/>
+      </Unit6>
+      <Unit7>
+        <Filename Value="..\..\fulldemo\ExVpRptSetup.lfm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="..\..\fulldemo\ExVpRptSetup.pas"/>
+        <IsPartOfProject Value="True"/>
+        <HasResources Value="True"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="..\..\fulldemo\sound.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -79,8 +101,8 @@
       <Filename Value="mormotdemo"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir);..\mormot\mORMotSourceHere;..\..\source"/>
-      <OtherUnitFiles Value="..\mormot;..\mormot\mORMotSourceHere;..\mormot\mORMotSourceHere\SQLite3"/>
+      <IncludeFiles Value="$(ProjOutDir);..\mORMotSourceHere;..\..\..\source"/>
+      <OtherUnitFiles Value="..;..\mORMotSourceHere;..\mORMotSourceHere\SQLite3;..\..\fulldemo"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
@@ -95,9 +117,6 @@
     </Linking>
     <Other>
       <CustomOptions Value="-dMORMOT"/>
-      <OtherDefines Count="1">
-        <Define0 Value="MORMOT"/>
-      </OtherDefines>
     </Other>
   </CompilerOptions>
   <Debugging>
diff --git a/components/tvplanit/examples/fulldemo/mormotdemo.lpr b/components/tvplanit/examples/mormot/fulldemo/mormotdemo.lpr
similarity index 100%
rename from components/tvplanit/examples/fulldemo/mormotdemo.lpr
rename to components/tvplanit/examples/mormot/fulldemo/mormotdemo.lpr
diff --git a/components/tvplanit/examples/readme.txt b/components/tvplanit/examples/readme.txt
index c098eaf39..fd2403808 100644
--- a/components/tvplanit/examples/readme.txt
+++ b/components/tvplanit/examples/readme.txt
@@ -17,6 +17,9 @@ VisualPlanIt components can be applied.
   
 - gadgets: demonstrates usage of TVpClock and TVpLEDDisplay
 
+- mormot: demonstrates cooperation of VisualPlanIt with mORMot. The folder 
+  contains a dedicated mORMot datastore and a server and simple client project.
+
 - navbar: demonstrates usage of TVpNavBar
 
 - runtime: a simple demo in which components are created at runtime. Does not
diff --git a/components/tvplanit/source/vpconst.pas b/components/tvplanit/source/vpconst.pas
index d0f3ddffd..5b2db2128 100644
--- a/components/tvplanit/source/vpconst.pas
+++ b/components/tvplanit/source/vpconst.pas
@@ -48,7 +48,7 @@ uses
 
 const
   BuildTime = {$I %DATE%} + {$I %TIME}; //'09/13/2002 09:25 AM';
-  VpVersionStr = 'v1.04';    {Visual PlanIt library version}
+  VpVersionStr = 'v1.05';    {Visual PlanIt library version}
   VpProductName = 'Visual PlanIt';
 
   BorderStyles    : array[TBorderStyle] of LongInt =