Updated installation.pdf

Assets/Data/HighResPack-Readme.txt

@@ -1,16 +0,0 @@
-High-Resolution resources pack for GLScene "Earth" demo.
-
-This archive contains high-resolution texture backs and
-stars database for the GLScene "Earth" demo. Place the
-files in the demo's directory, and hit 'H' in the demo
-to load them.
-
-The files are individually tested in the demo, so if you 
-don't want to load one of the high-resolution resources
-(to reduce memory requirements or performance impact for 
-instance), just delete or rename the corresponding file.
-
-See the Demo's main Readme.txt for further details and credits.
-
-Eric Grange
-http://glscene.org

Examples/AdvDemos/GLSViewer/GLSViewerD.ini

@@ -0,0 +1,4 @@
+[GLOptions]
+CheckBoxAxis=1
+RadioGroupLanguage=25
+PanelBackground=0

Examples/Demos/utilities/ArchiveEdit/fMainD.pas

@@ -35,7 +35,7 @@ uses
   GLS.CompositeImage,
 
   GLS.FileJPEG,
-  GLS.FilePAK,
+  GLS.PAKArchive,
   GLS.FileZLIB,
 
   GLS.FileMS3D,

Examples/Demos/utilities/ArchiverDemo/Archiver.dproj

@@ -1,162 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <ProjectGuid>{40D07BF2-AD95-43C1-B27E-AD8E67D9A392}</ProjectGuid>
-        <MainSource>Archiver.dpr</MainSource>
-        <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>3</TargetedPlatforms>
-        <AppType>Application</AppType>
-        <FrameworkType>VCL</FrameworkType>
-        <ProjectVersion>19.4</ProjectVersion>
-        <Platform Condition="'$(Platform)'==''">Win32</Platform>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
-        <Base_Win32>true</Base_Win32>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
-        <Base_Win64>true</Base_Win64>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-        <Cfg_1>true</Cfg_1>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
-        <Cfg_1_Win64>true</Cfg_1_Win64>
-        <CfgParent>Cfg_1</CfgParent>
-        <Cfg_1>true</Cfg_1>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-        <Cfg_2>true</Cfg_2>
-        <CfgParent>Base</CfgParent>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
-        <Cfg_2_Win32>true</Cfg_2_Win32>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
-        <Cfg_2_Win64>true</Cfg_2_Win64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base)'!=''">
-        <DCC_N>false</DCC_N>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
-        <VerInfo_Locale>1049</VerInfo_Locale>
-        <DCC_E>false</DCC_E>
-        <DCC_S>false</DCC_S>
-        <DCC_ImageBase>00400000</DCC_ImageBase>
-        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-        <DCC_F>false</DCC_F>
-        <SanitizedProjectName>Archiver</SanitizedProjectName>
-        <DCC_K>false</DCC_K>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win32)'!=''">
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
-        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
-        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
-        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1)'!=''">
-        <DCC_DebugInformation>0</DCC_DebugInformation>
-        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2)'!=''">
-        <DCC_Optimize>false</DCC_Optimize>
-        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <BT_BuildType>Debug</BT_BuildType>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
-        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
-        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
-        <BT_BuildType>Debug</BT_BuildType>
-        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
-    </PropertyGroup>
-    <ItemGroup>
-        <DelphiCompile Include="$(MainSource)">
-            <MainSource>MainSource</MainSource>
-        </DelphiCompile>
-        <DCCReference Include="main.pas"/>
-        <BuildConfiguration Include="Base">
-            <Key>Base</Key>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Release">
-            <Key>Cfg_1</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-        <BuildConfiguration Include="Debug">
-            <Key>Cfg_2</Key>
-            <CfgParent>Base</CfgParent>
-        </BuildConfiguration>
-    </ItemGroup>
-    <ProjectExtensions>
-        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-        <Borland.ProjectType/>
-        <BorlandProject>
-            <Delphi.Personality>
-                <Source>
-                    <Source Name="MainSource">Archiver.dpr</Source>
-                </Source>
-                <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-                </Excluded_Packages>
-            </Delphi.Personality>
-            <Platforms>
-                <Platform value="Win32">True</Platform>
-                <Platform value="Win64">True</Platform>
-            </Platforms>
-        </BorlandProject>
-        <ProjectFileVersion>12</ProjectFileVersion>
-    </ProjectExtensions>
-    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
-    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
-</Project>

Examples/Demos/utilities/ArchiverDemo/Archiver.dpr → Examples/Demos/utilities/ArchiverDemo/ArchiverD.dpr

@@ -1,7 +1,8 @@
-program Archiver;
+program ArchiverD;
 
 uses
-  Forms, Main in 'main.pas';
+  Forms,
+  fArchiverD in 'fArchiverD.pas';
 
 {$R *.res}
 

Examples/Demos/utilities/ArchiverDemo/ArchiverD.dproj

@@ -0,0 +1,981 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{40D07BF2-AD95-43C1-B27E-AD8E67D9A392}</ProjectGuid>
+        <MainSource>ArchiverD.dpr</MainSource>
+        <Base>True</Base>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <TargetedPlatforms>3</TargetedPlatforms>
+        <AppType>Application</AppType>
+        <FrameworkType>VCL</FrameworkType>
+        <ProjectVersion>19.4</ProjectVersion>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+        <Cfg_1_Win64>true</Cfg_1_Win64>
+        <CfgParent>Cfg_1</CfgParent>
+        <Cfg_1>true</Cfg_1>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+        <Cfg_2_Win64>true</Cfg_2_Win64>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <DCC_N>false</DCC_N>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
+        <VerInfo_Locale>1049</VerInfo_Locale>
+        <DCC_E>false</DCC_E>
+        <DCC_S>false</DCC_S>
+        <DCC_ImageBase>00400000</DCC_ImageBase>
+        <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_F>false</DCC_F>
+        <SanitizedProjectName>ArchiverD</SanitizedProjectName>
+        <DCC_K>false</DCC_K>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
+        <UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_DebugInformation>0</DCC_DebugInformation>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_Optimize>false</DCC_Optimize>
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <BT_BuildType>Debug</BT_BuildType>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+        <VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
+        <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
+        <Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
+        <DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
+        <BT_BuildType>Debug</BT_BuildType>
+        <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="fArchiverD.pas"/>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">ArchiverD.dpr</Source>
+                </Source>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k240.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp240.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k240.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp240.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
+            </Delphi.Personality>
+            <Platforms>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">True</Platform>
+            </Platforms>
+            <Deployment Version="3">
+                <DeployFile LocalName="Win32\Debug\ArchiverD.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
+                        <RemoteName>ArchiverD.exe</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
+                <DeployClass Name="AdditionalDebugSymbols">
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidClasses">
+                    <Platform Name="Android">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>classes</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidFileProvider">
+                    <Platform Name="Android">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\xml</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidGDBServer">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeArmeabiv7aFile">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidLibnativeMipsFile">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\mips</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidServiceOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashImageDef">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStyles">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="AndroidSplashStylesV21">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values-v21</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Colors">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_DefaultAppIcon">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon144">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon192">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-ldpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_LauncherIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon24">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-mdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon36">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-hdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon48">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon72">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_NotificationIcon96">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xxxhdpi</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage426">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-small</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage470">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-normal</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage640">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-large</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_SplashImage960">
+                    <Platform Name="Android">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\drawable-xlarge</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="Android_Strings">
+                    <Platform Name="Android">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>res\values</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DebugSymbols">
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyFramework">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.framework</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="DependencyPackage">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.bpl</Extensions>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="File">
+                    <Platform Name="Android">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\Resources\StartUp\</RemoteDir>
+                        <Operation>0</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iOS_AppStore1024">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon152">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon167">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_SpotLight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon180">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Launch3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark2x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_LaunchDark3x">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification60">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting87">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectAndroidManifest">
+                    <Platform Name="Android">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceDebug">
+                    <Platform Name="iOSDevice32">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSEntitlements">
+                    <Platform Name="iOSDevice32">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSInfoPList">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSLaunchScreen">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectiOSResource">
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXDebug">
+                    <Platform Name="OSX64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXEntitlements">
+                    <Platform Name="OSX32">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>..\</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXInfoPList">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOSXResource">
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\Resources</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="ProjectOutput">
+                    <Platform Name="Android">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\arm64-v8a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Linux64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSX64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="OSXARM64">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectOutput_Android32">
+                    <Platform Name="Android64">
+                        <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="ProjectUWPManifest">
+                    <Platform Name="Win32">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo150">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="UWP_DelphiLogo44">
+                    <Platform Name="Win32">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="Win64">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+            </Deployment>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+    <Import Project="$(MSBuildProjectName).deployproj" Condition="Exists('$(MSBuildProjectName).deployproj')"/>
+</Project>

Examples/Demos/utilities/ArchiverDemo/main.pas → Examples/Demos/utilities/ArchiverDemo/fArchiverD.pas

@@ -1,4 +1,4 @@
-unit Main;
+unit fArchiverD;
 
 interface
 

Examples/Demos/utilities/utilities.groupproj

@@ -3,6 +3,9 @@
         <ProjectGuid>{42939014-896A-4EC3-A943-FC10829CCD36}</ProjectGuid>
     </PropertyGroup>
     <ItemGroup>
+        <Projects Include="ArchiverDemo\ArchiverD.dproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="ArchiveEdit\ArchiveEditD.dproj">
             <Dependencies/>
         </Projects>
@@ -47,6 +50,15 @@
             <Default.Personality/>
         </BorlandProject>
     </ProjectExtensions>
+    <Target Name="ArchiverD">
+        <MSBuild Projects="ArchiverDemo\ArchiverD.dproj"/>
+    </Target>
+    <Target Name="ArchiverD:Clean">
+        <MSBuild Projects="ArchiverDemo\ArchiverD.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="ArchiverD:Make">
+        <MSBuild Projects="ArchiverDemo\ArchiverD.dproj" Targets="Make"/>
+    </Target>
     <Target Name="ArchiveEditD">
         <MSBuild Projects="ArchiveEdit\ArchiveEditD.dproj"/>
     </Target>
@@ -156,13 +168,13 @@
         <MSBuild Projects="ScreenSaver\ScreenSaverC.cbproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="ArchiveEditD;GLInfosD;FontgenD;FontgenC;HTFViewerD;JoystickD;KeymapD;LanguageD;RecorderD;TerrainPackD;ScreenSaverD;ScreenSaverC"/>
+        <CallTarget Targets="ArchiverD;ArchiveEditD;GLInfosD;FontgenD;FontgenC;HTFViewerD;JoystickD;KeymapD;LanguageD;RecorderD;TerrainPackD;ScreenSaverD;ScreenSaverC"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="ArchiveEditD:Clean;GLInfosD:Clean;FontgenD:Clean;FontgenC:Clean;HTFViewerD:Clean;JoystickD:Clean;KeymapD:Clean;LanguageD:Clean;RecorderD:Clean;TerrainPackD:Clean;ScreenSaverD:Clean;ScreenSaverC:Clean"/>
+        <CallTarget Targets="ArchiverD:Clean;ArchiveEditD:Clean;GLInfosD:Clean;FontgenD:Clean;FontgenC:Clean;HTFViewerD:Clean;JoystickD:Clean;KeymapD:Clean;LanguageD:Clean;RecorderD:Clean;TerrainPackD:Clean;ScreenSaverD:Clean;ScreenSaverC:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="ArchiveEditD:Make;GLInfosD:Make;FontgenD:Make;FontgenC:Make;HTFViewerD:Make;JoystickD:Make;KeymapD:Make;LanguageD:Make;RecorderD:Make;TerrainPackD:Make;ScreenSaverD:Make;ScreenSaverC:Make"/>
+        <CallTarget Targets="ArchiverD:Make;ArchiveEditD:Make;GLInfosD:Make;FontgenD:Make;FontgenC:Make;HTFViewerD:Make;JoystickD:Make;KeymapD:Make;LanguageD:Make;RecorderD:Make;TerrainPackD:Make;ScreenSaverD:Make;ScreenSaverC:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Packages/GLScene.groupproj

@@ -33,12 +33,6 @@
         <Projects Include="GLScene_GPU_DT.dproj">
             <Dependencies/>
         </Projects>
-        <Projects Include="GLScene_SDL_RT.dproj">
-            <Dependencies/>
-        </Projects>
-        <Projects Include="GLScene_SDL_DT.dproj">
-            <Dependencies/>
-        </Projects>
     </ItemGroup>
     <ProjectExtensions>
         <Borland.Personality>Default.Personality.12</Borland.Personality>
@@ -137,32 +131,14 @@
     <Target Name="GLScene_GPU_DT:Make">
         <MSBuild Projects="GLScene_GPU_DT.dproj" Targets="Make"/>
     </Target>
-    <Target Name="GLScene_SDL_RT">
-        <MSBuild Projects="GLScene_SDL_RT.dproj"/>
-    </Target>
-    <Target Name="GLScene_SDL_RT:Clean">
-        <MSBuild Projects="GLScene_SDL_RT.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="GLScene_SDL_RT:Make">
-        <MSBuild Projects="GLScene_SDL_RT.dproj" Targets="Make"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT">
-        <MSBuild Projects="GLScene_SDL_DT.dproj"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT:Clean">
-        <MSBuild Projects="GLScene_SDL_DT.dproj" Targets="Clean"/>
-    </Target>
-    <Target Name="GLScene_SDL_DT:Make">
-        <MSBuild Projects="GLScene_SDL_DT.dproj" Targets="Make"/>
-    </Target>
     <Target Name="Build">
