diff --git a/components/fpspreadsheet/examples/opendocdemo/oocreated.ods b/components/fpspreadsheet/examples/opendocdemo/oocreated.ods
deleted file mode 100644
index 920846270..000000000
Binary files a/components/fpspreadsheet/examples/opendocdemo/oocreated.ods and /dev/null differ
diff --git a/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh b/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh
deleted file mode 100755
index 50f329926..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/unzipoocreated.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir oocreated
-cp -f oocreated.ods oocreated/
-cd oocreated
-unzip oocreated.ods
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/opendocdemo/unziptest.sh b/components/fpspreadsheet/examples/opendocdemo/unziptest.sh
deleted file mode 100755
index 3245ac222..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/unziptest.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir test
-cp -f test.ods test/
-cd test
-unzip test.ods
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/opendocdemo/ziptest.sh b/components/fpspreadsheet/examples/opendocdemo/ziptest.sh
deleted file mode 100755
index f9d11806a..000000000
--- a/components/fpspreadsheet/examples/opendocdemo/ziptest.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-cd test
-zip -r test.ods *
-cd ..
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/csvdemo/csvread.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/csvdemo/csvread.lpi
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
index 5d808975b..64de7ee91 100644
--- a/components/fpspreadsheet/examples/csvdemo/csvread.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
@@ -49,8 +49,8 @@
       <Filename Value="csvread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/csvdemo/csvread.lpr b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/csvdemo/csvread.lpr
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpr
diff --git a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
similarity index 91%
rename from components/fpspreadsheet/examples/csvdemo/csvwrite.lpi
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
index 1967c5dff..a9fc17a53 100644
--- a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
@@ -43,7 +43,6 @@
       <Unit1>
         <Filename Value="..\..\fpscsv.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpscsv"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -54,9 +53,8 @@
       <Filename Value="csvwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
-      <SrcPath Value=".."/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Debugging>
diff --git a/components/fpspreadsheet/examples/csvdemo/csvwrite.lpr b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/csvdemo/csvwrite.lpr
rename to components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpr
diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt b/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt
new file mode 100644
index 000000000..7f4e46891
--- /dev/null
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/readme.txt
@@ -0,0 +1,5 @@
+This demo demonstrates how to use fpspreadsheet to read and write comma-separated
+files (csv).
+
+Please run the write demo before the read demo so the required spreadsheet file
+is generated.
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel2demo/excel2read.lpi
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
index f485c578e..ef7bc8b86 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel2read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2read.lpr b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/excel2read.lpr
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpr
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel2demo/excel2write.lpi
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
index 885343b55..2daaaa4c7 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel2write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
similarity index 99%
rename from components/fpspreadsheet/examples/excel2demo/excel2write.lpr
rename to components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
index 8a5de4fe4..cd639eca9 100644
--- a/components/fpspreadsheet/examples/excel2demo/excel2write.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2write.lpr
@@ -108,7 +108,7 @@ begin
   MyWorksheet.WriteHorAlignment(5, 1, haCenter);
   MyWorksheet.WriteHorAlignment(5, 2, haRight);
 
-  // Red font, italic
+  // Various font settings
   MyWorksheet.WriteNumber(6, 0, 2014);
   MyWorksheet.WriteFont(6, 0, 'Calibri', 15, [fssItalic], scRed);
   MyWorksheet.WriteNumber(6, 1, 2015);
diff --git a/components/fpspreadsheet/examples/excel2demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel2demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel2demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel2demo/run_excel2read.bat b/components/fpspreadsheet/examples/read_write/excel2demo/run_excel2read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/run_excel2read.bat
rename to components/fpspreadsheet/examples/read_write/excel2demo/run_excel2read.bat
diff --git a/components/fpspreadsheet/examples/excel2demo/run_excel2write.bat b/components/fpspreadsheet/examples/read_write/excel2demo/run_excel2write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel2demo/run_excel2write.bat
rename to components/fpspreadsheet/examples/read_write/excel2demo/run_excel2write.bat
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel5demo/excel5read.lpi
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
index 66434812e..3d67c97c6 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel5read"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5read.lpr b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/excel5read.lpr
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpr
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel5demo/excel5write.lpi
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
index 3bcb12a40..fab06a9ec 100644
--- a/components/fpspreadsheet/examples/excel5demo/excel5write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
@@ -49,8 +49,8 @@
       <Filename Value="excel5write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel5demo/excel5write.lpr b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/excel5write.lpr
