diff --git a/components/lazbarcodes/packages/lazbarcodes.lpk b/components/lazbarcodes/packages/lazbarcodes.lpk
index c32f5557c..fd52f67bf 100644
--- a/components/lazbarcodes/packages/lazbarcodes.lpk
+++ b/components/lazbarcodes/packages/lazbarcodes.lpk
@@ -10,7 +10,7 @@
       <PathDelim Value="\"/>
       <SearchPaths>
         <OtherUnitFiles Value="..\src"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\zint\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
     <Description Value="Provides barcode 1D and 2D generation based in the &apos;C&apos; zint library."/>
diff --git a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
index e01e13d00..02f5c1b5e 100644
--- a/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
+++ b/components/lazbarcodes/packages/lazbarcodes_runtimeonly.lpk
@@ -8,8 +8,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="..\src"/>
-        <OtherUnitFiles Value="..\src"/>
+        <OtherUnitFiles Value="..\src\zint"/>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
     </CompilerOptions>
@@ -32,95 +31,95 @@ own software."/>
     <Version Major="2"/>
     <Files Count="23">
       <Item1>
-        <Filename Value="..\src\zint.pp"/>
+        <Filename Value="..\src\zint\zint.pp"/>
         <UnitName Value="zint"/>
       </Item1>
       <Item2>
-        <Filename Value="..\src\lbc_aztec.pas"/>
+        <Filename Value="..\src\zint\lbc_aztec.pas"/>
         <UnitName Value="lbc_aztec"/>
       </Item2>
       <Item3>
-        <Filename Value="..\src\lbc_basic.pas"/>
+        <Filename Value="..\src\zint\lbc_basic.pas"/>
         <UnitName Value="lbc_basic"/>
       </Item3>
       <Item4>
-        <Filename Value="..\src\lbc_datamatrix.pas"/>
+        <Filename Value="..\src\zint\lbc_datamatrix.pas"/>
         <UnitName Value="lbc_datamatrix"/>
       </Item4>
       <Item5>
-        <Filename Value="..\src\lbc_helper.pas"/>
+        <Filename Value="..\src\zint\lbc_helper.pas"/>
         <UnitName Value="lbc_helper"/>
       </Item5>
       <Item6>
-        <Filename Value="..\src\lbc_qr.pas"/>
+        <Filename Value="..\src\zint\lbc_qr.pas"/>
         <UnitName Value="lbc_qr"/>
       </Item6>
       <Item7>
-        <Filename Value="..\src\lbc_reedsolomon.pas"/>
+        <Filename Value="..\src\zint\lbc_reedsolomon.pas"/>
         <UnitName Value="lbc_reedsolomon"/>
       </Item7>
       <Item8>
-        <Filename Value="..\src\lbc_render.pas"/>
+        <Filename Value="..\src\zint\lbc_render.pas"/>
         <UnitName Value="lbc_render"/>
       </Item8>
       <Item9>
-        <Filename Value="..\src\lbc_sjis.pas"/>
+        <Filename Value="..\src\zint\lbc_sjis.pas"/>
         <UnitName Value="lbc_sjis"/>
       </Item9>
       <Item10>
-        <Filename Value="..\src\lbc_code.pas"/>
+        <Filename Value="..\src\zint\lbc_code.pas"/>
         <UnitName Value="lbc_code"/>
       </Item10>
       <Item11>
-        <Filename Value="..\src\lbc_common.pas"/>
+        <Filename Value="..\src\zint\lbc_common.pas"/>
         <UnitName Value="lbc_common"/>
       </Item11>
       <Item12>
-        <Filename Value="..\src\lbc_2of5.pas"/>
+        <Filename Value="..\src\zint\lbc_2of5.pas"/>
         <UnitName Value="lbc_2of5"/>
       </Item12>
       <Item13>
-        <Filename Value="..\src\lbc_upcean.pas"/>
+        <Filename Value="..\src\zint\lbc_upcean.pas"/>
         <UnitName Value="lbc_upcean"/>
       </Item13>
       <Item14>
-        <Filename Value="..\src\lbc_code128.pas"/>
+        <Filename Value="..\src\zint\lbc_code128.pas"/>
         <UnitName Value="lbc_code128"/>
       </Item14>
       <Item15>
-        <Filename Value="..\src\lbc_gs1.pas"/>
+        <Filename Value="..\src\zint\lbc_gs1.pas"/>
         <UnitName Value="lbc_gs1"/>
       </Item15>
       <Item16>
-        <Filename Value="..\src\lbc_postal.pas"/>
+        <Filename Value="..\src\zint\lbc_postal.pas"/>
         <UnitName Value="lbc_postal"/>
       </Item16>
       <Item17>
-        <Filename Value="..\src\lbc_svg.pas"/>
+        <Filename Value="..\src\zint\lbc_svg.pas"/>
         <UnitName Value="lbc_svg"/>
       </Item17>
       <Item18>
-        <Filename Value="..\src\lbc_medical.pas"/>
+        <Filename Value="..\src\zint\lbc_medical.pas"/>
         <UnitName Value="lbc_medical"/>
       </Item18>
       <Item19>
-        <Filename Value="..\src\lbc_telepen.pas"/>
+        <Filename Value="..\src\zint\lbc_telepen.pas"/>
         <UnitName Value="lbc_telepen"/>
       </Item19>
       <Item20>
-        <Filename Value="..\src\lbc_plessey.pas"/>
+        <Filename Value="..\src\zint\lbc_plessey.pas"/>
         <UnitName Value="lbc_plessey"/>
       </Item20>
       <Item21>
-        <Filename Value="..\src\lbc_pdf417.pas"/>
+        <Filename Value="..\src\zint\lbc_pdf417.pas"/>
         <UnitName Value="lbc_pdf417"/>
       </Item21>
       <Item22>