-        <CallTarget Targets="GLScene_RT;GLScene_DT;GLScene_Sounds_RT;GLScene_Sounds_DT;GLScene_Physics_RT;GLScene_Physics_DT;GLScene_Cg_RT;GLScene_Cg_DT;GLScene_GPU_RT;GLScene_GPU_DT;GLScene_SDL_RT;GLScene_SDL_DT"/>
+        <CallTarget Targets="GLScene_RT;GLScene_DT;GLScene_Sounds_RT;GLScene_Sounds_DT;GLScene_Physics_RT;GLScene_Physics_DT;GLScene_Cg_RT;GLScene_Cg_DT;GLScene_GPU_RT;GLScene_GPU_DT"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="GLScene_RT:Clean;GLScene_DT:Clean;GLScene_Sounds_RT:Clean;GLScene_Sounds_DT:Clean;GLScene_Physics_RT:Clean;GLScene_Physics_DT:Clean;GLScene_Cg_RT:Clean;GLScene_Cg_DT:Clean;GLScene_GPU_RT:Clean;GLScene_GPU_DT:Clean;GLScene_SDL_RT:Clean;GLScene_SDL_DT:Clean"/>
+        <CallTarget Targets="GLScene_RT:Clean;GLScene_DT:Clean;GLScene_Sounds_RT:Clean;GLScene_Sounds_DT:Clean;GLScene_Physics_RT:Clean;GLScene_Physics_DT:Clean;GLScene_Cg_RT:Clean;GLScene_Cg_DT:Clean;GLScene_GPU_RT:Clean;GLScene_GPU_DT:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="GLScene_RT:Make;GLScene_DT:Make;GLScene_Sounds_RT:Make;GLScene_Sounds_DT:Make;GLScene_Physics_RT:Make;GLScene_Physics_DT:Make;GLScene_Cg_RT:Make;GLScene_Cg_DT:Make;GLScene_GPU_RT:Make;GLScene_GPU_DT:Make;GLScene_SDL_RT:Make;GLScene_SDL_DT:Make"/>
+        <CallTarget Targets="GLScene_RT:Make;GLScene_DT:Make;GLScene_Sounds_RT:Make;GLScene_Sounds_DT:Make;GLScene_Physics_RT:Make;GLScene_Physics_DT:Make;GLScene_Cg_RT:Make;GLScene_Cg_DT:Make;GLScene_GPU_RT:Make;GLScene_GPU_DT:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

Packages/GLScene_Cg_DT.dpk

@@ -38,6 +38,6 @@ requires
   GLScene_DT;
 
 contains
-  Cg.Register in '..\Source\Cg.Register.pas';
+  Cg.Register in '..\Source\Vcl\Cg.Register.pas';
 
 end.

Packages/GLScene_Cg_DT.dproj

@@ -113,7 +113,7 @@
         <DCCReference Include="VclSmp.dcp"/>
         <DCCReference Include="GLScene_Cg_RT.dcp"/>
         <DCCReference Include="GLScene_DT.dcp"/>
-        <DCCReference Include="..\Source\Cg.Register.pas"/>
+        <DCCReference Include="..\Source\Vcl\Cg.Register.pas"/>
         <RcCompile Include="..\Resources\GLSceneShaders.rc">
             <Form>GLSceneShaders.res</Form>
         </RcCompile>
@@ -166,12 +166,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

Packages/GLScene_Cg_RT.dpk

@@ -36,8 +36,8 @@ requires
   GLScene_RT;
 
 contains
-  Cg.GL in '..\Source\Common\Cg.GL.pas',
-  Cg.Import in '..\Source\Common\Cg.Import.pas',
+  Cg.GL in '..\Source\Cg.GL.pas',
+  Cg.Import in '..\Source\Cg.Import.pas',
   Cg.Shader in '..\Source\Vcl\Cg.Shader.pas',
   Cg.BombShader in '..\Source\Vcl\Cg.BombShader.pas',
   Cg.PostTransformationShader in '..\Source\Vcl\Cg.PostTransformationShader.pas';

Packages/GLScene_Cg_RT.dproj

@@ -125,8 +125,8 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\Common\Cg.GL.pas"/>
-        <DCCReference Include="..\Source\Common\Cg.Import.pas"/>
+        <DCCReference Include="..\Source\Cg.GL.pas"/>
+        <DCCReference Include="..\Source\Cg.Import.pas"/>
         <DCCReference Include="..\Source\Vcl\Cg.Shader.pas"/>
         <DCCReference Include="..\Source\Vcl\Cg.BombShader.pas"/>
         <DCCReference Include="..\Source\Vcl\Cg.PostTransformationShader.pas"/>

Packages/GLScene_DWS_DT.dpk

@@ -37,6 +37,6 @@ requires
   GLScene_DWS_rt;
 
 contains
-  DWS.Scene in '..\Source\VCL\DWS.Scene.pas';
+  DWS.Scene in '..\Source\Vcl\DWS.Scene.pas';
 
 end.

Packages/GLScene_DWS_DT.dproj

@@ -100,8 +100,8 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="GLScene_DWS_RT.dcp"/>
-        <DCCReference Include="..\Source\VCL\DWS.Scene.pas"/>
+        <DCCReference Include="GLScene_DWS_rt.dcp"/>
+        <DCCReference Include="..\Source\Vcl\DWS.Scene.pas"/>
         <RcCompile Include="D:\Resources\GLSceneDWS.rc">
             <Form>GLSceneDWS.res</Form>
         </RcCompile>

Packages/GLScene_DWS_RT.dpk

@@ -36,12 +36,12 @@ requires
   DWS.RunTime;
 
 contains
-  Pythons.Script in '..\Source\VCL\Pythons.Script.pas',
-  DWS.Classes in '..\Source\VCL\DWS.Classes.pas',
-  DWS.HelperFunc in '..\Source\VCL\DWS.HelperFunc.pas',
-  DWS.Objects in '..\Source\VCL\DWS.Objects.pas',
-  DWS.OpenGL in '..\Source\VCL\DWS.OpenGL.pas',
-  DWS.Script in '..\Source\VCL\DWS.Script.pas',
-  DWS.VectorGeometry in '..\Source\VCL\DWS.VectorGeometry.pas';
+  Pythons.Script in '..\Source\Vcl\Pythons.Script.pas',
+  DWS.Classes in '..\Source\Vcl\DWS.Classes.pas',
+  DWS.HelperFunc in '..\Source\Vcl\DWS.HelperFunc.pas',
+  DWS.Objects in '..\Source\Vcl\DWS.Objects.pas',
+  DWS.OpenGL in '..\Source\Vcl\DWS.OpenGL.pas',
+  DWS.Script in '..\Source\Vcl\DWS.Script.pas',
+  DWS.VectorGeometry in '..\Source\Vcl\DWS.VectorGeometry.pas';
 
 end.

Packages/GLScene_DWS_RT.dproj

@@ -144,12 +144,13 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
         <DCCReference Include="DWS.RunTime.dcp"/>
-        <DCCReference Include="..\Source\VCL\DWS.Classes.pas"/>
-        <DCCReference Include="..\Source\VCL\DWS.HelperFunc.pas"/>
-        <DCCReference Include="..\Source\VCL\DWS.Objects.pas"/>
-        <DCCReference Include="..\Source\VCL\DWS.OpenGL.pas"/>
-        <DCCReference Include="..\Source\VCL\DWS.Script.pas"/>
-        <DCCReference Include="..\Source\VCL\DWS.VectorGeometry.pas"/>
+        <DCCReference Include="..\Source\Vcl\Pythons.Script.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.Classes.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.HelperFunc.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.Objects.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.OpenGL.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.Script.pas"/>
+        <DCCReference Include="..\Source\Vcl\DWS.VectorGeometry.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GLScene_GPU_DT.dpk

@@ -39,8 +39,8 @@ requires
   GLScene_GPU_RT;
 
 contains
-  CUDA.PropEditors in '..\Source\CUDA.PropEditors.pas',
-  CUDA.Register in '..\Source\CUDA.Register.pas',
-  CUDA.EditorFm in '..\Source\CUDA.EditorFm.pas';
+  CUDA.PropEditors in '..\Source\Vcl\CUDA.PropEditors.pas',
+  CUDA.Register in '..\Source\Vcl\CUDA.Register.pas',
+  CUDA.EditorFm in '..\Source\Vcl\CUDA.EditorFm.pas';
 
 end.

Packages/GLScene_GPU_DT.dproj

@@ -114,9 +114,9 @@
         <DCCReference Include="VclSmp.dcp"/>
         <DCCReference Include="GLScene_DT.dcp"/>
         <DCCReference Include="GLScene_GPU_RT.dcp"/>
-        <DCCReference Include="..\Source\CUDA.PropEditors.pas"/>
-        <DCCReference Include="..\Source\CUDA.Register.pas"/>
-        <DCCReference Include="..\Source\CUDA.EditorFm.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.PropEditors.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.Register.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.EditorFm.pas"/>
         <RcCompile Include="..\Resources\GLSceneGPU.rc">
             <Form>GLSceneGPU.res</Form>
         </RcCompile>

Packages/GLScene_GPU_RT.dpk

@@ -37,22 +37,22 @@ requires
   GLScene_RT;
 
 contains
-  GLS.FilePGM in '..\Source\GLS.FilePGM.pas',
-  CUDA.APIComps in '..\Source\CUDA.APIComps.pas',
-  CUDA.Import in '..\Source\Common\CUDA.Import.pas',
-  CUDA.Utility in '..\Source\Common\CUDA.Utility.pas',
-  CUDA.ParallelPrimitives in '..\Source\Common\CUDA.ParallelPrimitives.pas',
-  CUDA.Runtime in '..\Source\Common\CUDA.Runtime.pas',
-  CUDA.FourierTransform in '..\Source\Common\CUDA.FourierTransform.pas',
-  CUDA.Compiler in '..\Source\CUDA.Compiler.pas',
-  CUDA.Context in '..\Source\CUDA.Context.pas',
-  CUDA.FFTPlan in '..\Source\CUDA.FFTPlan.pas',
-  CUDA.Graphics in '..\Source\CUDA.Graphics.pas',
-  CUDA.Parser in '..\Source\Common\CUDA.Parser.pas',
-  CUDA.DataAccess in '..\Source\Common\CUDA.DataAccess.pas',
-  OpenCL.Import in '..\Source\Common\OpenCL.Import.pas',
-  OpenCL.GL in '..\Source\Common\OpenCL.GL.pas',
-  OpenCL.Platform in '..\Source\Common\OpenCL.Platform.pas';
+  CUDA.Import in '..\Source\CUDA.Import.pas',
+  OpenCL.Platform in '..\Source\OpenCL.Platform.pas',
+  OpenCL.Import in '..\Source\OpenCL.Import.pas',
+  CUDA.Parser in '..\Source\CUDA.Parser.pas',
+  CUDA.DataAccess in '..\Source\CUDA.DataAccess.pas',
+  OpenCL.GL in '..\Source\OpenCL.GL.pas',
+  CUDA.Utility in '..\Source\CUDA.Utility.pas',
+  CUDA.ParallelPrimitives in '..\Source\CUDA.ParallelPrimitives.pas',
+  CUDA.Runtime in '..\Source\CUDA.Runtime.pas',
+  CUDA.FourierTransform in '..\Source\CUDA.FourierTransform.pas',
+  CUDA.Compiler in '..\Source\Vcl\CUDA.Compiler.pas',
+  CUDA.Context in '..\Source\Vcl\CUDA.Context.pas',
+  CUDA.FFTPlan in '..\Source\Vcl\CUDA.FFTPlan.pas',
+  CUDA.Graphics in '..\Source\Vcl\CUDA.Graphics.pas',
+  GLS.FilePGM in '..\Source\Vcl\GLS.FilePGM.pas',
+  CUDA.APIComps in '..\Source\Vcl\CUDA.APIComps.pas';
 
 end.
 

Packages/GLScene_GPU_RT.dproj

@@ -123,22 +123,22 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\GLS.FilePGM.pas"/>
-        <DCCReference Include="..\Source\CUDA.APIComps.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Import.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Utility.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.ParallelPrimitives.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Runtime.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.FourierTransform.pas"/>
-        <DCCReference Include="..\Source\CUDA.Compiler.pas"/>
-        <DCCReference Include="..\Source\CUDA.Context.pas"/>
-        <DCCReference Include="..\Source\CUDA.FFTPlan.pas"/>
-        <DCCReference Include="..\Source\CUDA.Graphics.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Parser.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.DataAccess.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.Import.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.GL.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Source\CUDA.Import.pas"/>
+        <DCCReference Include="..\Source\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Source\OpenCL.Import.pas"/>
+        <DCCReference Include="..\Source\CUDA.Parser.pas"/>
+        <DCCReference Include="..\Source\CUDA.DataAccess.pas"/>
+        <DCCReference Include="..\Source\OpenCL.GL.pas"/>
+        <DCCReference Include="..\Source\CUDA.Utility.pas"/>
+        <DCCReference Include="..\Source\CUDA.ParallelPrimitives.pas"/>
+        <DCCReference Include="..\Source\CUDA.Runtime.pas"/>
+        <DCCReference Include="..\Source\CUDA.FourierTransform.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.Compiler.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.Context.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.FFTPlan.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.Graphics.pas"/>
+        <DCCReference Include="..\Source\Vcl\GLS.FilePGM.pas"/>
+        <DCCReference Include="..\Source\Vcl\CUDA.APIComps.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GLScene_Physics_DT.dpk

@@ -37,7 +37,7 @@ requires
   GLScene_Physics_RT;
 
 contains
-  Physics.Register in '..\Source\Physics.Register.pas';
+  Physics.Register in '..\Source\Vcl\Physics.Register.pas';
 
 end.
 

Packages/GLScene_Physics_DT.dproj

@@ -111,7 +111,7 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
         <DCCReference Include="GLScene_Physics_RT.dcp"/>
-        <DCCReference Include="..\Source\Physics.Register.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.Register.pas"/>
         <RcCompile Include="..\Resources\GLScenePhysics.rc">
             <Form>GLScenePhysics.res</Form>
         </RcCompile>

Packages/GLScene_Physics_RT.dpk

@@ -35,21 +35,21 @@ requires
   GLScene_RT;
 
 contains