rename to components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpr
diff --git a/components/fpspreadsheet/examples/excel5demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel5demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel5demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel5demo/run_excel5read.bat b/components/fpspreadsheet/examples/read_write/excel5demo/run_excel5read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/run_excel5read.bat
rename to components/fpspreadsheet/examples/read_write/excel5demo/run_excel5read.bat
diff --git a/components/fpspreadsheet/examples/excel5demo/run_excel5write.bat b/components/fpspreadsheet/examples/read_write/excel5demo/run_excel5write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel5demo/run_excel5write.bat
rename to components/fpspreadsheet/examples/read_write/excel5demo/run_excel5write.bat
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/excel8demo/excel8read.lpi
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
index efc9f3ca5..b601d2fed 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8read.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/excel8read.lpr
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpr
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
similarity index 92%
rename from components/fpspreadsheet/examples/excel8demo/excel8write.lpi
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
index c075bc9da..3548256b0 100644
--- a/components/fpspreadsheet/examples/excel8demo/excel8write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
@@ -43,7 +43,6 @@
       <Unit1>
         <Filename Value="..\..\fpstypes.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpsTypes"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -54,8 +53,8 @@
       <Filename Value="excel8write"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Debugging>
diff --git a/components/fpspreadsheet/examples/excel8demo/excel8write.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/excel8write.lpr
rename to components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
diff --git a/components/fpspreadsheet/examples/excel8demo/readme.txt b/components/fpspreadsheet/examples/read_write/excel8demo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/readme.txt
rename to components/fpspreadsheet/examples/read_write/excel8demo/readme.txt
diff --git a/components/fpspreadsheet/examples/excel8demo/run_excel8read.bat b/components/fpspreadsheet/examples/read_write/excel8demo/run_excel8read.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/run_excel8read.bat
rename to components/fpspreadsheet/examples/read_write/excel8demo/run_excel8read.bat
diff --git a/components/fpspreadsheet/examples/excel8demo/run_excel8write.bat b/components/fpspreadsheet/examples/read_write/excel8demo/run_excel8write.bat
similarity index 100%
rename from components/fpspreadsheet/examples/excel8demo/run_excel8write.bat
rename to components/fpspreadsheet/examples/read_write/excel8demo/run_excel8write.bat
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
index 2d04e1b08..aa935037c 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
@@ -49,8 +49,8 @@
       <Filename Value="ooxmlread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
similarity index 95%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
index a69d6c0af..4865fe2d2 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlread.lpr
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpr
@@ -54,8 +54,5 @@ begin
 
   // Finalization
   MyWorkbook.Free;
-
-  WriteLn('Finished. Press [ENTER] to close...');
-  ReadLn;
 end.
 
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
index 807bd6713..f716b9b04 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="ooxmlwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
diff --git a/components/fpspreadsheet/examples/ooxmldemo/readme.txt b/components/fpspreadsheet/examples/read_write/ooxmldemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/ooxmldemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/ooxmldemo/readme.txt
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
index 85a6f863c..53df4946b 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpi
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpi
@@ -49,7 +49,7 @@
       <Filename Value="opendocread"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
