diff --git a/components/pngcomponents/Delphi/PNG_D5.dpk b/components/pngcomponents/Delphi/PNG_D5.dpk
deleted file mode 100644
index 1fe3d9bf..00000000
--- a/components/pngcomponents/Delphi/PNG_D5.dpk
+++ /dev/null
@@ -1,35 +0,0 @@
-package PNG_D5;
-
-{$ALIGN ON}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$IMPLICITBUILD OFF}
-{$DESCRIPTION 'PNG image runtime/designtime'}
-
-requires
-  vcl50;
-
-contains
-  pngimage in '..\Source\pngimage.pas',
-  pnglang in '..\Source\pnglang.pas',
-  pngzlib in '..\Source\pngzlib.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PNG_D6.dpk b/components/pngcomponents/Delphi/PNG_D6.dpk
deleted file mode 100644
index ae0d12be..00000000
--- a/components/pngcomponents/Delphi/PNG_D6.dpk
+++ /dev/null
@@ -1,36 +0,0 @@
-package PNG_D6;
-
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$IMPLICITBUILD OFF}
-{$DESCRIPTION 'PNG image runtime/designtime'}
-
-requires
-  rtl,
-  vcl;
-
-contains
-  pngimage in '..\Source\pngimage.pas',
-  pnglang in '..\Source\pnglang.pas',
-  pngzlib in '..\Source\pngzlib.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PNG_D9.dpk b/components/pngcomponents/Delphi/PNG_D9.dpk
deleted file mode 100644
index bd97689a..00000000
--- a/components/pngcomponents/Delphi/PNG_D9.dpk
+++ /dev/null
@@ -1,36 +0,0 @@
-package PNG_D9;
-
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$IMPLICITBUILD OFF}
-{$DESCRIPTION 'PNG image runtime/designtime'}
-
-requires
-  vcl,
-  rtl;
-
-contains
-  pngimage in '..\Source\pngimage.pas',
-  pnglang in '..\Source\pnglang.pas',
-  pngzlib in '..\Source\pngzlib.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD5.dpk b/components/pngcomponents/Delphi/PngComponentsD5.dpk
deleted file mode 100644
index a5a686ac..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD5.dpk
+++ /dev/null
@@ -1,40 +0,0 @@
-package PngComponentsD5;
-
-{$ALIGN ON}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DESCRIPTION 'Png components'}
-{$RUNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  PNG_D5,
-  VCLX50;
-
-contains
-  PngSpeedButton in '..\Source\PngSpeedButton.pas',
-  PngFunctions in '..\Source\PngFunctions.pas',
-  PngImageList in '..\Source\PngImageList.pas',
-  PngBitBtn in '..\Source\PngBitBtn.pas',
-  PngButtonFunctions in '..\Source\PngButtonFunctions.pas',
-  PngCheckListBox in '..\Source\PngCheckListBox.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD5D.dpk b/components/pngcomponents/Delphi/PngComponentsD5D.dpk
deleted file mode 100644
index e126848c..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD5D.dpk
+++ /dev/null
@@ -1,36 +0,0 @@
-package PngComponentsD5D;
-
-{$R '..\Design\PngComponents.dcr'}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DESCRIPTION 'Png components designtime'}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  PngComponentsD5;
-
-contains
-  PngComponentsRegister in '..\Design\PngComponentsRegister.pas',
-  PngComponentEditors in '..\Design\PngComponentEditors.pas',
-  PngImageListEditor in '..\Design\PngImageListEditor.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD6.dpk b/components/pngcomponents/Delphi/PngComponentsD6.dpk
deleted file mode 100644
index 9d3d1ff5..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD6.dpk
+++ /dev/null
@@ -1,41 +0,0 @@
-package PngComponentsD6;
-
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$IMPLICITBUILD OFF}
-{$DESCRIPTION 'Png components'}
-
-requires
-  rtl,
-  vcl,
-  vclx,
-  PNG_D6;
-
-contains
-  PngSpeedButton in '..\Source\PngSpeedButton.pas',
-  PngButtonFunctions in '..\Source\PngButtonFunctions.pas',
-  PngCheckListBox in '..\Source\PngCheckListBox.pas',
-  PngFunctions in '..\Source\PngFunctions.pas',
-  PngImageList in '..\Source\PngImageList.pas',
-  PngBitBtn in '..\Source\PngBitBtn.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD6D.dpk b/components/pngcomponents/Delphi/PngComponentsD6D.dpk
deleted file mode 100644
index 7d28ee98..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD6D.dpk
+++ /dev/null
@@ -1,37 +0,0 @@
-package PngComponentsD6D;
-
-{$R '..\Design\PngComponents.dcr'}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$IMPLICITBUILD OFF}
-{$DESCRIPTION 'Png components designtime'}
-
-requires
-  designide,
-  PngComponentsD6;
-
-contains
-  PngImageListEditor in '..\Design\PngImageListEditor.pas',
-  PngComponentsRegister in '..\Design\PngComponentsRegister.pas',
-  PngComponentEditors in '..\Design\PngComponentEditors.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD7.dpk b/components/pngcomponents/Delphi/PngComponentsD7.dpk
deleted file mode 100644
index 333b9881..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD7.dpk
+++ /dev/null
@@ -1,42 +0,0 @@
-package PngComponentsD7;
-
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DESCRIPTION 'Png components'}
-{$RUNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  vclactnband,
-  vcl,
-  rtl,
-  PNG_D7;
-
-contains
-  PngSpeedButton in '..\Source\PngSpeedButton.pas',
-  PngFunctions in '..\Source\PngFunctions.pas',
-  PngImageList in '..\Source\PngImageList.pas',
-  PngBitBtn in '..\Source\PngBitBtn.pas',
-  PngButtonFunctions in '..\Source\PngButtonFunctions.pas',
-  PngCheckListBox in '..\Source\PngCheckListBox.pas';
-
-end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD9D.dpk b/components/pngcomponents/Delphi/PngComponentsD9D.dpk
deleted file mode 100644
index 4fde779f..00000000
--- a/components/pngcomponents/Delphi/PngComponentsD9D.dpk
+++ /dev/null
@@ -1,38 +0,0 @@
-package PngComponentsD9D;
-
-{$R '..\Design\PngComponents.dcr'}
-{$ALIGN 8}
-{$ASSERTIONS ON}
-{$BOOLEVAL OFF}
-{$DEBUGINFO ON}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST OFF}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $400000}
-{$DESCRIPTION 'Png components designtime'}
-{$DESIGNONLY}
-{$IMPLICITBUILD ON}
-
-requires
-  designide,
-  PngComponentsD9;
-
-contains
-  PngComponentsRegister in '..\Design\PngComponentsRegister.pas',
-  PngComponentEditors in '..\Design\PngComponentEditors.pas',
-  PngImageListEditor in '..\Design\PngImageListEditor.pas' {PngImageListEditorDlg};
-
-end.
diff --git a/components/pngcomponents/Example Images/Computer_32.png b/components/pngcomponents/Example Images/Computer_32.png
deleted file mode 100644
index a9b6ac5e..00000000
Binary files a/components/pngcomponents/Example Images/Computer_32.png and /dev/null differ
diff --git a/components/pngcomponents/Example Images/FolderClosed_32.png b/components/pngcomponents/Example Images/FolderClosed_32.png
deleted file mode 100644
index 42ad8acc..00000000
Binary files a/components/pngcomponents/Example Images/FolderClosed_32.png and /dev/null differ
diff --git a/components/pngcomponents/Example Images/FolderOpen_32.png b/components/pngcomponents/Example Images/FolderOpen_32.png
deleted file mode 100644
index 370b5c4a..00000000
Binary files a/components/pngcomponents/Example Images/FolderOpen_32.png and /dev/null differ
diff --git a/components/pngcomponents/Example Images/RemoteComputer_32.png b/components/pngcomponents/Example Images/RemoteComputer_32.png
deleted file mode 100644
index 8e514d1d..00000000
Binary files a/components/pngcomponents/Example Images/RemoteComputer_32.png and /dev/null differ
diff --git a/components/pngcomponents/Delphi/PNG_D7.dpk b/components/pngcomponents/packages/PNG.dpk
similarity index 74%
rename from components/pngcomponents/Delphi/PNG_D7.dpk
rename to components/pngcomponents/packages/PNG.dpk
index 9b9833b1..63079a62 100644
--- a/components/pngcomponents/Delphi/PNG_D7.dpk
+++ b/components/pngcomponents/packages/PNG.dpk
@@ -1,4 +1,4 @@
-package PNG_D7;
+package PNG;
 
 {$ALIGN 8}
 {$ASSERTIONS ON}