-  Newton.Import in '..\Source\Common\Newton.Import.pas',
-  NGD.Import in '..\Source\Common\NGD.Import.pas',
-  ODE.Import in '..\Source\Common\ODE.Import.pas',
-  Physics.NGDManager in '..\Source\Physics.NGDManager.pas',
-  Physics.NGDRagdoll in '..\Source\Physics.NGDRagdoll.pas',
-  Physics.ODEManager in '..\Source\Physics.ODEManager.pas',
-  Physics.ODERagdoll in '..\Source\Physics.ODERagdoll.pas',
-  Physics.ODESkeletonColliders in '..\Source\Physics.ODESkeletonColliders.pas',
-  Physics.ODEUtils in '..\Source\Physics.ODEUtils.pas',
-  Physics.SPIFields in '..\Source\Physics.SPIFields.pas',
-  Physics.SPIForces in '..\Source\Physics.SPIForces.pas',
-  Physics.SPIInertias in '..\Source\Physics.SPIInertias.pas',
-  Physics.SPIJoints in '..\Source\Physics.SPIJoints.pas',
-  Physics.SPIManager in '..\Source\Physics.SPIManager.pas',
-  PhysX.Import in '..\Source\Common\PhysX.Import.pas';
+  Newton.Import in '..\Source\Newton.Import.pas',
+  NGD.Import in '..\Source\NGD.Import.pas',
+  ODE.Import in '..\Source\ODE.Import.pas',
+  PhysX.Import in '..\Source\PhysX.Import.pas',
+  Physics.NGDManager in '..\Source\Vcl\Physics.NGDManager.pas',
+  Physics.NGDRagdoll in '..\Source\Vcl\Physics.NGDRagdoll.pas',
+  Physics.ODEManager in '..\Source\Vcl\Physics.ODEManager.pas',
+  Physics.ODERagdoll in '..\Source\Vcl\Physics.ODERagdoll.pas',
+  Physics.ODESkeletonColliders in '..\Source\Vcl\Physics.ODESkeletonColliders.pas',
+  Physics.ODEUtils in '..\Source\Vcl\Physics.ODEUtils.pas',
+  Physics.SPIFields in '..\Source\Vcl\Physics.SPIFields.pas',
+  Physics.SPIForces in '..\Source\Vcl\Physics.SPIForces.pas',
+  Physics.SPIInertias in '..\Source\Vcl\Physics.SPIInertias.pas',
+  Physics.SPIJoints in '..\Source\Vcl\Physics.SPIJoints.pas',
+  Physics.SPIManager in '..\Source\Vcl\Physics.SPIManager.pas';
 
 end.
 

Packages/GLScene_Physics_RT.dproj

@@ -145,21 +145,21 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\Common\Newton.Import.pas"/>
-        <DCCReference Include="..\Source\Common\NGD.Import.pas"/>
-        <DCCReference Include="..\Source\Common\ODE.Import.pas"/>
-        <DCCReference Include="..\Source\Physics.NGDManager.pas"/>
-        <DCCReference Include="..\Source\Physics.NGDRagdoll.pas"/>
-        <DCCReference Include="..\Source\Physics.ODEManager.pas"/>
-        <DCCReference Include="..\Source\Physics.ODERagdoll.pas"/>
-        <DCCReference Include="..\Source\Physics.ODESkeletonColliders.pas"/>
-        <DCCReference Include="..\Source\Physics.ODEUtils.pas"/>
-        <DCCReference Include="..\Source\Physics.SPIFields.pas"/>
-        <DCCReference Include="..\Source\Physics.SPIForces.pas"/>
-        <DCCReference Include="..\Source\Physics.SPIInertias.pas"/>
-        <DCCReference Include="..\Source\Physics.SPIJoints.pas"/>
-        <DCCReference Include="..\Source\Physics.SPIManager.pas"/>
-        <DCCReference Include="..\Source\Common\PhysX.Import.pas"/>
+        <DCCReference Include="..\Source\Newton.Import.pas"/>
+        <DCCReference Include="..\Source\NGD.Import.pas"/>
+        <DCCReference Include="..\Source\ODE.Import.pas"/>
+        <DCCReference Include="..\Source\PhysX.Import.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.NGDManager.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.NGDRagdoll.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.ODEManager.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.ODERagdoll.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.ODESkeletonColliders.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.ODEUtils.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.SPIFields.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.SPIForces.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.SPIInertias.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.SPIJoints.pas"/>
+        <DCCReference Include="..\Source\Vcl\Physics.SPIManager.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GLScene_RT.dpk

@@ -36,28 +36,27 @@ requires
   xmlrtl;
 
 contains
-  Formats.m3DSConst in '..\Source\Common\Formats.m3DSConst.pas',
-  Formats.m3DSTypes in '..\Source\Common\Formats.m3DSTypes.pas',
-  Formats.m3DSUtils in '..\Source\Common\Formats.m3DSUtils.pas',
-  Formats.DXTC in '..\Source\Common\Formats.DXTC.pas',
-  Formats.m3DS in '..\Source\Common\Formats.m3DS.pas',
-  ModuleLoader in '..\Source\Common\ModuleLoader.pas',
-  Formats.DDSImage in '..\Source\Common\Formats.DDSImage.pas',
-  Formats.HDRImage in '..\Source\VCL\Formats.HDRImage.pas',
-  Formats.Q3BSP in '..\Source\Common\Formats.Q3BSP.pas',
+  Formats.m3DSConst in '..\Source\Formats.m3DSConst.pas',
+  Formats.m3DSTypes in '..\Source\Formats.m3DSTypes.pas',
+  Formats.m3DSUtils in '..\Source\Formats.m3DSUtils.pas',
+  Formats.DXTC in '..\Source\Formats.DXTC.pas',
+  Formats.m3DS in '..\Source\Formats.m3DS.pas',
+  ModuleLoader in '..\Source\ModuleLoader.pas',
+  Formats.DDSImage in '..\Source\Formats.DDSImage.pas',
+  Formats.VFW in '..\Source\Formats.VFW.pas',
+  Formats.Q3BSP in '..\Source\Formats.Q3BSP.pas',
+  Formats.GL2 in '..\Source\Formats.GL2.pas',
+  Formats.LWO in '..\Source\Formats.LWO.pas',
+  Formats.MD2 in '..\Source\Formats.MD2.pas',
+  Formats.MD3 in '..\Source\Formats.MD3.pas',
   Formats.B3D in '..\Source\VCL\Formats.B3D.pas',
-  Formats.GL2 in '..\Source\Common\Formats.GL2.pas',
-  Formats.LWO in '..\Source\Common\Formats.LWO.pas',
-  Formats.MD2 in '..\Source\Common\Formats.MD2.pas',
-  Formats.MD3 in '..\Source\Common\Formats.MD3.pas',
+  Formats.HDRImage in '..\Source\VCL\Formats.HDRImage.pas',
   Formats.OCT in '..\Source\VCL\Formats.OCT.pas',
   Formats.TGA in '..\Source\VCL\Formats.TGA.pas',
   Formats.X in '..\Source\VCL\Formats.X.pas',
-  Formats.VFW in '..\Source\Common\Formats.VFW.pas',
   Formats.VRML in '..\Source\VCL\Formats.VRML.pas',
   GLS.AVIRecorder in '..\Source\VCL\GLS.AVIRecorder.pas',
   GLS.AnimatedSprite in '..\Source\VCL\GLS.AnimatedSprite.pas',
-  Scena.AnimationUtils in '..\Source\Common\Scena.AnimationUtils.pas',
   GLS.ApplicationFileIO in '..\Source\VCL\GLS.ApplicationFileIO.pas',
   GLS.AsyncHDS in '..\Source\VCL\GLS.AsyncHDS.pas',
   GLS.AsyncTimer in '..\Source\VCL\GLS.AsyncTimer.pas',
@@ -67,8 +66,8 @@ contains
   GLS.BaseMeshSilhouette in '..\Source\VCL\GLS.BaseMeshSilhouette.pas',
   GLS.Behaviours in '..\Source\VCL\GLS.Behaviours.pas',
   GLS.BitmapFont in '..\Source\VCL\GLS.BitmapFont.pas',
-  GLS.Blur in '..\Source\GLS.Blur.pas',
-  GLS.BumpmapHDS in '..\Source\GLS.BumpmapHDS.pas',
+  GLS.Blur in '..\Source\VCL\GLS.Blur.pas',
+  GLS.BumpmapHDS in '..\Source\VCL\GLS.BumpmapHDS.pas',
   GLS.Cadencer in '..\Source\VCL\GLS.Cadencer.pas',
   GLS.CameraController in '..\Source\VCL\GLS.CameraController.pas',
   GLS.Canvas in '..\Source\VCL\GLS.Canvas.pas',
@@ -78,15 +77,15 @@ contains
   GLS.Console in '..\Source\VCL\GLS.Console.pas',
   GLS.Context in '..\Source\VCL\GLS.Context.pas',
   GLS.Coordinates in '..\Source\VCL\GLS.Coordinates.pas',
-  GLS.CurvesAndSurfaces in '..\Source\GLS.CurvesAndSurfaces.pas',
-  GLS.DCE in '..\Source\GLS.DCE.pas',
-  GLS.DynamicTexture in '..\Source\GLS.DynamicTexture.pas',
-  GLS.EParticleMasksManager in '..\Source\GLS.EParticleMasksManager.pas',
-  GLS.EllipseCollision in '..\Source\GLS.EllipseCollision.pas',
-  GLS.ExplosionFx in '..\Source\GLS.ExplosionFx.pas',
-  GLS.Extrusion in '..\Source\GLS.Extrusion.pas',
+  GLS.CurvesAndSurfaces in '..\Source\VCL\GLS.CurvesAndSurfaces.pas',
+  GLS.DCE in '..\Source\VCL\GLS.DCE.pas',
+  GLS.DynamicTexture in '..\Source\VCL\GLS.DynamicTexture.pas',
+  GLS.EParticleMasksManager in '..\Source\VCL\GLS.EParticleMasksManager.pas',
+  GLS.EllipseCollision in '..\Source\VCL\GLS.EllipseCollision.pas',
+  GLS.ExplosionFx in '..\Source\VCL\GLS.ExplosionFx.pas',
+  GLS.Extrusion in '..\Source\VCL\GLS.Extrusion.pas',
   GLS.FBORenderer in '..\Source\VCL\GLS.FBORenderer.pas',
-  GLS.FPSMovement in '..\Source\GLS.FPSMovement.pas',
+  GLS.FPSMovement in '..\Source\VCL\GLS.FPSMovement.pas',
   GLS.Feedback in '..\Source\VCL\GLS.Feedback.pas',
   GLS.File3DS in '..\Source\VCL\GLS.File3DS.pas',
   GLS.File3DSSceneObjects in '..\Source\VCL\GLS.File3DSSceneObjects.pas',
@@ -98,175 +97,176 @@ contains
   GLS.FileDXF in '..\Source\VCL\GLS.FileDXF.pas',
   GLS.FileGL2 in '..\Source\VCL\GLS.FileGL2.pas',
   GLS.FileGLTF in '..\Source\VCL\GLS.FileGLTF.pas',
-  GLS.FileGRD in '..\Source\GLS.FileGRD.pas',
-  GLS.FileGTS in '..\Source\GLS.FileGTS.pas',
+  GLS.FileGRD in '..\Source\VCL\GLS.FileGRD.pas',
+  GLS.FileGTS in '..\Source\VCL\GLS.FileGTS.pas',
   GLS.FileHDR in '..\Source\VCL\GLS.FileHDR.pas',
-  GLS.FileJPEG in '..\Source\GLS.FileJPEG.pas',
-  GLS.FileLMTS in '..\Source\GLS.FileLMTS.pas',
-  GLS.FileLWO in '..\Source\GLS.FileLWO.pas',
-  GLS.FileMD2 in '..\Source\GLS.FileMD2.pas',
-  GLS.FileMD3 in '..\Source\GLS.FileMD3.pas',
-  GLS.FileMD5 in '..\Source\GLS.FileMD5.pas',
-  GLS.FileMDC in '..\Source\GLS.FileMDC.pas',
-  GLS.FileMP3 in '..\Source\GLS.FileMP3.pas',
-  GLS.FileMS3D in '..\Source\GLS.FileMS3D.pas',
-  GLS.FileNMF in '..\Source\GLS.FileNMF.pas',
-  GLS.FileNurbs in '..\Source\GLS.FileNurbs.pas',
-  GLS.FileOBJ in '..\Source\GLS.FileOBJ.pas',
-  GLS.FileOCT in '..\Source\GLS.FileOCT.pas',
-  GLS.FilePAK in '..\Source\GLS.FilePAK.pas',
-  GLS.FilePLY in '..\Source\GLS.FilePLY.pas',
-  GLS.FilePNG in '..\Source\GLS.FilePNG.pas',
-  GLS.FileQ3BSP in '..\Source\GLS.FileQ3BSP.pas',
-  GLS.FileQ3MD3 in '..\Source\GLS.FileQ3MD3.pas',
-  GLS.FileSMD in '..\Source\GLS.FileSMD.pas',
-  GLS.FileSTL in '..\Source\GLS.FileSTL.pas',
-  GLS.FileTGA in '..\Source\GLS.FileTGA.pas',
+  GLS.FileJPEG in '..\Source\VCL\GLS.FileJPEG.pas',
+  GLS.FileLMTS in '..\Source\VCL\GLS.FileLMTS.pas',
+  GLS.FileLWO in '..\Source\VCL\GLS.FileLWO.pas',
+  GLS.FileMD2 in '..\Source\VCL\GLS.FileMD2.pas',
+  GLS.FileMD3 in '..\Source\VCL\GLS.FileMD3.pas',
+  GLS.FileMD5 in '..\Source\VCL\GLS.FileMD5.pas',
+  GLS.FileMDC in '..\Source\VCL\GLS.FileMDC.pas',
+  GLS.FileMP3 in '..\Source\VCL\GLS.FileMP3.pas',
+  GLS.FileMS3D in '..\Source\VCL\GLS.FileMS3D.pas',
+  GLS.FileNMF in '..\Source\VCL\GLS.FileNMF.pas',
+  GLS.FileNurbs in '..\Source\VCL\GLS.FileNurbs.pas',
+  GLS.FileOBJ in '..\Source\VCL\GLS.FileOBJ.pas',
+  GLS.FileOCT in '..\Source\VCL\GLS.FileOCT.pas',
+  GLS.FilePLY in '..\Source\VCL\GLS.FilePLY.pas',
+  GLS.FilePNG in '..\Source\VCL\GLS.FilePNG.pas',
+  GLS.FileQ3BSP in '..\Source\VCL\GLS.FileQ3BSP.pas',
+  GLS.FileQ3MD3 in '..\Source\VCL\GLS.FileQ3MD3.pas',
+  GLS.FileSMD in '..\Source\VCL\GLS.FileSMD.pas',
+  GLS.FileSTL in '..\Source\VCL\GLS.FileSTL.pas',
+  GLS.FileTGA in '..\Source\VCL\GLS.FileTGA.pas',
   GLS.FileTIN in '..\Source\VCL\GLS.FileTIN.pas',