+      <OtherUnitFiles Value="..\..\.."/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocread.lpr b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/opendocread.lpr
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocread.lpr
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
index 8bd769207..160804dec 100644
--- a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="opendocwrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/opendocwrite.lpr
rename to components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpr
diff --git a/components/fpspreadsheet/examples/opendocdemo/readme.txt b/components/fpspreadsheet/examples/read_write/opendocdemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/opendocdemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/opendocdemo/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitabledemo/readme.txt b/components/fpspreadsheet/examples/read_write/wikitabledemo/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/readme.txt
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitabledemo/test.wikitable_pipes b/components/fpspreadsheet/examples/read_write/wikitabledemo/test.wikitable_pipes
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/test.wikitable_pipes
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/test.wikitable_pipes
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
index b9a7adc1d..17e05b373 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
@@ -49,8 +49,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitableread.lpr
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpr
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
similarity index 93%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
index 03fb9593d..d9b14373a 100644
--- a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
@@ -49,8 +49,8 @@
       <Filename Value="wikitablewrite"/>
     </Target>
     <SearchPaths>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitabledemo/wikitablewrite.lpr
rename to components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
diff --git a/components/fpspreadsheet/examples/spready/spready.lpr b/components/fpspreadsheet/examples/spready/spready.lpr
deleted file mode 100644
index 777fb9e95..000000000
--- a/components/fpspreadsheet/examples/spready/spready.lpr
+++ /dev/null
@@ -1,21 +0,0 @@
-program spready;
-
-{$mode objfpc}{$H+}
-
-uses
-  Interfaces, // this includes the LCL widgetset
-  Forms, mainform, laz_fpspreadsheet_visual, sCSVParamsForm, sCtrls,
-  sFormatSettingsForm, sSortParamsForm, sfCurrencyForm, fpsCurrency;
-
-{$R *.res}
-
-begin
-  Application.Initialize;
-  Application.CreateForm(TMainFrm, MainFrm);
-  MainFrm.BeforeRun;
-  Application.CreateForm(TFormatSettingsForm, FormatSettingsForm);
-  Application.CreateForm(TSortParamsForm, SortParamsForm);
-  Application.CreateForm(TCurrencyForm, CurrencyForm);
-  Application.Run;
-end.
-
diff --git a/components/fpspreadsheet/examples/visual/fpschart/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/readme.txt
new file mode 100644
index 000000000..43e14a347
--- /dev/null
+++ b/components/fpspreadsheet/examples/visual/fpschart/readme.txt
@@ -0,0 +1,2 @@
+The fpschart demo shows usage of the TsWorksheetChartSource component for
+creating charts from spreadsheet data. 
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.ico b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.ico
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.ico
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
index 5c914b64d..c88fc3366 100644
--- a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpi
@@ -85,7 +85,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpr b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/fpschartsource.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/fpschartsource.lpr
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.lfm
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/readme.txt
diff --git a/components/fpspreadsheet/examples/fpschart/workbookchartsource/test-data.xlsx b/components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/workbookchartsource/test-data.xlsx
rename to components/fpspreadsheet/examples/visual/fpschart/workbookchartsource-deprecated/test-data.xlsx
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.ico b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.ico
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.ico
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
index 647c7aaef..2cd47aa05 100644
--- a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpi
+++ b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpi
@@ -66,7 +66,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="../../lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="../../../lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpr b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/fpschart.lpr
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/fpschart.lpr
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.lfm b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.lfm
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.pas b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/readme.txt b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/readme.txt
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/readme.txt
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/t1.xls b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/t1.xls
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t1.xls
diff --git a/components/fpspreadsheet/examples/fpschart/worksheetchartsource/t2.ods b/components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods
similarity index 100%
rename from components/fpspreadsheet/examples/fpschart/worksheetchartsource/t2.ods
rename to components/fpspreadsheet/examples/visual/fpschart/worksheetchartsource/t2.ods
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.ico b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.ico
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.ico
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
index 082126cb5..531d79d6c 100644
--- a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpi
@@ -81,15 +81,12 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
     </CodeGeneration>
     <Linking>