@@ -29,8 +29,8 @@ requires
   rtl;
 
 contains
-  pngimage in '..\Source\pngimage.pas',
-  pnglang in '..\Source\pnglang.pas',
-  pngzlib in '..\Source\pngzlib.pas';
+  pngimage in '..\source\pngimage.pas',
+  pnglang in '..\source\pnglang.pas',
+  pngzlib in '..\source\pngzlib.pas';
 
 end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD9.dpk b/components/pngcomponents/packages/PngComponents.dpk
similarity index 57%
rename from components/pngcomponents/Delphi/PngComponentsD9.dpk
rename to components/pngcomponents/packages/PngComponents.dpk
index e9658a88..c81ba39e 100644
--- a/components/pngcomponents/Delphi/PngComponentsD9.dpk
+++ b/components/pngcomponents/packages/PngComponents.dpk
@@ -1,4 +1,4 @@
-package PngComponentsD9;
+package PngComponents;
 
 {$ALIGN 8}
 {$ASSERTIONS ON}
@@ -29,14 +29,14 @@ requires
   vclactnband,
   vcl,
   rtl,
-  PNG_D9;
+  PNG;
 
 contains
-  PngSpeedButton in '..\Source\PngSpeedButton.pas',
-  PngFunctions in '..\Source\PngFunctions.pas',
-  PngImageList in '..\Source\PngImageList.pas',
-  PngBitBtn in '..\Source\PngBitBtn.pas',
-  PngButtonFunctions in '..\Source\PngButtonFunctions.pas',
-  PngCheckListBox in '..\Source\PngCheckListBox.pas';
+  PngSpeedButton in '..\source\PngSpeedButton.pas',
+  PngFunctions in '..\source\PngFunctions.pas',
+  PngImageList in '..\source\PngImageList.pas',
+  PngBitBtn in '..\source\PngBitBtn.pas',
+  PngButtonFunctions in '..\source\PngButtonFunctions.pas',
+  PngCheckListBox in '..\source\PngCheckListBox.pas';
 
 end.