-  GLS.FileVfsPAK in '..\Source\GLS.FileVfsPAK.pas',
-  GLS.FileVRML in '..\Source\GLS.FileVRML.pas',
-  GLS.FileWAV in '..\Source\GLS.FileWAV.pas',
-  GLS.FileX in '..\Source\GLS.FileX.pas',
-  GLS.FireFX in '..\Source\GLS.FireFX.pas',
-  GLS.FileZLIB in '..\Source\GLS.FileZLIB.pas',
+  GLS.FileVfsPAK in '..\Source\VCL\GLS.FileVfsPAK.pas',
+  GLS.FileVRML in '..\Source\VCL\GLS.FileVRML.pas',
+  GLS.FileWAV in '..\Source\VCL\GLS.FileWAV.pas',
+  GLS.FileX in '..\Source\VCL\GLS.FileX.pas',
+  GLS.FireFX in '..\Source\VCL\GLS.FireFX.pas',
+  GLS.FileZLIB in '..\Source\VCL\GLS.FileZLIB.pas',
   GLS.FileDEL in '..\Source\VCL\GLS.FileDEL.pas',
   GLS.FileVOR in '..\Source\VCL\GLS.FileVOR.pas',
-  GLS.FullScreenViewer in '..\Source\GLS.FullScreenViewer.pas',
-  Scena.Keyboard in '..\Source\Common\Scena.Keyboard.pas',
+  GLS.FullScreenViewer in '..\Source\VCL\GLS.FullScreenViewer.pas',
+  Scena.Keyboard in '..\Source\Scena.Keyboard.pas',
   GLS.GameMenu in '..\Source\VCL\GLS.GameMenu.pas',
   GLS.GeomObjects in '..\Source\VCL\GLS.GeomObjects.pas',
-  GLS.GeometryBB in '..\Source\GLS.GeometryBB.pas',
-  Scena.Generics in '..\Source\Common\Scena.Generics.pas',
+  GLS.GeometryBB in '..\Source\VCL\GLS.GeometryBB.pas',
+  Scena.Generics in '..\Source\Scena.Generics.pas',
   GLS.Gizmo in '..\Source\VCL\GLS.Gizmo.pas',
   GLS.GizmoEx in '..\Source\VCL\GLS.GizmoEx.pas',
   GLS.Graph in '..\Source\VCL\GLS.Graph.pas',
   GLS.Graphics in '..\Source\VCL\GLS.Graphics.pas',
   GLS.Gui in '..\Source\VCL\GLS.Gui.pas',
-  GLS.HUDObjects in '..\Source\GLS.HUDObjects.pas',
+  GLS.HUDObjects in '..\Source\VCL\GLS.HUDObjects.pas',
   GLS.HeightData in '..\Source\VCL\GLS.HeightData.pas',
-  GLS.HeightTileFileHDS in '..\Source\GLS.HeightTileFileHDS.pas',
-  GLS.ImageUtils in '..\Source\GLS.ImageUtils.pas',
-  GLS.Imposter in '..\Source\GLS.Imposter.pas',
-  GLS.Isolines in '..\Source\GLS.Isolines.pas',
-  GLS.Isosurface in '..\Source\GLS.Isosurface.pas',
+  GLS.HeightTileFileHDS in '..\Source\VCL\GLS.HeightTileFileHDS.pas',
+  GLS.ImageUtils in '..\Source\VCL\GLS.ImageUtils.pas',
+  GLS.Imposter in '..\Source\VCL\GLS.Imposter.pas',
+  GLS.Isolines in '..\Source\VCL\GLS.Isolines.pas',
+  GLS.Isosurface in '..\Source\VCL\GLS.Isosurface.pas',
   GLS.Joystick in '..\Source\VCL\GLS.Joystick.pas',
-  GLS.LensFlare in '..\Source\GLS.LensFlare.pas',
-  GLS.LinePFX in '..\Source\GLS.LinePFX.pas',
-  GLS.Manager in '..\Source\GLS.Manager.pas',
-  GLS.Material in '..\Source\GLS.Material.pas',
-  GLS.MaterialEx in '..\Source\GLS.MaterialEx.pas',
-  GLS.MaterialMultiProxy in '..\Source\GLS.MaterialMultiProxy.pas',
-  GLS.MaterialScript in '..\Source\GLS.MaterialScript.pas',
-  GLS.Mesh in '..\Source\GLS.Mesh.pas',
-  GLS.MeshBSP in '..\Source\GLS.MeshBSP.pas',
-  GLS.MeshBuilder in '..\Source\GLS.MeshBuilder.pas',
-  GLS.MeshCSG in '..\Source\GLS.MeshCSG.pas',
-  GLS.MeshLines in '..\Source\GLS.MeshLines.pas',
-  GLS.MeshUtils in '..\Source\GLS.MeshUtils.pas',
-  GLS.Mirror in '..\Source\GLS.Mirror.pas',
-  GLS.Movement in '..\Source\GLS.Movement.pas',
+  GLS.LensFlare in '..\Source\VCL\GLS.LensFlare.pas',
+  GLS.LinePFX in '..\Source\VCL\GLS.LinePFX.pas',
+  GLS.Manager in '..\Source\VCL\GLS.Manager.pas',
+  GLS.Material in '..\Source\VCL\GLS.Material.pas',
+  GLS.MaterialEx in '..\Source\VCL\GLS.MaterialEx.pas',
+  GLS.MaterialMultiProxy in '..\Source\VCL\GLS.MaterialMultiProxy.pas',
+  GLS.MaterialScript in '..\Source\VCL\GLS.MaterialScript.pas',
+  GLS.Mesh in '..\Source\VCL\GLS.Mesh.pas',
+  GLS.MeshBSP in '..\Source\VCL\GLS.MeshBSP.pas',
+  GLS.MeshBuilder in '..\Source\VCL\GLS.MeshBuilder.pas',
+  GLS.MeshCSG in '..\Source\VCL\GLS.MeshCSG.pas',
+  GLS.MeshLines in '..\Source\VCL\GLS.MeshLines.pas',
+  GLS.MeshUtils in '..\Source\VCL\GLS.MeshUtils.pas',
+  GLS.Mirror in '..\Source\VCL\GLS.Mirror.pas',
+  GLS.Movement in '..\Source\VCL\GLS.Movement.pas',
   GLS.MultiPolygon in '..\Source\GLS.MultiPolygon.pas',
-  GLS.MultiProxy in '..\Source\GLS.MultiProxy.pas',
-  GLS.MultiSampleImage in '..\Source\GLS.MultiSampleImage.pas',
-  GLS.Navigator in '..\Source\GLS.Navigator.pas',
-  GLS.Nodes in '..\Source\GLS.Nodes.pas',
+  GLS.MultiProxy in '..\Source\VCL\GLS.MultiProxy.pas',
+  GLS.MultiSampleImage in '..\Source\VCL\GLS.MultiSampleImage.pas',
+  GLS.Navigator in '..\Source\VCL\GLS.Navigator.pas',
+  GLS.Nodes in '..\Source\VCL\GLS.Nodes.pas',
   GLS.ObjectManager in '..\Source\VCL\GLS.ObjectManager.pas',
   GLS.Objects in '..\Source\VCL\GLS.Objects.pas',
-  GLS.Octree in '..\Source\GLS.Octree.pas',
-  GLS.ParametricSurfaces in '..\Source\GLS.ParametricSurfaces.pas',
-  GLS.ParticleFX in '..\Source\GLS.ParticleFX.pas',
-  GLS.Particles in '..\Source\GLS.Particles.pas',
-  GLS.Perlin in '..\Source\GLS.Perlin.pas',
-  GLS.PerlinPFX in '..\Source\GLS.PerlinPFX.pas',
-  GLS.PolygonTesselation in '..\Source\GLS.PolygonTesselation.pas',
-  GLS.Portal in '..\Source\GLS.Portal.pas',
-  GLSL.PostEffects in '..\Source\GLSL.PostEffects.pas',
-  GLS.ProcTextures in '..\Source\GLS.ProcTextures.pas',
-  GLS.ProxyObjects in '..\Source\GLS.ProxyObjects.pas',
-  GLS.Ragdoll in '..\Source\GLS.Ragdoll.pas',
-  GLS.RandomHDS in '..\Source\GLS.RandomHDS.pas',
-  Scena.RGBE in '..\Source\Common\Scena.RGBE.pas',
-  GLS.RenderContextInfo in '..\Source\GLS.RenderContextInfo.pas',
-  GLS.ROAMPatch in '..\Source\GLS.ROAMPatch.pas',
-  GLSL.AsmShader in '..\Source\GLSL.AsmShader.pas',
-  GLSL.BumpShaders in '..\Source\GLSL.BumpShaders.pas',
-  GLSL.DiffuseSpecularShader in '..\Source\GLSL.DiffuseSpecularShader.pas',
-  GLSL.CustomShader in '..\Source\GLSL.CustomShader.pas',
-  GLSL.LineShaders in '..\Source\GLSL.LineShaders.pas',
-  GLSL.MultiMaterialShader in '..\Source\GLSL.MultiMaterialShader.pas',
-  GLSL.PostShaders in '..\Source\GLSL.PostShaders.pas',
-  GLSL.ProjectedTextures in '..\Source\GLSL.ProjectedTextures.pas',
-  GLSL.PhongShader in '..\Source\GLSL.PhongShader.pas',
-  GLSL.ShaderCombiner in '..\Source\GLSL.ShaderCombiner.pas',
-  GLSL.TextureShaders in '..\Source\GLSL.TextureShaders.pas',
-  GLSL.UserShader in '..\Source\GLSL.UserShader.pas',
-  GLSL.ShapeShaders in '..\Source\GLSL.ShapeShaders.pas',
-  GLSL.ShaderParameter in '..\Source\GLSL.ShaderParameter.pas',
-  GLSL.Shader in '..\Source\GLSL.Shader.pas',
+  GLS.Octree in '..\Source\VCL\GLS.Octree.pas',
+  GLS.ParametricSurfaces in '..\Source\VCL\GLS.ParametricSurfaces.pas',
+  GLS.ParticleFX in '..\Source\VCL\GLS.ParticleFX.pas',
+  GLS.Particles in '..\Source\VCL\GLS.Particles.pas',
+  GLS.Perlin in '..\Source\VCL\GLS.Perlin.pas',
+  GLS.PerlinPFX in '..\Source\VCL\GLS.PerlinPFX.pas',
+  GLS.PolygonTesselation in '..\Source\VCL\GLS.PolygonTesselation.pas',
+  GLS.Portal in '..\Source\VCL\GLS.Portal.pas',
+  GLSL.PostEffects in '..\Source\VCL\GLSL.PostEffects.pas',
+  GLS.ProcTextures in '..\Source\VCL\GLS.ProcTextures.pas',
+  GLS.ProxyObjects in '..\Source\VCL\GLS.ProxyObjects.pas',
+  GLS.Ragdoll in '..\Source\VCL\GLS.Ragdoll.pas',
+  GLS.RandomHDS in '..\Source\VCL\GLS.RandomHDS.pas',
+  Scena.RGBE in '..\Source\Scena.RGBE.pas',
+  GLS.RenderContextInfo in '..\Source\VCL\GLS.RenderContextInfo.pas',
+  GLS.ROAMPatch in '..\Source\VCL\GLS.ROAMPatch.pas',
+  GLSL.AsmShader in '..\Source\VCL\GLSL.AsmShader.pas',
+  GLSL.BumpShaders in '..\Source\VCL\GLSL.BumpShaders.pas',
+  GLSL.DiffuseSpecularShader in '..\Source\VCL\GLSL.DiffuseSpecularShader.pas',
+  GLSL.CustomShader in '..\Source\VCL\GLSL.CustomShader.pas',
+  GLSL.LineShaders in '..\Source\VCL\GLSL.LineShaders.pas',
+  GLSL.MultiMaterialShader in '..\Source\VCL\GLSL.MultiMaterialShader.pas',
+  GLSL.PostShaders in '..\Source\VCL\GLSL.PostShaders.pas',
+  GLSL.ProjectedTextures in '..\Source\VCL\GLSL.ProjectedTextures.pas',
+  GLSL.PhongShader in '..\Source\VCL\GLSL.PhongShader.pas',
+  GLSL.ShaderCombiner in '..\Source\VCL\GLSL.ShaderCombiner.pas',
+  GLSL.TextureShaders in '..\Source\VCL\GLSL.TextureShaders.pas',
+  GLSL.UserShader in '..\Source\VCL\GLSL.UserShader.pas',
+  GLSL.ShapeShaders in '..\Source\VCL\GLSL.ShapeShaders.pas',
+  GLSL.ShaderParameter in '..\Source\VCL\GLSL.ShaderParameter.pas',
+  GLSL.Shader in '..\Source\VCL\GLSL.Shader.pas',
   GLS.Language in '..\Source\VCL\GLS.Language.pas',
   GLS.Memo in '..\Source\VCL\GLS.Memo.pas',
-  GLS.ProjectedTextures in '..\Source\GLS.ProjectedTextures.pas',
+  GLS.PAKArchive in '..\Source\VCL\GLS.PAKArchive.pas',
+  GLS.ProjectedTextures in '..\Source\VCL\GLS.ProjectedTextures.pas',
   GLS.PersistentClasses in '..\Source\VCL\GLS.PersistentClasses.pas',
   GLS.Scene in '..\Source\VCL\GLS.Scene.pas',
   GLS.SceneForm in '..\Source\VCL\GLS.SceneForm.pas',
   GLS.Screen in '..\Source\VCL\GLS.Screen.pas',
-  GLS.ScreenSaver in '..\Source\GLS.ScreenSaver.pas',
-  GLS.Selection in '..\Source\GLS.Selection.pas',
-  GLS.ShadowHDS in '..\Source\GLS.ShadowHDS.pas',
-  GLS.ShadowPlane in '..\Source\GLS.ShadowPlane.pas',
-  GLS.ShadowVolume in '..\Source\GLS.ShadowVolume.pas',
-  GLS.SimpleNavigation in '..\Source\GLS.SimpleNavigation.pas',
+  GLS.ScreenSaver in '..\Source\VCL\GLS.ScreenSaver.pas',
+  GLS.Selection in '..\Source\VCL\GLS.Selection.pas',
+  GLS.ShadowHDS in '..\Source\VCL\GLS.ShadowHDS.pas',
+  GLS.ShadowPlane in '..\Source\VCL\GLS.ShadowPlane.pas',
+  GLS.ShadowVolume in '..\Source\VCL\GLS.ShadowVolume.pas',
+  GLS.SimpleNavigation in '..\Source\VCL\GLS.SimpleNavigation.pas',
   GLS.SkyDome in '..\Source\VCL\GLS.SkyDome.pas',
