diff --git a/components/fpvectorial/examples/fpce_mainform.lfm b/components/fpvectorial/examples/fpcorelexplorer/fpce_mainform.lfm
similarity index 100%
rename from components/fpvectorial/examples/fpce_mainform.lfm
rename to components/fpvectorial/examples/fpcorelexplorer/fpce_mainform.lfm
diff --git a/components/fpvectorial/examples/fpce_mainform.pas b/components/fpvectorial/examples/fpcorelexplorer/fpce_mainform.pas
similarity index 100%
rename from components/fpvectorial/examples/fpce_mainform.pas
rename to components/fpvectorial/examples/fpcorelexplorer/fpce_mainform.pas
diff --git a/components/fpvectorial/examples/fpcorelexplorer.ico b/components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.ico
similarity index 100%
rename from components/fpvectorial/examples/fpcorelexplorer.ico
rename to components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.ico
diff --git a/components/fpvectorial/examples/fpcorelexplorer.lpi b/components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpcorelexplorer.lpi
rename to components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.lpi
diff --git a/components/fpvectorial/examples/fpcorelexplorer.lpr b/components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.lpr
similarity index 100%
rename from components/fpvectorial/examples/fpcorelexplorer.lpr
rename to components/fpvectorial/examples/fpcorelexplorer/fpcorelexplorer.lpr
diff --git a/components/fpvectorial/examples/fpv3d_mainform.lfm b/components/fpvectorial/examples/fpv3dviewer/fpv3d_mainform.lfm
similarity index 100%
rename from components/fpvectorial/examples/fpv3d_mainform.lfm
rename to components/fpvectorial/examples/fpv3dviewer/fpv3d_mainform.lfm
diff --git a/components/fpvectorial/examples/fpv3d_mainform.pas b/components/fpvectorial/examples/fpv3dviewer/fpv3d_mainform.pas
similarity index 100%
rename from components/fpvectorial/examples/fpv3d_mainform.pas
rename to components/fpvectorial/examples/fpv3dviewer/fpv3d_mainform.pas
diff --git a/components/fpvectorial/examples/fpv3dviewer.ico b/components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.ico
similarity index 100%
rename from components/fpvectorial/examples/fpv3dviewer.ico
rename to components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.ico
diff --git a/components/fpvectorial/examples/fpv3dviewer.lpi b/components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpv3dviewer.lpi
rename to components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.lpi
diff --git a/components/fpvectorial/examples/fpv3dviewer.lpr b/components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.lpr
similarity index 100%
rename from components/fpvectorial/examples/fpv3dviewer.lpr
rename to components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.lpr
diff --git a/components/fpvectorial/examples/fpv3dviewer.res b/components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.res
similarity index 100%
rename from components/fpvectorial/examples/fpv3dviewer.res
rename to components/fpvectorial/examples/fpv3dviewer/fpv3dviewer.res
diff --git a/components/fpvectorial/examples/fpvc_mainform.lfm b/components/fpvectorial/examples/fpvectorialconverter/fpvc_mainform.lfm
similarity index 100%
rename from components/fpvectorial/examples/fpvc_mainform.lfm
rename to components/fpvectorial/examples/fpvectorialconverter/fpvc_mainform.lfm
diff --git a/components/fpvectorial/examples/fpvc_mainform.pas b/components/fpvectorial/examples/fpvectorialconverter/fpvc_mainform.pas
similarity index 100%
rename from components/fpvectorial/examples/fpvc_mainform.pas
rename to components/fpvectorial/examples/fpvectorialconverter/fpvc_mainform.pas
diff --git a/components/fpvectorial/examples/fpvectorialconverter.ico b/components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.ico
similarity index 100%
rename from components/fpvectorial/examples/fpvectorialconverter.ico
rename to components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.ico
diff --git a/components/fpvectorial/examples/fpvectorialconverter.lpi b/components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpvectorialconverter.lpi
rename to components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.lpi
diff --git a/components/fpvectorial/examples/fpvectorialconverter.lpr b/components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.lpr
similarity index 100%
rename from components/fpvectorial/examples/fpvectorialconverter.lpr
rename to components/fpvectorial/examples/fpvectorialconverter/fpvectorialconverter.lpr
diff --git a/components/fpvectorial/examples/fpvmodifytest.lpi b/components/fpvectorial/examples/fpvmodifytest/fpvmodifytest.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpvmodifytest.lpi
rename to components/fpvectorial/examples/fpvmodifytest/fpvmodifytest.lpi
diff --git a/components/fpvectorial/examples/fpvmodifytest.pas b/components/fpvectorial/examples/fpvmodifytest/fpvmodifytest.pas
similarity index 100%
rename from components/fpvectorial/examples/fpvmodifytest.pas
rename to components/fpvectorial/examples/fpvmodifytest/fpvmodifytest.pas
diff --git a/components/fpvectorial/examples/fpvtextwritetest.lpi b/components/fpvectorial/examples/fpvtextwritetest/fpvtextwritetest.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpvtextwritetest.lpi
rename to components/fpvectorial/examples/fpvtextwritetest/fpvtextwritetest.lpi
diff --git a/components/fpvectorial/examples/fpvtextwritetest.pas b/components/fpvectorial/examples/fpvtextwritetest/fpvtextwritetest.pas
similarity index 100%
rename from components/fpvectorial/examples/fpvtextwritetest.pas
rename to components/fpvectorial/examples/fpvtextwritetest/fpvtextwritetest.pas
diff --git a/components/fpvectorial/examples/fpvtextwritetest2.lpi b/components/fpvectorial/examples/fpvtextwritetest2/fpvtextwritetest2.lpi
similarity index 100%
rename from components/fpvectorial/examples/fpvtextwritetest2.lpi
rename to components/fpvectorial/examples/fpvtextwritetest2/fpvtextwritetest2.lpi
diff --git a/components/fpvectorial/examples/fpvtextwritetest2.pas b/components/fpvectorial/examples/fpvtextwritetest2/fpvtextwritetest2.pas
similarity index 100%
rename from components/fpvectorial/examples/fpvtextwritetest2.pas
rename to components/fpvectorial/examples/fpvtextwritetest2/fpvtextwritetest2.pas
diff --git a/components/fpvectorial/examples/fpvwritetest.lpi b/components/fpvectorial/examples/fpvwritetest/fpvwritetest.lpi
similarity index 73%
rename from components/fpvectorial/examples/fpvwritetest.lpi
rename to components/fpvectorial/examples/fpvwritetest/fpvwritetest.lpi
index 0b841dc800..62c020ec75 100644
--- a/components/fpvectorial/examples/fpvwritetest.lpi
+++ b/components/fpvectorial/examples/fpvwritetest/fpvwritetest.lpi
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
         <MainUnitHasCreateFormStatements Value="False"/>
         <MainUnitHasTitleStatement Value="False"/>