diff --git a/components/pngcomponents/Delphi/PngComponentsD7D.dpk b/components/pngcomponents/packages/PngComponentsD.dpk
similarity index 67%
rename from components/pngcomponents/Delphi/PngComponentsD7D.dpk
rename to components/pngcomponents/packages/PngComponentsD.dpk
index 3495082a..3f08a7d0 100644
--- a/components/pngcomponents/Delphi/PngComponentsD7D.dpk
+++ b/components/pngcomponents/packages/PngComponentsD.dpk
@@ -1,4 +1,4 @@
-package PngComponentsD7D;
+package PngComponentsD;
 
 {$R '..\Design\PngComponents.dcr'}
 {$ALIGN 8}
@@ -28,11 +28,11 @@ package PngComponentsD7D;
 
 requires
   designide,
-  PngComponentsD7;
+  PngComponents;
 
 contains
-  PngComponentsRegister in '..\Design\PngComponentsRegister.pas',
-  PngComponentEditors in '..\Design\PngComponentEditors.pas',
-  PngImageListEditor in '..\Design\PngImageListEditor.pas' {PngImageListEditorDlg};
+  PngComponentsRegister in '..\source\PngComponentsRegister.pas',
+  PngComponentEditors in '..\source\PngComponentEditors.pas',
+  PngImageListEditor in '..\source\PngImageListEditor.pas' {PngImageListEditorDlg};
 
 end.
diff --git a/components/pngcomponents/Design/PngComponentEditors.pas b/components/pngcomponents/source/PngComponentEditors.pas
similarity index 100%
rename from components/pngcomponents/Design/PngComponentEditors.pas
rename to components/pngcomponents/source/PngComponentEditors.pas
diff --git a/components/pngcomponents/Design/PngComponents.dcr b/components/pngcomponents/source/PngComponents.dcr
similarity index 100%
rename from components/pngcomponents/Design/PngComponents.dcr
rename to components/pngcomponents/source/PngComponents.dcr
diff --git a/components/pngcomponents/Design/PngComponentsRegister.pas b/components/pngcomponents/source/PngComponentsRegister.pas
similarity index 100%
rename from components/pngcomponents/Design/PngComponentsRegister.pas
rename to components/pngcomponents/source/PngComponentsRegister.pas
diff --git a/components/pngcomponents/Design/PngImageListEditor.dfm b/components/pngcomponents/source/PngImageListEditor.dfm
similarity index 100%
rename from components/pngcomponents/Design/PngImageListEditor.dfm
rename to components/pngcomponents/source/PngImageListEditor.dfm
diff --git a/components/pngcomponents/Design/PngImageListEditor.pas b/components/pngcomponents/source/PngImageListEditor.pas
similarity index 100%
rename from components/pngcomponents/Design/PngImageListEditor.pas
rename to components/pngcomponents/source/PngImageListEditor.pas