-  GLS.SmoothNavigator in '..\Source\GLS.SmoothNavigator.pas',
-  GLS.SoundManager in '..\Source\GLS.SoundManager.pas',
-  GLS.SoundFileObjects in '..\Source\GLS.SoundFileObjects.pas',
-  GLS.SpacePartition in '..\Source\GLS.SpacePartition.pas',
-  GLS.State in '..\Source\GLS.State.pas',
-  GLS.SpaceText in '..\Source\GLS.SpaceText.pas',
+  GLS.SmoothNavigator in '..\Source\VCL\GLS.SmoothNavigator.pas',
+  GLS.SoundManager in '..\Source\VCL\GLS.SoundManager.pas',
+  GLS.SoundFileObjects in '..\Source\VCL\GLS.SoundFileObjects.pas',
+  GLS.SpacePartition in '..\Source\VCL\GLS.SpacePartition.pas',
+  GLS.State in '..\Source\VCL\GLS.State.pas',
+  GLS.SpaceText in '..\Source\VCL\GLS.SpaceText.pas',
   GLS.SceneViewer in '..\Source\VCL\GLS.SceneViewer.pas',
   GLS.SmartObjects in '..\Source\VCL\GLS.SmartObjects.pas',
   GLS.TerrainRenderer in '..\Source\GLS.TerrainRenderer.pas',
   GLS.TexLensFlare in '..\Source\GLS.TexLensFlare.pas',
-  GLS.Texture in '..\Source\GLS.Texture.pas',
-  GLS.TextureCombiners in '..\Source\GLS.TextureCombiners.pas',
-  GLS.TextureImageEditors in '..\Source\GLS.TextureImageEditors.pas',
-  GLS.TexturedHDS in '..\Source\GLS.TexturedHDS.pas',
-  GLS.ThorFX in '..\Source\GLS.ThorFX.pas',
-  GLS.TilePlane in '..\Source\GLS.TilePlane.pas',
-  GLS.TimeEventsMgr in '..\Source\GLS.TimeEventsMgr.pas',
-  GLS.Trail in '..\Source\GLS.Trail.pas',
-  GLS.Tree in '..\Source\GLS.Tree.pas',
-  GLS.Triangulation in '..\Source\GLS.Triangulation.pas',
+  GLS.Texture in '..\Source\VCL\GLS.Texture.pas',
+  GLS.TextureCombiners in '..\Source\VCL\GLS.TextureCombiners.pas',
+  GLS.TextureImageEditors in '..\Source\VCL\GLS.TextureImageEditors.pas',
+  GLS.TexturedHDS in '..\Source\VCL\GLS.TexturedHDS.pas',
+  GLS.ThorFX in '..\Source\VCL\GLS.ThorFX.pas',
+  GLS.TilePlane in '..\Source\VCL\GLS.TilePlane.pas',
+  GLS.TimeEventsMgr in '..\Source\VCL\GLS.TimeEventsMgr.pas',
+  GLS.Trail in '..\Source\VCL\GLS.Trail.pas',
+  GLS.Tree in '..\Source\VCL\GLS.Tree.pas',
+  GLS.Triangulation in '..\Source\VCL\GLS.Triangulation.pas',
   GLS.Utils in '..\Source\VCL\GLS.Utils.pas',
-  GLS.VectorFileObjects in '..\Source\GLS.VectorFileObjects.pas',
-  GLS.VerletTypes in '..\Source\GLS.VerletTypes.pas',
-  GLS.VerletClothify in '..\Source\GLS.VerletClothify.pas',
-  GLS.WaterPlane in '..\Source\GLS.WaterPlane.pas',
-  GLS.Windows in '..\Source\GLS.Windows.pas',
-  GLS.WindowsContext in '..\Source\GLS.WindowsContext.pas',
-  GLS.WindowsFont in '..\Source\GLS.WindowsFont.pas',
-  GLS.zBuffer in '..\Source\GLS.zBuffer.pas',
-  GLS.Silhouette in '..\Source\GLS.Silhouette.pas',
-  GLS.VectorLists in '..\Source\GLS.VectorLists.pas',
-  GLS.ScriptBase in '..\Source\GLS.ScriptBase.pas',
-  GLS.XCollection in '..\Source\GLS.XCollection.pas',
-  GLS.XOpenGL in '..\Source\GLS.XOpenGL.pas',
+  GLS.VectorFileObjects in '..\Source\VCL\GLS.VectorFileObjects.pas',
+  GLS.VerletTypes in '..\Source\VCL\GLS.VerletTypes.pas',
+  GLS.VerletClothify in '..\Source\VCL\GLS.VerletClothify.pas',
+  GLS.WaterPlane in '..\Source\VCL\GLS.WaterPlane.pas',
+  GLS.Windows in '..\Source\VCL\GLS.Windows.pas',
+  GLS.WindowsContext in '..\Source\VCL\GLS.WindowsContext.pas',
+  GLS.WindowsFont in '..\Source\VCL\GLS.WindowsFont.pas',
+  GLS.zBuffer in '..\Source\VCL\GLS.zBuffer.pas',
+  GLS.Silhouette in '..\Source\VCL\GLS.Silhouette.pas',
+  GLS.VectorLists in '..\Source\VCL\GLS.VectorLists.pas',
+  GLS.ScriptBase in '..\Source\VCL\GLS.ScriptBase.pas',
+  GLS.XCollection in '..\Source\VCL\GLS.XCollection.pas',
+  GLS.XOpenGL in '..\Source\VCL\GLS.XOpenGL.pas',
   GLS.InitOpenGL in '..\Source\VCL\GLS.InitOpenGL.pas',
-  PasGLTF in '..\Source\Common\PasGLTF.pas',
-  PasJSON in '..\Source\Common\PasJSON.pas',
-  PasDblStrUtils in '..\Source\Common\PasDblStrUtils.pas',
-  Scena.OpenGLAdapter in '..\Source\Common\Scena.OpenGLAdapter.pas',
-  Scena.PipelineTransformation in '..\Source\Common\Scena.PipelineTransformation.pas',
-  Scena.Polynomials in '..\Source\Common\Scena.Polynomials.pas',
-  Scena.CrossXML in '..\Source\Common\Scena.CrossXML.pas',
-  Scena.OpenGLTokens in '..\Source\Common\Scena.OpenGLTokens.pas',
-  Scena.Spline in '..\Source\Common\Scena.Spline.pas',
-  Scena.Strings in '..\Source\Common\Scena.Strings.pas',
-  Scena.TextureFormat in '..\Source\Common\Scena.TextureFormat.pas',
-  Scena.VectorGeometry in '..\Source\Common\Scena.VectorGeometry.pas',
-  Scena.VectorTypes in '..\Source\Common\Scena.VectorTypes.pas',
-  Scena.VectorTypesExt in '..\Source\Common\Scena.VectorTypesExt.pas',
-  Scena.Logger in '..\Source\Common\Scena.Logger.pas';
+  PasGLTF in '..\Source\PasGLTF.pas',
+  PasJSON in '..\Source\PasJSON.pas',
+  PasDblStrUtils in '..\Source\PasDblStrUtils.pas',
+  Scena.AnimationUtils in '..\Source\Scena.AnimationUtils.pas',
+  Scena.OpenGLAdapter in '..\Source\Scena.OpenGLAdapter.pas',
+  Scena.PipelineTransformation in '..\Source\Scena.PipelineTransformation.pas',
+  Scena.Polynomials in '..\Source\Scena.Polynomials.pas',
+  Scena.CrossXML in '..\Source\Scena.CrossXML.pas',
+  Scena.OpenGLTokens in '..\Source\Scena.OpenGLTokens.pas',
+  Scena.Spline in '..\Source\Scena.Spline.pas',
+  Scena.Strings in '..\Source\Scena.Strings.pas',
+  Scena.TextureFormat in '..\Source\Scena.TextureFormat.pas',
+  Scena.VectorGeometry in '..\Source\Scena.VectorGeometry.pas',
+  Scena.VectorTypes in '..\Source\Scena.VectorTypes.pas',
+  Scena.VectorTypesExt in '..\Source\Scena.VectorTypesExt.pas',
+  Scena.Logger in '..\Source\Scena.Logger.pas';
 
 end.
 

Packages/GLScene_RT.dproj

@@ -140,28 +140,27 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="xmlrtl.dcp"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSConst.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSTypes.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSUtils.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.DXTC.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DS.pas"/>
-        <DCCReference Include="..\Source\Common\ModuleLoader.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.DDSImage.pas"/>
-        <DCCReference Include="..\Source\VCL\Formats.HDRImage.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.Q3BSP.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSConst.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSTypes.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSUtils.pas"/>
+        <DCCReference Include="..\Source\Formats.DXTC.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DS.pas"/>
+        <DCCReference Include="..\Source\ModuleLoader.pas"/>
+        <DCCReference Include="..\Source\Formats.DDSImage.pas"/>
+        <DCCReference Include="..\Source\Formats.VFW.pas"/>
+        <DCCReference Include="..\Source\Formats.Q3BSP.pas"/>
+        <DCCReference Include="..\Source\Formats.GL2.pas"/>
+        <DCCReference Include="..\Source\Formats.LWO.pas"/>
+        <DCCReference Include="..\Source\Formats.MD2.pas"/>
+        <DCCReference Include="..\Source\Formats.MD3.pas"/>
         <DCCReference Include="..\Source\VCL\Formats.B3D.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.GL2.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.LWO.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.MD2.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.MD3.pas"/>
+        <DCCReference Include="..\Source\VCL\Formats.HDRImage.pas"/>
         <DCCReference Include="..\Source\VCL\Formats.OCT.pas"/>
         <DCCReference Include="..\Source\VCL\Formats.TGA.pas"/>
         <DCCReference Include="..\Source\VCL\Formats.X.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.VFW.pas"/>
         <DCCReference Include="..\Source\VCL\Formats.VRML.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.AVIRecorder.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.AnimatedSprite.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.AnimationUtils.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.ApplicationFileIO.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.AsyncHDS.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.AsyncTimer.pas"/>
@@ -171,8 +170,8 @@
         <DCCReference Include="..\Source\VCL\GLS.BaseMeshSilhouette.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Behaviours.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.BitmapFont.pas"/>
-        <DCCReference Include="..\Source\GLS.Blur.pas"/>
-        <DCCReference Include="..\Source\GLS.BumpmapHDS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Blur.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.BumpmapHDS.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Cadencer.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.CameraController.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Canvas.pas"/>
@@ -182,15 +181,15 @@
         <DCCReference Include="..\Source\VCL\GLS.Console.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Context.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Coordinates.pas"/>
-        <DCCReference Include="..\Source\GLS.CurvesAndSurfaces.pas"/>
-        <DCCReference Include="..\Source\GLS.DCE.pas"/>
-        <DCCReference Include="..\Source\GLS.DynamicTexture.pas"/>
-        <DCCReference Include="..\Source\GLS.EParticleMasksManager.pas"/>
-        <DCCReference Include="..\Source\GLS.EllipseCollision.pas"/>
-        <DCCReference Include="..\Source\GLS.ExplosionFx.pas"/>
-        <DCCReference Include="..\Source\GLS.Extrusion.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.CurvesAndSurfaces.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.DCE.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.DynamicTexture.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.EParticleMasksManager.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.EllipseCollision.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ExplosionFx.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Extrusion.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FBORenderer.pas"/>
-        <DCCReference Include="..\Source\GLS.FPSMovement.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FPSMovement.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Feedback.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.File3DS.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.File3DSSceneObjects.pas"/>
@@ -202,175 +201,176 @@
         <DCCReference Include="..\Source\VCL\GLS.FileDXF.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileGL2.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileGLTF.pas"/>