-      <Debugging>
-        <DebugInfoType Value="dsDwarf2Set"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr b/components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/demo_ctrls.lpr
rename to components/fpspreadsheet/examples/visual/fpsctrls/demo_ctrls.lpr
diff --git a/components/fpspreadsheet/examples/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/main.lfm
rename to components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
diff --git a/components/fpspreadsheet/examples/fpsctrls/main.pas b/components/fpspreadsheet/examples/visual/fpsctrls/main.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/main.pas
rename to components/fpspreadsheet/examples/visual/fpsctrls/main.pas
diff --git a/components/fpspreadsheet/examples/fpsctrls/readme.txt b/components/fpspreadsheet/examples/visual/fpsctrls/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsctrls/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.ico b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.ico
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.ico
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
similarity index 94%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
index 4b4670c60..8f6cb9564 100644
--- a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpi
@@ -56,8 +56,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpr b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/demo_ctrls.lpr
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/demo_ctrls.lpr
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/main.lfm
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.lfm
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/main.pas b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/main.pas
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/main.pas
diff --git a/components/fpspreadsheet/examples/fpsctrls_no_install/readme.txt b/components/fpspreadsheet/examples/visual/fpsctrls_no_install/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsctrls_no_install/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsctrls_no_install/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.ico
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
similarity index 97%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
index 0943006f2..2acfb6fa5 100644
--- a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpi
@@ -60,7 +60,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
diff --git a/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr b/components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr
rename to components/fpspreadsheet/examples/visual/fpsgrid/fpsgrid.lpr
diff --git a/components/fpspreadsheet/examples/fpsgrid/mainform.lfm b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
similarity index 99%
rename from components/fpspreadsheet/examples/fpsgrid/mainform.lfm
rename to components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
index ceaa87d9e..72cb06366 100644
--- a/components/fpspreadsheet/examples/fpsgrid/mainform.lfm
+++ b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 344
+  Left = 375
   Height = 649
-  Top = 127
+  Top = 185
   Width = 894
   Caption = 'fpsGrid'
   ClientHeight = 649
diff --git a/components/fpspreadsheet/examples/fpsgrid/mainform.pas b/components/fpspreadsheet/examples/visual/fpsgrid/mainform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/mainform.pas
rename to components/fpspreadsheet/examples/visual/fpsgrid/mainform.pas
diff --git a/components/fpspreadsheet/examples/fpsgrid/readme.txt b/components/fpspreadsheet/examples/visual/fpsgrid/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsgrid/readme.txt
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.ico b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.ico
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.ico
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
similarity index 96%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
index 7b39170e9..c74c17e41 100644
--- a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpi
+++ b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpi
@@ -83,8 +83,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpr b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/fpsgrid.lpr
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/fpsgrid.lpr
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.lfm b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.lfm
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.lfm
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.pas b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.pas
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/mainfrm.pas
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/mainfrm.pas
diff --git a/components/fpspreadsheet/examples/fpsgrid_no_install/readme.txt b/components/fpspreadsheet/examples/visual/fpsgrid_no_install/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/fpsgrid_no_install/readme.txt
rename to components/fpspreadsheet/examples/visual/fpsgrid_no_install/readme.txt
diff --git a/components/fpspreadsheet/examples/spready/scsvparamsform.lfm b/components/fpspreadsheet/examples/visual/shared/scsvparamsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/scsvparamsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/scsvparamsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/scsvparamsform.pas b/components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/scsvparamsform.pas
rename to components/fpspreadsheet/examples/visual/shared/scsvparamsform.pas
diff --git a/components/fpspreadsheet/examples/spready/sfcurrencyform.lfm b/components/fpspreadsheet/examples/visual/shared/sfcurrencyform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sfcurrencyform.lfm
rename to components/fpspreadsheet/examples/visual/shared/sfcurrencyform.lfm
diff --git a/components/fpspreadsheet/examples/spready/sfcurrencyform.pas b/components/fpspreadsheet/examples/visual/shared/sfcurrencyform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sfcurrencyform.pas
rename to components/fpspreadsheet/examples/visual/shared/sfcurrencyform.pas
diff --git a/components/fpspreadsheet/examples/spready/sformatsettingsform.lfm b/components/fpspreadsheet/examples/visual/shared/sformatsettingsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sformatsettingsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/sformatsettingsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/sformatsettingsform.pas b/components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sformatsettingsform.pas
rename to components/fpspreadsheet/examples/visual/shared/sformatsettingsform.pas
diff --git a/components/fpspreadsheet/examples/spready/ssortparamsform.lfm b/components/fpspreadsheet/examples/visual/shared/ssortparamsform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/ssortparamsform.lfm
rename to components/fpspreadsheet/examples/visual/shared/ssortparamsform.lfm
diff --git a/components/fpspreadsheet/examples/spready/ssortparamsform.pas b/components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/ssortparamsform.pas
rename to components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
diff --git a/components/fpspreadsheet/examples/spready/mainform.lfm b/components/fpspreadsheet/examples/visual/spready/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/spready/mainform.lfm
rename to components/fpspreadsheet/examples/visual/spready/mainform.lfm
diff --git a/components/fpspreadsheet/examples/spready/mainform.pas b/components/fpspreadsheet/examples/visual/spready/mainform.pas
similarity index 99%
rename from components/fpspreadsheet/examples/spready/mainform.pas
rename to components/fpspreadsheet/examples/visual/spready/mainform.pas
index f0c53551e..6473e6fe2 100644
--- a/components/fpspreadsheet/examples/spready/mainform.pas
+++ b/components/fpspreadsheet/examples/visual/spready/mainform.pas
@@ -1250,10 +1250,6 @@ begin
       if (ACell=nil) or (Length(ACell^.FormulaValue)=0)
         then Strings.Add('FormulaValue=')
         else Strings.Add(Format('FormulaValue="%s"', [ACell^.FormulaValue]));