-        <Filename Value="..\src\lbc_auspost.pas"/>
+        <Filename Value="..\src\zint\lbc_auspost.pas"/>
         <UnitName Value="lbc_auspost"/>
       </Item22>
       <Item23>
-        <Filename Value="..\src\lbc_maxicode.pas"/>
+        <Filename Value="..\src\zint\lbc_maxicode.pas"/>
         <UnitName Value="lbc_MaxiCode"/>
       </Item23>
     </Files>
diff --git a/components/lazbarcodes/src/lbc_2of5.pas b/components/lazbarcodes/src/zint/lbc_2of5.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_2of5.pas
rename to components/lazbarcodes/src/zint/lbc_2of5.pas
diff --git a/components/lazbarcodes/src/lbc_auspost.pas b/components/lazbarcodes/src/zint/lbc_auspost.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_auspost.pas
rename to components/lazbarcodes/src/zint/lbc_auspost.pas
diff --git a/components/lazbarcodes/src/lbc_aztec.pas b/components/lazbarcodes/src/zint/lbc_aztec.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_aztec.pas
rename to components/lazbarcodes/src/zint/lbc_aztec.pas
diff --git a/components/lazbarcodes/src/lbc_basic.pas b/components/lazbarcodes/src/zint/lbc_basic.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_basic.pas
rename to components/lazbarcodes/src/zint/lbc_basic.pas
diff --git a/components/lazbarcodes/src/lbc_code.pas b/components/lazbarcodes/src/zint/lbc_code.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_code.pas
rename to components/lazbarcodes/src/zint/lbc_code.pas
diff --git a/components/lazbarcodes/src/lbc_code128.pas b/components/lazbarcodes/src/zint/lbc_code128.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_code128.pas
rename to components/lazbarcodes/src/zint/lbc_code128.pas
diff --git a/components/lazbarcodes/src/lbc_common.pas b/components/lazbarcodes/src/zint/lbc_common.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_common.pas
rename to components/lazbarcodes/src/zint/lbc_common.pas
diff --git a/components/lazbarcodes/src/lbc_datamatrix.pas b/components/lazbarcodes/src/zint/lbc_datamatrix.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_datamatrix.pas
rename to components/lazbarcodes/src/zint/lbc_datamatrix.pas
diff --git a/components/lazbarcodes/src/lbc_gs1.pas b/components/lazbarcodes/src/zint/lbc_gs1.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_gs1.pas
rename to components/lazbarcodes/src/zint/lbc_gs1.pas
diff --git a/components/lazbarcodes/src/lbc_helper.pas b/components/lazbarcodes/src/zint/lbc_helper.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_helper.pas
rename to components/lazbarcodes/src/zint/lbc_helper.pas
diff --git a/components/lazbarcodes/src/lbc_maxicode.pas b/components/lazbarcodes/src/zint/lbc_maxicode.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_maxicode.pas
rename to components/lazbarcodes/src/zint/lbc_maxicode.pas
diff --git a/components/lazbarcodes/src/lbc_medical.pas b/components/lazbarcodes/src/zint/lbc_medical.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_medical.pas
rename to components/lazbarcodes/src/zint/lbc_medical.pas
diff --git a/components/lazbarcodes/src/lbc_pdf417.pas b/components/lazbarcodes/src/zint/lbc_pdf417.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_pdf417.pas
rename to components/lazbarcodes/src/zint/lbc_pdf417.pas
diff --git a/components/lazbarcodes/src/lbc_plessey.pas b/components/lazbarcodes/src/zint/lbc_plessey.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_plessey.pas
rename to components/lazbarcodes/src/zint/lbc_plessey.pas
diff --git a/components/lazbarcodes/src/lbc_postal.pas b/components/lazbarcodes/src/zint/lbc_postal.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_postal.pas
rename to components/lazbarcodes/src/zint/lbc_postal.pas
diff --git a/components/lazbarcodes/src/lbc_qr.pas b/components/lazbarcodes/src/zint/lbc_qr.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_qr.pas
rename to components/lazbarcodes/src/zint/lbc_qr.pas
diff --git a/components/lazbarcodes/src/lbc_reedsolomon.pas b/components/lazbarcodes/src/zint/lbc_reedsolomon.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_reedsolomon.pas
rename to components/lazbarcodes/src/zint/lbc_reedsolomon.pas
diff --git a/components/lazbarcodes/src/lbc_render.pas b/components/lazbarcodes/src/zint/lbc_render.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_render.pas
rename to components/lazbarcodes/src/zint/lbc_render.pas
diff --git a/components/lazbarcodes/src/lbc_sjis.pas b/components/lazbarcodes/src/zint/lbc_sjis.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_sjis.pas
rename to components/lazbarcodes/src/zint/lbc_sjis.pas
diff --git a/components/lazbarcodes/src/lbc_svg.pas b/components/lazbarcodes/src/zint/lbc_svg.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_svg.pas
rename to components/lazbarcodes/src/zint/lbc_svg.pas
diff --git a/components/lazbarcodes/src/lbc_telepen.pas b/components/lazbarcodes/src/zint/lbc_telepen.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_telepen.pas
rename to components/lazbarcodes/src/zint/lbc_telepen.pas
diff --git a/components/lazbarcodes/src/lbc_upcean.pas b/components/lazbarcodes/src/zint/lbc_upcean.pas
similarity index 100%
rename from components/lazbarcodes/src/lbc_upcean.pas
rename to components/lazbarcodes/src/zint/lbc_upcean.pas
diff --git a/components/lazbarcodes/src/zint.pp b/components/lazbarcodes/src/zint/zint.pp
similarity index 100%
rename from components/lazbarcodes/src/zint.pp
rename to components/lazbarcodes/src/zint/zint.pp