-        <DCCReference Include="..\Source\GLS.FileGRD.pas"/>
-        <DCCReference Include="..\Source\GLS.FileGTS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileGRD.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileGTS.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileHDR.pas"/>
-        <DCCReference Include="..\Source\GLS.FileJPEG.pas"/>
-        <DCCReference Include="..\Source\GLS.FileLMTS.pas"/>
-        <DCCReference Include="..\Source\GLS.FileLWO.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMD2.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMD3.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMD5.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMDC.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMP3.pas"/>
-        <DCCReference Include="..\Source\GLS.FileMS3D.pas"/>
-        <DCCReference Include="..\Source\GLS.FileNMF.pas"/>
-        <DCCReference Include="..\Source\GLS.FileNurbs.pas"/>
-        <DCCReference Include="..\Source\GLS.FileOBJ.pas"/>
-        <DCCReference Include="..\Source\GLS.FileOCT.pas"/>
-        <DCCReference Include="..\Source\GLS.FilePAK.pas"/>
-        <DCCReference Include="..\Source\GLS.FilePLY.pas"/>
-        <DCCReference Include="..\Source\GLS.FilePNG.pas"/>
-        <DCCReference Include="..\Source\GLS.FileQ3BSP.pas"/>
-        <DCCReference Include="..\Source\GLS.FileQ3MD3.pas"/>
-        <DCCReference Include="..\Source\GLS.FileSMD.pas"/>
-        <DCCReference Include="..\Source\GLS.FileSTL.pas"/>
-        <DCCReference Include="..\Source\GLS.FileTGA.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileJPEG.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileLMTS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileLWO.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMD2.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMD3.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMD5.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMDC.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMP3.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileMS3D.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileNMF.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileNurbs.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileOBJ.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileOCT.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FilePLY.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FilePNG.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileQ3BSP.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileQ3MD3.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileSMD.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileSTL.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileTGA.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileTIN.pas"/>
-        <DCCReference Include="..\Source\GLS.FileVfsPAK.pas"/>
-        <DCCReference Include="..\Source\GLS.FileVRML.pas"/>
-        <DCCReference Include="..\Source\GLS.FileWAV.pas"/>
-        <DCCReference Include="..\Source\GLS.FileX.pas"/>
-        <DCCReference Include="..\Source\GLS.FireFX.pas"/>
-        <DCCReference Include="..\Source\GLS.FileZLIB.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileVfsPAK.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileVRML.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileWAV.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FireFX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FileZLIB.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileDEL.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.FileVOR.pas"/>
-        <DCCReference Include="..\Source\GLS.FullScreenViewer.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Keyboard.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.FullScreenViewer.pas"/>
+        <DCCReference Include="..\Source\Scena.Keyboard.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.GameMenu.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.GeomObjects.pas"/>
-        <DCCReference Include="..\Source\GLS.GeometryBB.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Generics.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.GeometryBB.pas"/>
+        <DCCReference Include="..\Source\Scena.Generics.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Gizmo.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.GizmoEx.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Graph.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Graphics.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Gui.pas"/>
-        <DCCReference Include="..\Source\GLS.HUDObjects.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.HUDObjects.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.HeightData.pas"/>
-        <DCCReference Include="..\Source\GLS.HeightTileFileHDS.pas"/>
-        <DCCReference Include="..\Source\GLS.ImageUtils.pas"/>
-        <DCCReference Include="..\Source\GLS.Imposter.pas"/>
-        <DCCReference Include="..\Source\GLS.Isolines.pas"/>
-        <DCCReference Include="..\Source\GLS.Isosurface.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.HeightTileFileHDS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ImageUtils.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Imposter.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Isolines.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Isosurface.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Joystick.pas"/>
-        <DCCReference Include="..\Source\GLS.LensFlare.pas"/>
-        <DCCReference Include="..\Source\GLS.LinePFX.pas"/>
-        <DCCReference Include="..\Source\GLS.Manager.pas"/>
-        <DCCReference Include="..\Source\GLS.Material.pas"/>
-        <DCCReference Include="..\Source\GLS.MaterialEx.pas"/>
-        <DCCReference Include="..\Source\GLS.MaterialMultiProxy.pas"/>
-        <DCCReference Include="..\Source\GLS.MaterialScript.pas"/>
-        <DCCReference Include="..\Source\GLS.Mesh.pas"/>
-        <DCCReference Include="..\Source\GLS.MeshBSP.pas"/>
-        <DCCReference Include="..\Source\GLS.MeshBuilder.pas"/>
-        <DCCReference Include="..\Source\GLS.MeshCSG.pas"/>
-        <DCCReference Include="..\Source\GLS.MeshLines.pas"/>
-        <DCCReference Include="..\Source\GLS.MeshUtils.pas"/>
-        <DCCReference Include="..\Source\GLS.Mirror.pas"/>
-        <DCCReference Include="..\Source\GLS.Movement.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.LensFlare.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.LinePFX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Manager.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Material.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MaterialEx.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MaterialMultiProxy.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MaterialScript.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Mesh.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MeshBSP.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MeshBuilder.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MeshCSG.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MeshLines.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MeshUtils.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Mirror.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Movement.pas"/>
         <DCCReference Include="..\Source\GLS.MultiPolygon.pas"/>
-        <DCCReference Include="..\Source\GLS.MultiProxy.pas"/>
-        <DCCReference Include="..\Source\GLS.MultiSampleImage.pas"/>
-        <DCCReference Include="..\Source\GLS.Navigator.pas"/>
-        <DCCReference Include="..\Source\GLS.Nodes.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MultiProxy.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.MultiSampleImage.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Navigator.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Nodes.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.ObjectManager.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Objects.pas"/>
-        <DCCReference Include="..\Source\GLS.Octree.pas"/>
-        <DCCReference Include="..\Source\GLS.ParametricSurfaces.pas"/>
-        <DCCReference Include="..\Source\GLS.ParticleFX.pas"/>
-        <DCCReference Include="..\Source\GLS.Particles.pas"/>
-        <DCCReference Include="..\Source\GLS.Perlin.pas"/>
-        <DCCReference Include="..\Source\GLS.PerlinPFX.pas"/>
-        <DCCReference Include="..\Source\GLS.PolygonTesselation.pas"/>
-        <DCCReference Include="..\Source\GLS.Portal.pas"/>
-        <DCCReference Include="..\Source\GLSL.PostEffects.pas"/>
-        <DCCReference Include="..\Source\GLS.ProcTextures.pas"/>
-        <DCCReference Include="..\Source\GLS.ProxyObjects.pas"/>
-        <DCCReference Include="..\Source\GLS.Ragdoll.pas"/>
-        <DCCReference Include="..\Source\GLS.RandomHDS.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.RGBE.pas"/>
-        <DCCReference Include="..\Source\GLS.RenderContextInfo.pas"/>
-        <DCCReference Include="..\Source\GLS.ROAMPatch.pas"/>
-        <DCCReference Include="..\Source\GLSL.AsmShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.BumpShaders.pas"/>
-        <DCCReference Include="..\Source\GLSL.DiffuseSpecularShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.CustomShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.LineShaders.pas"/>
-        <DCCReference Include="..\Source\GLSL.MultiMaterialShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.PostShaders.pas"/>
-        <DCCReference Include="..\Source\GLSL.ProjectedTextures.pas"/>
-        <DCCReference Include="..\Source\GLSL.PhongShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.ShaderCombiner.pas"/>
-        <DCCReference Include="..\Source\GLSL.TextureShaders.pas"/>
-        <DCCReference Include="..\Source\GLSL.UserShader.pas"/>
-        <DCCReference Include="..\Source\GLSL.ShapeShaders.pas"/>
-        <DCCReference Include="..\Source\GLSL.ShaderParameter.pas"/>
-        <DCCReference Include="..\Source\GLSL.Shader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Octree.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ParametricSurfaces.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ParticleFX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Particles.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Perlin.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.PerlinPFX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.PolygonTesselation.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Portal.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.PostEffects.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ProcTextures.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ProxyObjects.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Ragdoll.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.RandomHDS.pas"/>
+        <DCCReference Include="..\Source\Scena.RGBE.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.RenderContextInfo.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ROAMPatch.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.AsmShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.BumpShaders.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.DiffuseSpecularShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.CustomShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.LineShaders.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.MultiMaterialShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.PostShaders.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.ProjectedTextures.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.PhongShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.ShaderCombiner.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.TextureShaders.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.UserShader.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.ShapeShaders.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.ShaderParameter.pas"/>
+        <DCCReference Include="..\Source\VCL\GLSL.Shader.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Language.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Memo.pas"/>
-        <DCCReference Include="..\Source\GLS.ProjectedTextures.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.PAKArchive.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ProjectedTextures.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.PersistentClasses.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Scene.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.SceneForm.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Screen.pas"/>
-        <DCCReference Include="..\Source\GLS.ScreenSaver.pas"/>
-        <DCCReference Include="..\Source\GLS.Selection.pas"/>
-        <DCCReference Include="..\Source\GLS.ShadowHDS.pas"/>
-        <DCCReference Include="..\Source\GLS.ShadowPlane.pas"/>
-        <DCCReference Include="..\Source\GLS.ShadowVolume.pas"/>
-        <DCCReference Include="..\Source\GLS.SimpleNavigation.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ScreenSaver.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Selection.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ShadowHDS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ShadowPlane.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ShadowVolume.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SimpleNavigation.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.SkyDome.pas"/>
-        <DCCReference Include="..\Source\GLS.SmoothNavigator.pas"/>
-        <DCCReference Include="..\Source\GLS.SoundManager.pas"/>
-        <DCCReference Include="..\Source\GLS.SoundFileObjects.pas"/>
-        <DCCReference Include="..\Source\GLS.SpacePartition.pas"/>
-        <DCCReference Include="..\Source\GLS.State.pas"/>
-        <DCCReference Include="..\Source\GLS.SpaceText.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SmoothNavigator.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SoundManager.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SoundFileObjects.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SpacePartition.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.State.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.SpaceText.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.SceneViewer.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.SmartObjects.pas"/>
         <DCCReference Include="..\Source\GLS.TerrainRenderer.pas"/>
         <DCCReference Include="..\Source\GLS.TexLensFlare.pas"/>
-        <DCCReference Include="..\Source\GLS.Texture.pas"/>
-        <DCCReference Include="..\Source\GLS.TextureCombiners.pas"/>
-        <DCCReference Include="..\Source\GLS.TextureImageEditors.pas"/>
-        <DCCReference Include="..\Source\GLS.TexturedHDS.pas"/>
-        <DCCReference Include="..\Source\GLS.ThorFX.pas"/>
-        <DCCReference Include="..\Source\GLS.TilePlane.pas"/>
-        <DCCReference Include="..\Source\GLS.TimeEventsMgr.pas"/>
-        <DCCReference Include="..\Source\GLS.Trail.pas"/>
-        <DCCReference Include="..\Source\GLS.Tree.pas"/>
-        <DCCReference Include="..\Source\GLS.Triangulation.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Texture.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.TextureCombiners.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.TextureImageEditors.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.TexturedHDS.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ThorFX.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.TilePlane.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.TimeEventsMgr.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Trail.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Tree.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Triangulation.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.Utils.pas"/>
-        <DCCReference Include="..\Source\GLS.VectorFileObjects.pas"/>
-        <DCCReference Include="..\Source\GLS.VerletTypes.pas"/>
-        <DCCReference Include="..\Source\GLS.VerletClothify.pas"/>
-        <DCCReference Include="..\Source\GLS.WaterPlane.pas"/>
-        <DCCReference Include="..\Source\GLS.Windows.pas"/>
-        <DCCReference Include="..\Source\GLS.WindowsContext.pas"/>
-        <DCCReference Include="..\Source\GLS.WindowsFont.pas"/>
-        <DCCReference Include="..\Source\GLS.zBuffer.pas"/>
-        <DCCReference Include="..\Source\GLS.Silhouette.pas"/>
-        <DCCReference Include="..\Source\GLS.VectorLists.pas"/>
-        <DCCReference Include="..\Source\GLS.ScriptBase.pas"/>
-        <DCCReference Include="..\Source\GLS.XCollection.pas"/>
-        <DCCReference Include="..\Source\GLS.XOpenGL.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.VectorFileObjects.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.VerletTypes.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.VerletClothify.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.WaterPlane.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Windows.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.WindowsContext.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.WindowsFont.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.zBuffer.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.Silhouette.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.VectorLists.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.ScriptBase.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.XCollection.pas"/>
+        <DCCReference Include="..\Source\VCL\GLS.XOpenGL.pas"/>
         <DCCReference Include="..\Source\VCL\GLS.InitOpenGL.pas"/>
-        <DCCReference Include="..\Source\Common\PasGLTF.pas"/>
-        <DCCReference Include="..\Source\Common\PasJSON.pas"/>
-        <DCCReference Include="..\Source\Common\PasDblStrUtils.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.OpenGLAdapter.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.PipelineTransformation.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Polynomials.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.CrossXML.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.OpenGLTokens.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Spline.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Strings.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.TextureFormat.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorGeometry.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorTypes.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorTypesExt.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Logger.pas"/>
+        <DCCReference Include="..\Source\PasGLTF.pas"/>
+        <DCCReference Include="..\Source\PasJSON.pas"/>
+        <DCCReference Include="..\Source\PasDblStrUtils.pas"/>
+        <DCCReference Include="..\Source\Scena.AnimationUtils.pas"/>
+        <DCCReference Include="..\Source\Scena.OpenGLAdapter.pas"/>
+        <DCCReference Include="..\Source\Scena.PipelineTransformation.pas"/>
+        <DCCReference Include="..\Source\Scena.Polynomials.pas"/>
+        <DCCReference Include="..\Source\Scena.CrossXML.pas"/>
+        <DCCReference Include="..\Source\Scena.OpenGLTokens.pas"/>
+        <DCCReference Include="..\Source\Scena.Spline.pas"/>
+        <DCCReference Include="..\Source\Scena.Strings.pas"/>
+        <DCCReference Include="..\Source\Scena.TextureFormat.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorGeometry.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorTypes.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorTypesExt.pas"/>
+        <DCCReference Include="..\Source\Scena.Logger.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GLScene_SDL_dt.dpk

@@ -39,7 +39,7 @@ requires
   GLScene_SDL_rt;
 
 contains
-  SDL.Context in '..\Source\VCL\SDL.Context.pas';
+  SDL.Context in '..\Source\Vcl\SDL.Context.pas';
 
 end.
 

Packages/GLScene_SDL_dt.dproj

@@ -108,7 +108,7 @@
         <DCCReference Include="vclimg.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
         <DCCReference Include="GLScene_SDL_rt.dcp"/>
-        <DCCReference Include="..\Source\VCL\SDL.Context.pas"/>
+        <DCCReference Include="..\Source\Vcl\SDL.Context.pas"/>
         <RcCompile Include="..\Resources\GLSceneSDL.rc">
             <Form>GLSceneSDL.res</Form>
         </RcCompile>

Packages/GLScene_SDL_rt.dpk

@@ -35,8 +35,8 @@ requires
   GLScene_RT;
 
 contains
-  SDL.Window in '..\Source\VCL\SDL.Window.pas',
-  SDL.Import in '..\Source\Common\SDL.Import.pas';
+  SDL.Import in '..\Source\SDL.Import.pas',
+  SDL.Window in '..\Source\VCL\SDL.Window.pas';
 
 end.
 

Packages/GLScene_SDL_rt.dproj

@@ -135,8 +135,8 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
+        <DCCReference Include="..\Source\SDL.Import.pas"/>
         <DCCReference Include="..\Source\VCL\SDL.Window.pas"/>
-        <DCCReference Include="..\Source\Common\SDL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packages/GLScene_Sounds_RT.dpk

@@ -35,12 +35,12 @@ requires
   GLScene_RT;
 
 contains
-  FMOD.Import in '..\Source\Common\FMOD.Import.pas',
-  FMOD.presets in '..\Source\Common\FMOD.presets.pas',
-  FMOD.types in '..\Source\Common\FMOD.types.pas',
-  FMOD.errors in '..\Source\Common\FMOD.errors.pas',
-  BASS.Import in '..\Source\Common\BASS.Import.pas',
-  OpenAL.Import in '..\Source\Common\OpenAL.Import.pas',
+  FMOD.Import in '..\Source\FMOD.Import.pas',
+  FMOD.presets in '..\Source\FMOD.presets.pas',
+  FMOD.types in '..\Source\FMOD.types.pas',
+  FMOD.errors in '..\Source\FMOD.errors.pas',
+  BASS.Import in '..\Source\BASS.Import.pas',
+  OpenAL.Import in '..\Source\OpenAL.Import.pas',
   Sounds.FMOD in '..\Source\VCL\Sounds.FMOD.pas',
   Sounds.BASS in '..\Source\VCL\Sounds.BASS.pas',
   Sounds.OpenAL in '..\Source\VCL\Sounds.OpenAL.pas',