-      if (ACell=nil) or (ACell^.SharedFormulaBase=nil)
-        then Strings.Add('SharedFormulaBase=')
-        else Strings.Add(Format('SharedFormulaBase=%s', [GetCellString(
-               ACell^.SharedFormulaBase^.Row, ACell^.SharedFormulaBase^.Col)]));
     end
     else
     if InspectorPageControl.ActivePage = PgSheet then
@@ -1349,7 +1345,7 @@ begin
   begin
     r := GetWorksheetRow(Row);
     c := GetWorksheetCol(Col);
-    cell := Worksheet.FindCell(row, col);
+    cell := Worksheet.FindCell(r, c);
     hasCmnt := Worksheet.HasComment(cell);
   end;
   AcCommentAdd.Enabled := not hasCmnt;
diff --git a/components/fpspreadsheet/examples/spready/readme.txt b/components/fpspreadsheet/examples/visual/spready/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/spready/readme.txt
rename to components/fpspreadsheet/examples/visual/spready/readme.txt
diff --git a/components/fpspreadsheet/examples/spready/sctrls.pas b/components/fpspreadsheet/examples/visual/spready/sctrls.pas
similarity index 100%
rename from components/fpspreadsheet/examples/spready/sctrls.pas
rename to components/fpspreadsheet/examples/visual/spready/sctrls.pas
diff --git a/components/fpspreadsheet/examples/spready/spready.ico b/components/fpspreadsheet/examples/visual/spready/spready.ico
similarity index 100%
rename from components/fpspreadsheet/examples/spready/spready.ico
rename to components/fpspreadsheet/examples/visual/spready/spready.ico
diff --git a/components/fpspreadsheet/examples/spready/spready.lpi b/components/fpspreadsheet/examples/visual/spready/spready.lpi
similarity index 84%
rename from components/fpspreadsheet/examples/spready/spready.lpi
rename to components/fpspreadsheet/examples/visual/spready/spready.lpi
index c9db6da0b..b5f9a81b2 100644
--- a/components/fpspreadsheet/examples/spready/spready.lpi
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpi
@@ -24,7 +24,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="../.."/>
+            <OtherUnitFiles Value="../..;../shared"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Linking>
@@ -45,6 +45,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
+            <OtherUnitFiles Value="..\shared"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -105,43 +106,36 @@
         <UnitName Value="mainform"/>
       </Unit1>
       <Unit2>