+        <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="fpvwritetest"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -17,22 +17,24 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="default" Default="True"/>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\bin\xterm -T &apos;Lazarus Run Output&apos; -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -44,7 +46,6 @@
       <Unit0>
         <Filename Value="fpvwritetest.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpvwritetest"/>
       </Unit0>
     </Units>
   </ProjectOptions>
@@ -58,12 +59,11 @@
       <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf3"/>
+      </Debugging>
+    </Linking>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">
diff --git a/components/fpvectorial/examples/fpvwritetest.pas b/components/fpvectorial/examples/fpvwritetest/fpvwritetest.pas
similarity index 97%
rename from components/fpvectorial/examples/fpvwritetest.pas
rename to components/fpvectorial/examples/fpvwritetest/fpvwritetest.pas
index ee207434a5..11164f07bc 100644
--- a/components/fpvectorial/examples/fpvwritetest.pas
+++ b/components/fpvectorial/examples/fpvwritetest/fpvwritetest.pas
@@ -106,7 +106,7 @@ begin
     // text_europen     One text testing european languages at (20, 20)
     Page.Clear;
     Page.AddText(20, 20, 0, '20, 20 Mówić, cześć, Włosku, Parabéns, Assunção, Correções.');
-    Vec.WriteToFile('text_europen' + cExtension, cFormat);
+    Vec.WriteToFile('text_european' + cExtension, cFormat);
 
     // text_asian       One text testing asian languages at (30, 30)
     Page.Clear;
@@ -129,7 +129,7 @@ begin
     Page.AddBezierToPath(10, 20, 20, 20, 20, 10);
     Page.AddLineToPath(30, 0);
     Page.EndPath();
-    Page.AddText(10, 10, 0, '10,10 Some text in english.');
+    Page.AddText(10, 10, 0, '10, 10 Some text in english.');
     Page.AddText(20, 20, 0, '20, 20 Mówić, cześć, Włosku, Parabéns.');
     Page.AddText(30, 30, 0, '30, 30 森林，是一个高密');
     Vec.WriteToFile('multi_test_1' + cExtension, cFormat);
diff --git a/components/fpvectorial/examples/wmf_mainform.lfm b/components/fpvectorial/examples/wmfviewer/wmf_mainform.lfm
similarity index 100%
rename from components/fpvectorial/examples/wmf_mainform.lfm
rename to components/fpvectorial/examples/wmfviewer/wmf_mainform.lfm
diff --git a/components/fpvectorial/examples/wmf_mainform.pas b/components/fpvectorial/examples/wmfviewer/wmf_mainform.pas
similarity index 100%
rename from components/fpvectorial/examples/wmf_mainform.pas
rename to components/fpvectorial/examples/wmfviewer/wmf_mainform.pas
diff --git a/components/fpvectorial/examples/wmfviewer.lpi b/components/fpvectorial/examples/wmfviewer/wmfviewer.lpi
similarity index 100%
rename from components/fpvectorial/examples/wmfviewer.lpi
rename to components/fpvectorial/examples/wmfviewer/wmfviewer.lpi
diff --git a/components/fpvectorial/examples/wmfviewer.lpr b/components/fpvectorial/examples/wmfviewer/wmfviewer.lpr
similarity index 100%
rename from components/fpvectorial/examples/wmfviewer.lpr
rename to components/fpvectorial/examples/wmfviewer/wmfviewer.lpr