Packages/GLScene_Sounds_RT.dproj

@@ -144,12 +144,12 @@
         <DCCReference Include="vcl.dcp"/>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="GLScene_RT.dcp"/>
-        <DCCReference Include="..\Source\Common\FMOD.Import.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.presets.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.types.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.errors.pas"/>
-        <DCCReference Include="..\Source\Common\BASS.Import.pas"/>
-        <DCCReference Include="..\Source\Common\OpenAL.Import.pas"/>
+        <DCCReference Include="..\Source\FMOD.Import.pas"/>
+        <DCCReference Include="..\Source\FMOD.presets.pas"/>
+        <DCCReference Include="..\Source\FMOD.types.pas"/>
+        <DCCReference Include="..\Source\FMOD.errors.pas"/>
+        <DCCReference Include="..\Source\BASS.Import.pas"/>
+        <DCCReference Include="..\Source\OpenAL.Import.pas"/>
         <DCCReference Include="..\Source\VCL\Sounds.FMOD.pas"/>
         <DCCReference Include="..\Source\VCL\Sounds.BASS.pas"/>
         <DCCReference Include="..\Source\VCL\Sounds.OpenAL.pas"/>

Packagex/GLArena_Cg_RT.dpk

@@ -34,10 +34,10 @@ requires
   GLArena_RT;
 
 contains
+  Cg.Import in '..\Source\Cg.Import.pas',
+  Cg.GL in '..\Source\Cg.GL.pas',
   CGx.Shader in '..\Source\FMX\CGx.Shader.pas',
   CGx.BombShader in '..\Source\FMX\CGx.BombShader.pas',
-  CGx.PostTransformationShader in '..\Source\FMX\CGx.PostTransformationShader.pas',
-  Cg.Import in '..\Source\Common\Cg.Import.pas',
-  Cg.GL in '..\Source\Common\Cg.GL.pas';
+  CGx.PostTransformationShader in '..\Source\FMX\CGx.PostTransformationShader.pas';
 
 end.

Packagex/GLArena_Cg_RT.dproj

@@ -108,11 +108,11 @@
         </DelphiCompile>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="GLArena_RT.dcp"/>
+        <DCCReference Include="..\Source\Cg.Import.pas"/>
+        <DCCReference Include="..\Source\Cg.GL.pas"/>
         <DCCReference Include="..\Source\FMX\CGx.Shader.pas"/>
         <DCCReference Include="..\Source\FMX\CGx.BombShader.pas"/>
         <DCCReference Include="..\Source\FMX\CGx.PostTransformationShader.pas"/>
-        <DCCReference Include="..\Source\Common\Cg.Import.pas"/>
-        <DCCReference Include="..\Source\Common\Cg.GL.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packagex/GLArena_DT.dproj

@@ -217,12 +217,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

Packagex/GLArena_GPU_RT.dpk

@@ -40,15 +40,15 @@ contains
   CUDAx.Context in '..\Source\FMX\CUDAx.Context.pas',
   CUDAx.FFTPlan in '..\Source\FMX\CUDAx.FFTPlan.pas',
   CUDAx.Graphics in '..\Source\FMX\CUDAx.Graphics.pas',
-  OpenCL.GL in '..\Source\Common\OpenCL.GL.pas',
-  OpenCL.Import in '..\Source\Common\OpenCL.Import.pas',
-  OpenCL.Platform in '..\Source\Common\OpenCL.Platform.pas',
-  CUDA.Import in '..\Source\Common\CUDA.Import.pas',
-  CUDA.DataAccess in '..\Source\Common\CUDA.DataAccess.pas',
-  CUDA.FourierTransform in '..\Source\Common\CUDA.FourierTransform.pas',
-  CUDA.ParallelPrimitives in '..\Source\Common\CUDA.ParallelPrimitives.pas',
-  CUDA.Parser in '..\Source\Common\CUDA.Parser.pas',
-  CUDA.Runtime in '..\Source\Common\CUDA.Runtime.pas',
-  CUDA.Utility in '..\Source\Common\CUDA.Utility.pas';
+  OpenCL.GL in '..\Source\OpenCL.GL.pas',
+  OpenCL.Import in '..\Source\OpenCL.Import.pas',
+  OpenCL.Platform in '..\Source\OpenCL.Platform.pas',
+  CUDA.Import in '..\Source\CUDA.Import.pas',
+  CUDA.DataAccess in '..\Source\CUDA.DataAccess.pas',
+  CUDA.FourierTransform in '..\Source\CUDA.FourierTransform.pas',
+  CUDA.ParallelPrimitives in '..\Source\CUDA.ParallelPrimitives.pas',
+  CUDA.Parser in '..\Source\CUDA.Parser.pas',
+  CUDA.Runtime in '..\Source\CUDA.Runtime.pas',
+  CUDA.Utility in '..\Source\CUDA.Utility.pas';
 
 end.

Packagex/GLArena_GPU_RT.dproj

@@ -154,16 +154,16 @@
         <DCCReference Include="..\Source\FMX\CUDAx.Context.pas"/>
         <DCCReference Include="..\Source\FMX\CUDAx.FFTPlan.pas"/>
         <DCCReference Include="..\Source\FMX\CUDAx.Graphics.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.GL.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.Import.pas"/>
-        <DCCReference Include="..\Source\Common\OpenCL.Platform.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Import.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.DataAccess.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.FourierTransform.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.ParallelPrimitives.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Parser.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Runtime.pas"/>
-        <DCCReference Include="..\Source\Common\CUDA.Utility.pas"/>
+        <DCCReference Include="..\Source\OpenCL.GL.pas"/>
+        <DCCReference Include="..\Source\OpenCL.Import.pas"/>
+        <DCCReference Include="..\Source\OpenCL.Platform.pas"/>
+        <DCCReference Include="..\Source\CUDA.Import.pas"/>
+        <DCCReference Include="..\Source\CUDA.DataAccess.pas"/>
+        <DCCReference Include="..\Source\CUDA.FourierTransform.pas"/>
+        <DCCReference Include="..\Source\CUDA.ParallelPrimitives.pas"/>
+        <DCCReference Include="..\Source\CUDA.Parser.pas"/>
+        <DCCReference Include="..\Source\CUDA.Runtime.pas"/>
+        <DCCReference Include="..\Source\CUDA.Utility.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -202,12 +202,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

Packagex/GLArena_Physics_RT.dpk

@@ -38,17 +38,17 @@ requires
   GLArena_RT;
 
 contains
+  Newton.Import in '..\Source\Newton.Import.pas',
+  NGD.Import in '..\Source\NGD.Import.pas',
+  ODE.Import in '..\Source\ODE.Import.pas',
+  ModuleLoader in '..\Source\ModuleLoader.pas',
+  PhysX.Import in '..\Source\PhysX.Import.pas',
   Physix.ODEManager in '..\Source\FMX\Physix.ODEManager.pas',
   Physix.ODESkeletonColliders in '..\Source\FMX\Physix.ODESkeletonColliders.pas',
   Physix.ODEUtils in '..\Source\FMX\Physix.ODEUtils.pas',
   Physix.ODERagdoll in '..\Source\FMX\Physix.ODERagdoll.pas',
   Physix.NGDManager in '..\Source\FMX\Physix.NGDManager.pas',
-  Physix.NGDRagdoll in '..\Source\FMX\Physix.NGDRagdoll.pas',
-  Newton.Import in '..\Source\Common\Newton.Import.pas',
-  NGD.Import in '..\Source\Common\NGD.Import.pas',
-  ODE.Import in '..\Source\Common\ODE.Import.pas',
-  ModuleLoader in '..\Source\Common\ModuleLoader.pas',
-  PhysX.Import in '..\Source\Common\PhysX.Import.pas';
+  Physix.NGDRagdoll in '..\Source\FMX\Physix.NGDRagdoll.pas';
 
 end.
 

Packagex/GLArena_Physics_RT.dproj

@@ -162,17 +162,17 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="fmx.dcp"/>
         <DCCReference Include="GLArena_RT.dcp"/>
+        <DCCReference Include="..\Source\Newton.Import.pas"/>
+        <DCCReference Include="..\Source\NGD.Import.pas"/>
+        <DCCReference Include="..\Source\ODE.Import.pas"/>
+        <DCCReference Include="..\Source\ModuleLoader.pas"/>
+        <DCCReference Include="..\Source\PhysX.Import.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.ODEManager.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.ODESkeletonColliders.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.ODEUtils.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.ODERagdoll.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.NGDManager.pas"/>
         <DCCReference Include="..\Source\FMX\Physix.NGDRagdoll.pas"/>
-        <DCCReference Include="..\Source\Common\Newton.Import.pas"/>
-        <DCCReference Include="..\Source\Common\NGD.Import.pas"/>
-        <DCCReference Include="..\Source\Common\ODE.Import.pas"/>
-        <DCCReference Include="..\Source\Common\ModuleLoader.pas"/>
-        <DCCReference Include="..\Source\Common\PhysX.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packagex/GLArena_RT.dpk

@@ -34,14 +34,14 @@ requires
   fmx;
 
 contains
-  Formats.m3DS in '..\Source\Common\Formats.m3DS.pas',
-  Formats.m3DSConst in '..\Source\Common\Formats.m3DSConst.pas',
-  Formats.m3DSTypes in '..\Source\Common\Formats.m3DSTypes.pas',
-  Formats.m3DSUtils in '..\Source\Common\Formats.m3DSUtils.pas',
-  Formats.DXTC in '..\Source\Common\Formats.DXTC.pas',
-  Formats.GL2 in '..\Source\Common\Formats.GL2.pas',
-  Formats.LWO in '..\Source\Common\Formats.LWO.pas',
-  Formats.VFW in '..\Source\Common\Formats.VFW.pas',
+  Formats.m3DS in '..\Source\Formats.m3DS.pas',
+  Formats.m3DSConst in '..\Source\Formats.m3DSConst.pas',
+  Formats.m3DSTypes in '..\Source\Formats.m3DSTypes.pas',
+  Formats.m3DSUtils in '..\Source\Formats.m3DSUtils.pas',
+  Formats.DXTC in '..\Source\Formats.DXTC.pas',
+  Formats.GL2 in '..\Source\Formats.GL2.pas',
+  Formats.LWO in '..\Source\Formats.LWO.pas',
+  Formats.VFW in '..\Source\Formats.VFW.pas',
   Formatx.B3D in '..\Source\FMX\Formatx.B3D.pas',
   Formatx.DDSImage in '..\Source\FMX\Formatx.DDSImage.pas',
   Formatx.HDRImage in '..\Source\FMX\Formatx.HDRImage.pas',
@@ -234,7 +234,6 @@ contains
   GLX.Manager in '..\Source\FMX\GLX.Manager.pas',
   GLX.PersistentClasses in '..\Source\FMX\GLX.PersistentClasses.pas',
   GLX.Polynomials in '..\Source\FMX\GLX.Polynomials.pas',
-  GLX.RGBE in '..\Source\FMX\GLX.RGBE.pas',
   GLX.SpacePartition in '..\Source\FMX\GLX.SpacePartition.pas',
   GLX.VectorLists in '..\Source\FMX\GLX.VectorLists.pas',
   GLX.XCollection in '..\Source\FMX\GLX.XCollection.pas',
@@ -242,21 +241,22 @@ contains
   GLX.GeometryBB in '..\Source\FMX\GLX.GeometryBB.pas',
   GLX.GeometryCoordinates in '..\Source\FMX\GLX.GeometryCoordinates.pas',
   GLX.OpenGL in '..\Source\FMX\GLX.OpenGL.pas',
-  Vulkan.Import in '..\Source\Common\Vulkan.Import.pas',
+  Vulkan.Import in '..\Source\Vulkan.Import.pas',
   GLSLx.Parameter in '..\Source\FMX\GLSLx.Parameter.pas',
-  Scena.AnimationUtils in '..\Source\Common\Scena.AnimationUtils.pas',
-  Scena.Strings in '..\Source\Common\Scena.Strings.pas',
-  Scena.VectorTypes in '..\Source\Common\Scena.VectorTypes.pas',
-  Scena.VectorTypesExt in '..\Source\Common\Scena.VectorTypesExt.pas',
-  Scena.VectorGeometry in '..\Source\Common\Scena.VectorGeometry.pas',
-  Scena.Spline in '..\Source\Common\Scena.Spline.pas',
-  Scena.TextureFormat in '..\Source\Common\Scena.TextureFormat.pas',
-  Scena.Logger in '..\Source\Common\Scena.Logger.pas',
-  Formats.Q3BSP in '..\Source\Common\Formats.Q3BSP.pas',
-  Scena.Keyboard in '..\Source\Common\Scena.Keyboard.pas',
-  Scena.PipelineTransformation in '..\Source\Common\Scena.PipelineTransformation.pas',
-  Scena.Generics in '..\Source\Common\Scena.Generics.pas',
-  Formats.MD2 in '..\Source\Common\Formats.MD2.pas',
-  Formats.MD3 in '..\Source\Common\Formats.MD3.pas';
+  Scena.AnimationUtils in '..\Source\Scena.AnimationUtils.pas',
+  Scena.Strings in '..\Source\Scena.Strings.pas',
+  Scena.VectorTypes in '..\Source\Scena.VectorTypes.pas',
+  Scena.VectorTypesExt in '..\Source\Scena.VectorTypesExt.pas',
+  Scena.VectorGeometry in '..\Source\Scena.VectorGeometry.pas',
+  Scena.Spline in '..\Source\Scena.Spline.pas',
+  Scena.TextureFormat in '..\Source\Scena.TextureFormat.pas',
+  Scena.Logger in '..\Source\Scena.Logger.pas',
+  Formats.Q3BSP in '..\Source\Formats.Q3BSP.pas',
+  Scena.Keyboard in '..\Source\Scena.Keyboard.pas',
+  Scena.PipelineTransformation in '..\Source\Scena.PipelineTransformation.pas',
+  Scena.Generics in '..\Source\Scena.Generics.pas',
+  Formats.MD2 in '..\Source\Formats.MD2.pas',
+  Formats.MD3 in '..\Source\Formats.MD3.pas',
+  Scena.RGBE in '..\Source\Scena.RGBE.pas';
 
 end.