-        <Filename Value="scsvparamsform.pas"/>
+        <Filename Value="sctrls.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="CSVParamsForm"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sCSVParamsForm"/>
       </Unit2>
       <Unit3>
-        <Filename Value="sctrls.pas"/>
+        <Filename Value="..\..\fpscurrency.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="sformatsettingsform.pas"/>
+        <Filename Value="..\shared\scsvparamsform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormatSettingsForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sFormatsettingsForm"/>
+        <UnitName Value="scsvparamsform"/>
       </Unit4>
       <Unit5>
-        <Filename Value="ssortparamsform.pas"/>
+        <Filename Value="..\shared\sfcurrencyform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="SortParamsForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
-        <UnitName Value="sSortParamsForm"/>
+        <UnitName Value="sfcurrencyform"/>
       </Unit5>
       <Unit6>
-        <Filename Value="sfcurrencyform.pas"/>
+        <Filename Value="..\shared\sformatsettingsform.pas"/>
         <IsPartOfProject Value="True"/>
-        <ComponentName Value="CurrencyForm"/>
         <HasResources Value="True"/>
-        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="sformatsettingsform"/>
       </Unit6>
       <Unit7>
-        <Filename Value="..\..\fpscurrency.pas"/>
+        <Filename Value="..\shared\ssortparamsform.pas"/>
         <IsPartOfProject Value="True"/>
+        <HasResources Value="True"/>
+        <UnitName Value="ssortparamsform"/>
       </Unit7>
     </Units>
   </ProjectOptions>
@@ -153,8 +147,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\shared"/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
       <Options>
diff --git a/components/fpspreadsheet/examples/visual/spready/spready.lpr b/components/fpspreadsheet/examples/visual/spready/spready.lpr
new file mode 100644
index 000000000..7b98d34c1
--- /dev/null
+++ b/components/fpspreadsheet/examples/visual/spready/spready.lpr
@@ -0,0 +1,18 @@
+program spready;
+
+{$mode objfpc}{$H+}
+
+uses
+  Interfaces, // this includes the LCL widgetset
+  Forms, mainform, laz_fpspreadsheet_visual, sCtrls, fpsCurrency,
+  scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform;
+
+{$R *.res}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TMainFrm, MainFrm);
+  MainFrm.BeforeRun;
+  Application.Run;
+end.
+
diff --git a/components/fpspreadsheet/examples/wikitablemaker/readme.txt b/components/fpspreadsheet/examples/visual/wikitablemaker/readme.txt
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/readme.txt
rename to components/fpspreadsheet/examples/visual/wikitablemaker/readme.txt
diff --git a/components/fpspreadsheet/examples/wikitablemaker/synhighlighterwikitable.pas b/components/fpspreadsheet/examples/visual/wikitablemaker/synhighlighterwikitable.pas
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/synhighlighterwikitable.pas
rename to components/fpspreadsheet/examples/visual/wikitablemaker/synhighlighterwikitable.pas
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
similarity index 92%
rename from components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
index 7b1042ab4..fea474878 100644
--- a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpi
+++ b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -39,9 +39,6 @@
               </Win32>
             </Options>
           </Linking>
-          <Other>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item2>
       <Item3 Name="Release">
@@ -77,9 +74,6 @@
               </Win32>
             </Options>
           </Linking>
-          <Other>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item3>
     </BuildModes>
@@ -132,8 +126,8 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\.."/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <OtherUnitFiles Value="..\..\.."/>
+      <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -150,9 +144,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="5">
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpr b/components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpr
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wikitablemaker.lpr
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wikitablemaker.lpr
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wtmain.lfm b/components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wtmain.lfm
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.lfm
diff --git a/components/fpspreadsheet/examples/wikitablemaker/wtmain.pas b/components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.pas
similarity index 100%
rename from components/fpspreadsheet/examples/wikitablemaker/wtmain.pas
rename to components/fpspreadsheet/examples/visual/wikitablemaker/wtmain.pas