Packagex/GLArena_RT.dproj

@@ -154,14 +154,14 @@
         </DelphiCompile>
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="fmx.dcp"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DS.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSConst.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSTypes.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.m3DSUtils.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.DXTC.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.GL2.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.LWO.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.VFW.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DS.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSConst.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSTypes.pas"/>
+        <DCCReference Include="..\Source\Formats.m3DSUtils.pas"/>
+        <DCCReference Include="..\Source\Formats.DXTC.pas"/>
+        <DCCReference Include="..\Source\Formats.GL2.pas"/>
+        <DCCReference Include="..\Source\Formats.LWO.pas"/>
+        <DCCReference Include="..\Source\Formats.VFW.pas"/>
         <DCCReference Include="..\Source\FMX\Formatx.B3D.pas"/>
         <DCCReference Include="..\Source\FMX\Formatx.DDSImage.pas"/>
         <DCCReference Include="..\Source\FMX\Formatx.HDRImage.pas"/>
@@ -354,7 +354,6 @@
         <DCCReference Include="..\Source\FMX\GLX.Manager.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.PersistentClasses.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.Polynomials.pas"/>
-        <DCCReference Include="..\Source\FMX\GLX.RGBE.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.SpacePartition.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.VectorLists.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.XCollection.pas"/>
@@ -362,22 +361,23 @@
         <DCCReference Include="..\Source\FMX\GLX.GeometryBB.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.GeometryCoordinates.pas"/>
         <DCCReference Include="..\Source\FMX\GLX.OpenGL.pas"/>
-        <DCCReference Include="..\Source\Common\Vulkan.Import.pas"/>
+        <DCCReference Include="..\Source\Vulkan.Import.pas"/>
         <DCCReference Include="..\Source\FMX\GLSLx.Parameter.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.AnimationUtils.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Strings.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorTypes.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorTypesExt.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.VectorGeometry.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Spline.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.TextureFormat.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Logger.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.Q3BSP.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Keyboard.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.PipelineTransformation.pas"/>
-        <DCCReference Include="..\Source\Common\Scena.Generics.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.MD2.pas"/>
-        <DCCReference Include="..\Source\Common\Formats.MD3.pas"/>
+        <DCCReference Include="..\Source\Scena.AnimationUtils.pas"/>
+        <DCCReference Include="..\Source\Scena.Strings.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorTypes.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorTypesExt.pas"/>
+        <DCCReference Include="..\Source\Scena.VectorGeometry.pas"/>
+        <DCCReference Include="..\Source\Scena.Spline.pas"/>
+        <DCCReference Include="..\Source\Scena.TextureFormat.pas"/>
+        <DCCReference Include="..\Source\Scena.Logger.pas"/>
+        <DCCReference Include="..\Source\Formats.Q3BSP.pas"/>
+        <DCCReference Include="..\Source\Scena.Keyboard.pas"/>
+        <DCCReference Include="..\Source\Scena.PipelineTransformation.pas"/>
+        <DCCReference Include="..\Source\Scena.Generics.pas"/>
+        <DCCReference Include="..\Source\Formats.MD2.pas"/>
+        <DCCReference Include="..\Source\Formats.MD3.pas"/>
+        <DCCReference Include="..\Source\Scena.RGBE.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Packagex/GLArena_SDL_RT.dpk

@@ -35,7 +35,7 @@ requires
   GLArena_RT;
 
 contains
-  SDL.Import in '..\Source\Common\SDL.Import.pas',
+  SDL.Import in '..\Source\SDL.Import.pas',
   SDLx.Window in '..\Source\FMX\SDLx.Window.pas';
 
 end.

Packagex/GLArena_SDL_RT.dproj

@@ -107,7 +107,7 @@
         <DCCReference Include="rtl.dcp"/>
         <DCCReference Include="fmx.dcp"/>
         <DCCReference Include="GLArena_RT.dcp"/>
-        <DCCReference Include="..\Source\Common\SDL.Import.pas"/>
+        <DCCReference Include="..\Source\SDL.Import.pas"/>
         <DCCReference Include="..\Source\FMX\SDLx.Window.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>

Packagex/GLArena_Sounds_RT.dpk

@@ -39,11 +39,11 @@ contains
   Soundx.SMOpenAL in '..\Source\FMX\Soundx.SMOpenAL.pas',
   Soundx.SMWaveOut in '..\Source\FMX\Soundx.SMWaveOut.pas',
   Soundx.SMBASS in '..\Source\FMX\Soundx.SMBASS.pas',
-  FMOD.errors in '..\Source\Common\FMOD.errors.pas',
-  FMOD.Import in '..\Source\Common\FMOD.Import.pas',
-  FMOD.presets in '..\Source\Common\FMOD.presets.pas',
-  FMOD.types in '..\Source\Common\FMOD.types.pas',
-  BASS.Import in '..\Source\Common\BASS.Import.pas',
-  OpenAL.Import in '..\Source\Common\OpenAL.Import.pas';
+  FMOD.errors in '..\Source\FMOD.errors.pas',
+  FMOD.Import in '..\Source\FMOD.Import.pas',
+  FMOD.presets in '..\Source\FMOD.presets.pas',
+  FMOD.types in '..\Source\FMOD.types.pas',
+  BASS.Import in '..\Source\BASS.Import.pas',
+  OpenAL.Import in '..\Source\OpenAL.Import.pas';
 
 end.

Packagex/GLArena_Sounds_RT.dproj

@@ -161,12 +161,12 @@
         <DCCReference Include="..\Source\FMX\Soundx.SMOpenAL.pas"/>
         <DCCReference Include="..\Source\FMX\Soundx.SMWaveOut.pas"/>
         <DCCReference Include="..\Source\FMX\Soundx.SMBASS.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.errors.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.Import.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.presets.pas"/>
-        <DCCReference Include="..\Source\Common\FMOD.types.pas"/>
-        <DCCReference Include="..\Source\Common\BASS.Import.pas"/>
-        <DCCReference Include="..\Source\Common\OpenAL.Import.pas"/>
+        <DCCReference Include="..\Source\FMOD.errors.pas"/>
+        <DCCReference Include="..\Source\FMOD.Import.pas"/>
+        <DCCReference Include="..\Source\FMOD.presets.pas"/>
+        <DCCReference Include="..\Source\FMOD.types.pas"/>
+        <DCCReference Include="..\Source\BASS.Import.pas"/>
+        <DCCReference Include="..\Source\OpenAL.Import.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -200,12 +200,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libpcre.dylib" Class="DependencyModule">
                     <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>

Source/FMX/CGx.Register.pas

@@ -1,5 +1,5 @@
 //
-// The graphics rendering engine GLXcene http://glscene.org
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CGx.Register;
 
@@ -31,7 +31,7 @@ implementation
 
 procedure Register;
 begin
-  RegisterComponents('GLXcene Shaders', [TCGxShader, TCGxBombShader]);
+  RegisterComponents('GLArena Shaders', [TCGxShader, TCGxBombShader]);
   RegisterPropertyEditor(TypeInfo(TgxLibMaterialName), TCGxBombShader, '',
              TgxLibMaterialNameProperty);
 end;

Source/FMX/CUDAx.API.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CUDAx.API;
 

Source/FMX/CUDAx.Compiler.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CUDAx.Compiler;
 (*

Source/FMX/CUDAx.Context.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CUDAx.Context;
 

Source/FMX/CUDAx.FFTPlan.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CUDAx.FFTPlan;
 

Source/FMX/CUDAx.Graphics.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit CUDAx.Graphics;
 

Source/FMX/DWSx.Classes.pas

@@ -385,7 +385,7 @@ end;
 
 procedure Register;
 begin
-  RegisterComponents('GLXcene DWSx', [TdwxClassesUnit]);
+  RegisterComponents('GLArena DWSx', [TdwxClassesUnit]);
 end;
 
 

Source/FMX/DWSx.Objects.pas

@@ -1,5 +1,5 @@
 //
-// The graphics rendering platform GLXcene http://glscene.org
+// The graphics platform GLArena https://github.com/glscene
 //
 unit DWSx.Objects;
 (*

Source/FMX/DWSx.Scene.pas

@@ -1056,7 +1056,7 @@ end;
 
 procedure Register;
 begin
-  RegisterComponents('GLXcene DWX', [TdwxGLSceneUnit]);
+  RegisterComponents('GLArena DWX', [TdwxGLSceneUnit]);
 end;
 
 

Source/FMX/DWSx.Script.pas

@@ -77,7 +77,7 @@ implementation
 procedure Register;
 begin
   RegisterClasses([TgxDelphiWebScriptII, TgxScriptDWS]);
-  RegisterComponents('GLXcene DWSx', [TgxDelphiWebScript]);
+  RegisterComponents('GLArena DWSx', [TgxDelphiWebScript]);
 end;
 
 

Source/FMX/FMxCUDAEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxCUDAEditor;
 

Source/FMX/FMxGuiLayoutEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxGuiLayoutEditor;
 
@@ -126,7 +126,7 @@ var
 begin
   if Items_list.ItemIndex = -1 then
     Exit;
-  { TODO : E2003 Undeclared identifier: 'GuiLayout1' - GLXcene not installed}
+  { TODO : E2003 Undeclared identifier: 'GuiLayout1' - GLArena not installed}
   (*Name_edit.Text := GuiLayout1.GuiComponents[Items_list.ItemIndex].Name;*)
   Elements_grid.Selected := 0;    //in VCL Row
   Elements_grid.ColumnIndex := 0; //in VCL Col

Source/FMX/FMxInfo.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxInfo;
 

Source/FMX/FMxLibMaterialPicker.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxLibMaterialPicker;
 

Source/FMX/FMxMaterialEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxMaterialEditor;
 

Source/FMX/FMxPlugInManagerEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxPlugInManagerEditor;
 

Source/FMX/FMxSceneEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxSceneEditor;
 

Source/FMX/FMxShaderMemo.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxShaderMemo;
 
@@ -61,7 +61,7 @@ implementation
 {$R *.fmx}
 
 const
-  cRegistryKey = 'Software\GLXcene\GLXceneShaderEdit';
+  cRegistryKey = 'Software\GLArena\GLXceneShaderEdit';
 
 var
   vShaderEditor: TShaderMemoForm;

Source/FMX/FMxShaderUniformEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxShaderUniformEditor;
 

Source/FMX/FMxSkinEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxSkinEditor;
 

Source/FMX/FMxXCollectionEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FMxXCollectionEditor;
 

Source/FMX/FRxColorEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FRxColorEditor;
 

Source/FMX/FRxFaceEditor.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FRxFaceEditor;
 

Source/FMX/FRxMaterialPreview.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FRxMaterialPreview;
 

Source/FMX/FRxTextureEdit.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit FRxTextureEdit;
 

Source/FMX/Formatx.B3D.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.B3D;
 

Source/FMX/Formatx.DDSImage.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.DDSImage;
 (*

Source/FMX/Formatx.HDRImage.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.HDRImage;
 (*

Source/FMX/Formatx.MD2.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.MD2;
 

Source/FMX/Formatx.MD3.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.MD3;
 

Source/FMX/Formatx.OCT.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.OCT;
 

Source/FMX/Formatx.TGA.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.TGA;
 
@@ -30,7 +30,7 @@ type
     procedure SaveToFile(const filename: string); override;
     procedure LoadFromStream(stream: TStream); override;
     procedure SaveToStream(stream: TStream); override;
-    class function Capabilities: TgxDataFileCapabilities; override;
+    class function Capabilities: TDataFileCapabilities; override;
     procedure AssignFromTexture(textureContext: TgxContext;
       const textureHandle: GLuint;
       textureTarget: TGLTextureTarget;
@@ -276,7 +276,7 @@ begin
 {$MESSAGE Hint 'TgxTGAImage.AssignFromTexture not yet implemented' }
 end;
 
-class function TgxTGAImage.Capabilities: TgxDataFileCapabilities;
+class function TgxTGAImage.Capabilities: TDataFileCapabilities;
 begin
   Result := [dfcRead {, dfcWrite}];
 end;

Source/FMX/Formatx.VRML.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.VRML;
 

Source/FMX/Formatx.VfsPAK.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.VfsPAK;
 (*
@@ -16,8 +16,8 @@ uses
   System.Classes,
   System.Contnrs,
   System.SysUtils,
-  Scena.Strings,
-  GLX.ApplicationFileIO;
+  GLX.ApplicationFileIO,
+  Scena.Strings;
 
 const
   SIGN = 'PACK'; // Signature for uncompressed - raw pak.
@@ -191,8 +191,8 @@ begin
   FStreamList := TObjectList.Create(True);
   FFilesLists := TObjectList.Create(True);
   ActiveVfsPAK := Self;
-  vAFIOCreateFileStream := PAKCreateFileStream;
-  vAFIOFileStreamExists := PAKFileStreamExists;
+  vGXAFIOCreateFileStream := PAKCreateFileStream;
+  vGXAFIOFileStreamExists := PAKFileStreamExists;
   FCompressionLevel := None;
   FCompressed := False;
 end;
@@ -207,8 +207,8 @@ end;
 
 destructor TgxVfsPAK.Destroy;
 begin
-  vAFIOCreateFileStream := nil;
-  vAFIOFileStreamExists := nil;
+  vGXAFIOCreateFileStream := nil;
+  vGXAFIOFileStreamExists := nil;
   SetLength(FHeaderList, 0);
   FPakFiles.Free;
   // Objects are automatically freed by TObjectList

Source/FMX/Formatx.X.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit Formatx.X;
 

Source/FMX/GLSLx.AsmShader.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit GLSLx.AsmShader;
 

Source/FMX/GLSLx.BumpShaders.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit GLSLx.BumpShaders;
 

Source/FMX/GLSLx.CustomShader.pas

@@ -1,5 +1,5 @@
 //
-// The graphics platform GLXcene https://github.com/glscene
+// The graphics platform GLArena https://github.com/glscene
 //
 unit GLSLx.CustomShader;