From be72d8c58b47a1a4f3db8c8e1e9000b5dff0dcba Mon Sep 17 00:00:00 2001
From: Ahmad El Sayed <ahmad.elsayed@deltares.nl>
Date: Tue, 23 Jan 2024 17:09:19 +0100
Subject: [PATCH] Update WIX settings (#285 | GRIDEDIT-870)

Update WIX settings
---
 package/msi/meshkernel.wxs | 522 ++++++++++++++++++++-----------------
 1 file changed, 285 insertions(+), 237 deletions(-)

diff --git a/package/msi/meshkernel.wxs b/package/msi/meshkernel.wxs
index b017f5d0a..e3308362b 100644
--- a/package/msi/meshkernel.wxs
+++ b/package/msi/meshkernel.wxs
@@ -16,250 +16,286 @@
             <File Id='fId_readme.txt1158be' Name='readme.txt' DiskId='1' Source='package\msi\meshkernel\readme.txt' KeyPath='yes' />
           </Component>
 
-          <Directory Id="dir86FFEC96F085C4DACAED242019AC2960" Name="bin">
-            <Component Id="cmpA46A85FE588D49B502C57F26FC33CC6D" Guid="317D33FF-64B9-4BDF-8647-F1138137BAE5">
-              <File Id="fil6E25B21B8FE485FFA916CF044446DF42" KeyPath="yes" Source="meshkernel\bin\MeshKernelApi.dll" />
+          <Directory Id="dirAFF7B92993BC1C2E79077C8C0DB42FFC" Name="bin">
+            <Component Id="cmp81DF6E3D34F87B447F05F2A216D7690C" Guid="A8A3F3B5-8C62-4461-8D1F-8A437C6B1E8D">
+              <File Id="filA10DFA2B3AF2FFCB40CD2DA25C988872" KeyPath="yes" Source="meshkernel\bin\MeshKernelApi.dll" />
             </Component>
           </Directory>
-          <Directory Id="dir8126D8FB19559CDC158DF15AD56D1418" Name="include">
-            <Directory Id="dir539B589106B8F7804F4503C602D27670" Name="MeshKernel">
-              <Component Id="cmpA33FE6F55D365228AE322B0501E84019" Guid="C6848E06-ED15-406D-B31F-AA8BD5627BBD">
-                <File Id="fil1F03C3074526F6D3D28FBCC32C7476FE" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingInterpolation.hpp" />
+          <Directory Id="dirE943AC7232806A4D114801E13C414E20" Name="include">
+            <Directory Id="dirC3716D0E73E3661576B03972C88598CE" Name="MeshKernel">
+              <Component Id="cmp6D37E0BC9BC7EC792FABCDAA5ED8DFD8" Guid="4FE7E1BA-5C1C-4708-92EA-386FD33D0BFE">
+                <File Id="filC126EE1ADBD2FDC30CF63EED85D0A2DC" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingInterpolation.hpp" />
               </Component>
-              <Component Id="cmpDF722CEE38D77FC11E77DAA84AC0DA24" Guid="CE642917-684E-4649-A71B-8F1328D43458">
-                <File Id="fil17EE2CB70850DF36923AF03FAAED0D76" KeyPath="yes" Source="meshkernel\include\MeshKernel\BilinearInterpolationOnGriddedSamples.hpp" />
+              <Component Id="cmpC4BA1E9CEE4A56AEB48DFD855DBF0E9A" Guid="D22B24DD-7505-46EB-B41C-72F75ED0EF57">
+                <File Id="fil36A9668274FA4F0C9DFE2BAD8970D08F" KeyPath="yes" Source="meshkernel\include\MeshKernel\BilinearInterpolationOnGriddedSamples.hpp" />
               </Component>
-              <Component Id="cmp9D66767375ABFA0C4318728AB3A9821F" Guid="56220F6E-173E-4F55-BCE6-6F874B4D4E25">
-                <File Id="fil613B591283317A814135B5FD7D619CA3" KeyPath="yes" Source="meshkernel\include\MeshKernel\BoundingBox.hpp" />
+              <Component Id="cmp05A162193F10DE931414C1A8C82124D5" Guid="1659C328-6F2D-48B5-90F3-0B606641F1AE">
+                <File Id="fil7C8B287D6FB3D70EE62AB5EC1E9C18BD" KeyPath="yes" Source="meshkernel\include\MeshKernel\BoundingBox.hpp" />
               </Component>
-              <Component Id="cmpB2C13CD3E1E8A7B1DA7E82382902D3C7" Guid="A0EC71BD-C093-4B60-96A7-E23B29B74B37">
-                <File Id="filBF392A42DF13267C2AC17F110C7CA992" KeyPath="yes" Source="meshkernel\include\MeshKernel\ConnectMeshes.hpp" />
+              <Component Id="cmpF5C48B4CAE9BDBBD8064F9A7F2F75820" Guid="4F9F6B27-8E8C-4F63-AB06-08AF64F1613C">
+                <File Id="fil60D73C9F613945DB0A4FDBB9AE0D54B5" KeyPath="yes" Source="meshkernel\include\MeshKernel\ConnectMeshes.hpp" />
               </Component>
-              <Component Id="cmpCAF58E7B16F8F762AB058C2ED68C50EE" Guid="D45BF0B6-94F3-426D-8673-735044B5EC99">
-                <File Id="fil51B498B4D86BBB89105ABBA94A978354" KeyPath="yes" Source="meshkernel\include\MeshKernel\Constants.hpp" />
+              <Component Id="cmpD1586C8C11BD943EA86A8378C60C12C8" Guid="6104C948-1203-46D6-98E6-BA788CC10B8B">
+                <File Id="filE461D2CB3EE482DEF816E58198773900" KeyPath="yes" Source="meshkernel\include\MeshKernel\Constants.hpp" />
               </Component>
-              <Component Id="cmp2ED791785B7432A010E12CADA56F9571" Guid="76821219-8073-4D1A-BA4E-89CD1DA2D634">
-                <File Id="filF56C767BB45B4AF8595A22222CE6A1F9" KeyPath="yes" Source="meshkernel\include\MeshKernel\Contacts.hpp" />
+              <Component Id="cmp727B8FD2452677AC9B3DE9E23FA36EF5" Guid="049DC027-71B2-4730-8904-EA327E34DC6E">
+                <File Id="fil4D682A27043980C7D9A144F6F90F4DE7" KeyPath="yes" Source="meshkernel\include\MeshKernel\Contacts.hpp" />
               </Component>
-              <Component Id="cmp160F93DBECA2BDE46797470E75DAFE7F" Guid="18698CA1-F201-422A-8D4D-9956F71326AD">
-                <File Id="fil8B217CD2997D067E0678CEA111C05481" KeyPath="yes" Source="meshkernel\include\MeshKernel\Definitions.hpp" />
+              <Component Id="cmpD756AE078D842F38995ABCE61203E677" Guid="4ADB9566-CF3C-4C04-A504-29BF59778679">
+                <File Id="fil00E2E6D8F650EEBD54566562448DE852" KeyPath="yes" Source="meshkernel\include\MeshKernel\Definitions.hpp" />
               </Component>
-              <Component Id="cmpE1534E3DBCBCA43DD0BD03F71EB71428" Guid="B6BE34DA-A528-4D37-BEBE-E632C4E2204E">
-                <File Id="fil86650219F730E5AB494230D251E4C7E3" KeyPath="yes" Source="meshkernel\include\MeshKernel\Entities.hpp" />
+              <Component Id="cmpDE878AC6CA9D2DBB32C3C71259CC29C6" Guid="A0EC27F0-69F1-44F0-9963-396FAF0C1796">
+                <File Id="fil17BB3501D0879B13977DDD9A3F71FF86" KeyPath="yes" Source="meshkernel\include\MeshKernel\Entities.hpp" />
               </Component>
-              <Component Id="cmp03D27B89953A0E9788F179ECEEFB1C50" Guid="488699CB-CC8F-4E7F-9D8F-2F02584DAAC4">
-                <File Id="fil5DF5D783A6A7273A76720C3590BF505E" KeyPath="yes" Source="meshkernel\include\MeshKernel\Exceptions.hpp" />
+              <Component Id="cmp0D6640CD583376AEC71C23B90A3D4791" Guid="55897407-0A80-446D-BFF4-E1BAD2843B34">
+                <File Id="fil97C19D0B6075A46E6F328B079710E29D" KeyPath="yes" Source="meshkernel\include\MeshKernel\Exceptions.hpp" />
               </Component>
-              <Component Id="cmp1104353E7061812054689594406CAC4E" Guid="720EBAC9-9028-4B5D-B327-2CBF1C3E5E70">
-                <File Id="fil604A3092CE5B3A3976C42899F1ED4C8C" KeyPath="yes" Source="meshkernel\include\MeshKernel\FlipEdges.hpp" />
+              <Component Id="cmp7C3C32B14C595F4ECEEF0F6DBDE2DBE5" Guid="DFD4C17A-13A7-4D33-BEE0-6A50059C5065">
+                <File Id="fil1D0571F27D1265E1674931EE84C876A7" KeyPath="yes" Source="meshkernel\include\MeshKernel\FlipEdges.hpp" />
               </Component>
-              <Component Id="cmp10F3B88E09D62C5CE13A2BC44592DFF6" Guid="D9AEDD45-FE56-4B0E-983A-44B2B4426E39">
-                <File Id="fil50502B340A1C91912B4931C5EDE02730" KeyPath="yes" Source="meshkernel\include\MeshKernel\Formatting.hpp" />
+              <Component Id="cmp04299DE8D359B514022B89B1B60A3095" Guid="4F844E71-6B5D-41E5-A868-C2929C2B1A50">
+                <File Id="fil261D92DDB95FA42EEC57953A5B52D7CB" KeyPath="yes" Source="meshkernel\include\MeshKernel\Formatting.hpp" />
               </Component>
-              <Component Id="cmpB68DE4150AD8B54CBE0FE8CE8CDB53D2" Guid="588B89A2-671A-49C4-9F02-D3787CAC8B27">
-                <File Id="fil1E34793DD34647A76879837D6F05F91A" KeyPath="yes" Source="meshkernel\include\MeshKernel\LandBoundaries.hpp" />
+              <Component Id="cmp208659C053D064D43802E1CC07474E47" Guid="8193C238-9B84-4543-B3A2-EE177BB02171">
+                <File Id="fil0422AF4DAC80B9DD2AA765207B7C8E13" KeyPath="yes" Source="meshkernel\include\MeshKernel\Hessian.hpp" />
               </Component>
-              <Component Id="cmpB899FA8503C67F00E67A28D3A31CE8B2" Guid="274E3292-D6D5-49B8-BA85-70364C16B5C3">
-                <File Id="fil2BFFFD2CF31CD6FFFF057A9462EB9AE2" KeyPath="yes" Source="meshkernel\include\MeshKernel\LandBoundary.hpp" />
+              <Component Id="cmp50FB6B27D2E7A58E754701BAC5017152" Guid="E57BE2E7-ABD2-4893-8C22-8689DAE3034A">
+                <File Id="fil15CCA84065D78B44D2662B9694B9ED82" KeyPath="yes" Source="meshkernel\include\MeshKernel\LandBoundaries.hpp" />
               </Component>
-              <Component Id="cmp60D257B08548E16946D26AAEF98610DD" Guid="035D712F-DE76-4490-8B21-D265F5324C7D">
-                <File Id="filED7B173CD3BAEE911BCA1C9CEFB15652" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh.hpp" />
+              <Component Id="cmp135DC8E883798E8EDF4098CAF954D66E" Guid="BB840D39-C9A3-42F3-BB55-9E7EA7F81257">
+                <File Id="fil4982AAABC0B893F93494DA127E3638E0" KeyPath="yes" Source="meshkernel\include\MeshKernel\LandBoundary.hpp" />
               </Component>
-              <Component Id="cmp6B27A1EFD1D8DB27A217BF319D55EC61" Guid="56E77EE3-197D-465C-B9B2-9AB3DA6A1277">
-                <File Id="fil0D228F325455943074871E76EAA9C8B7" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh1D.hpp" />
+              <Component Id="cmp8CA0C6EA6F2236AC6E543EE70B7F8916" Guid="56D1018B-B53F-4ABE-82BA-6F7B27832F39">
+                <File Id="fil9980BA21780E702FDBB91CE99A77AF21" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh.hpp" />
               </Component>
-              <Component Id="cmpE4CD81C72326911EED37BFFE3157FBFD" Guid="264E75C6-4045-44E3-853B-A842266187CB">
-                <File Id="fil36CA947531A6E18B9AFABC44F2B36E61" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh2D.hpp" />
+              <Component Id="cmp9F29F612122A49F5DB702ADA4701133A" Guid="6C450202-31AC-496D-8FBA-C5D7C945A034">
+                <File Id="filC45EF8E09F7A8C7C3C6937F515CD883F" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh1D.hpp" />
               </Component>
-              <Component Id="cmpDC21E12FA6857E37995488B15807924B" Guid="8CECC1DC-69AA-42D5-8CB4-6401DAE35B0E">
-                <File Id="fil2E1A90FB8DFBB4A6B02EA24091B0493D" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh2DIntersections.hpp" />
+              <Component Id="cmp8171E1B15DE98190DB1B5661B9EB7178" Guid="1656C8CB-B998-49BA-AA9A-8CC8EF3F28DE">
+                <File Id="fil281FB6D869B8EB19E292393E6D8C0829" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh2D.hpp" />
               </Component>
-              <Component Id="cmp730A6145BFC3A6EB3A6A97379BB1521C" Guid="DEFF656E-837F-49E3-8A0E-3A7B40B8E88C">
-                <File Id="fil8EA3F913BB4AF1BFC8956EDC5BE0F346" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshInterpolation.hpp" />
+              <Component Id="cmp4FC4E33C8C298CA68D5408A806006A70" Guid="29C9B3AD-5E7B-4A35-A214-08832D0C0B2F">
+                <File Id="fil5B686309969C5979855001524292A2B0" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh2DGenerateGlobal.hpp" />
               </Component>
-              <Component Id="cmp6EEACD8C0C56A4E80E2378F8B9613FD4" Guid="F63CEA4B-5511-404D-B94E-3E81BDB2EF7F">
-                <File Id="fil2F611E15A8C7AA5A0551E87C9B9ADAD2" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshRefinement.hpp" />
+              <Component Id="cmp8D927B13775357E446F130DF7136F243" Guid="DFEFD501-4B1E-4941-983D-66B090CD5A51">
+                <File Id="fil044D051C816D252CD193F2670F564602" KeyPath="yes" Source="meshkernel\include\MeshKernel\Mesh2DIntersections.hpp" />
               </Component>
-              <Component Id="cmpB4BA75ECA0322D55629EA1B29705887C" Guid="5EDB8170-815D-4633-B716-12BAEF385B4B">
-                <File Id="fil2F5B482F67D9F6A156F03C8EC4522888" KeyPath="yes" Source="meshkernel\include\MeshKernel\Network1D.hpp" />
+              <Component Id="cmp3745A3CBF28C3C4A2A051F55F235EB82" Guid="E804A41F-B4F5-4DED-9396-AA118EA79646">
+                <File Id="fil559BDDBC194A7F80676BB4A9F2695436" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshConversion.hpp" />
               </Component>
-              <Component Id="cmp22B5A8CD33E66DA41F4F4A997C7472E6" Guid="79A4ED41-B0C9-40D8-9E61-00E953CC763E">
-                <File Id="fil7258A1DC7818CD1B7107F9A06346BD76" KeyPath="yes" Source="meshkernel\include\MeshKernel\Operations.hpp" />
+              <Component Id="cmp272DE54FA9A6D13E33510CE565787E12" Guid="71096431-CDF4-4E46-8D9C-4F29934FADC1">
+                <File Id="fil1C139FFFBE618344C61C37F26C19F536" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshInterpolation.hpp" />
               </Component>
-              <Component Id="cmp0B34CBE6D0384650233592A534BB153C" Guid="F9B3A240-4694-4EC5-B9BC-25F2FBF4157E">
-                <File Id="filA302D083966A14E3A9D1A020889C087E" KeyPath="yes" Source="meshkernel\include\MeshKernel\OrthogonalizationAndSmoothing.hpp" />
+              <Component Id="cmp0CC0A4F80A5F7A4C91C0E8E5E264AB76" Guid="856CEBA6-DFA6-4EB9-AB35-55B2DFFD014C">
+                <File Id="filD652BC29776C6C60078E023DDF834BD8" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshRefinement.hpp" />
               </Component>
-              <Component Id="cmpBE150BD84E571F14233AAA5B1CF4353F" Guid="6434B7CD-C7CB-4F61-9AD4-1CD1726B598E">
-                <File Id="fil93F1091899ECCAD32F20F443597C18A3" KeyPath="yes" Source="meshkernel\include\MeshKernel\Orthogonalizer.hpp" />
+              <Component Id="cmpE62F3486005A907A7FA478124C2C81CF" Guid="D038721A-6543-41D4-9CD7-86A8A29F939E">
+                <File Id="fil8F7D74E5E3706A88FBF753DBE3250E3A" KeyPath="yes" Source="meshkernel\include\MeshKernel\MeshTransformation.hpp" />
               </Component>
-              <Component Id="cmpF22254F3531F62C57E390F9AEF5FC62A" Guid="B7287359-57BA-4A47-903C-111654FAEA5E">
-                <File Id="fil02D76A68E4FE7536294F92AB7AB1F2AA" KeyPath="yes" Source="meshkernel\include\MeshKernel\Parameters.hpp" />
+              <Component Id="cmp751BBBAD16A795D03B1EC4C401B8DF52" Guid="918081BF-84BA-4E98-8AF5-FD3D873F3C3A">
+                <File Id="fil9904EC56ABA1C528673084E68339C938" KeyPath="yes" Source="meshkernel\include\MeshKernel\Network1D.hpp" />
               </Component>
-              <Component Id="cmp3497863DF0AF2378F59E051F0BB215BE" Guid="3E84D009-3B22-499A-94ED-4ADA33BCB7F6">
-                <File Id="filC93475267C4C8EE8718A0B392D8A6CD0" KeyPath="yes" Source="meshkernel\include\MeshKernel\Point.hpp" />
+              <Component Id="cmp76F7C68519E35827B771E19B146F8BC2" Guid="8A127023-3193-47BB-877F-2CE29D5088F2">
+                <File Id="fil0D284C21DEB57789F584ABA703A7E8D2" KeyPath="yes" Source="meshkernel\include\MeshKernel\Operations.hpp" />
               </Component>
-              <Component Id="cmp0A765A7A422030F1790B8522E662AC65" Guid="73B9E683-1D6B-4326-9D28-2A17BF727F72">
-                <File Id="fil35E6BF7CE3C67675E08894A5FE96A630" KeyPath="yes" Source="meshkernel\include\MeshKernel\Polygon.hpp" />
+              <Component Id="cmp165D5AC63E262A3749203997BB7DB4D3" Guid="8142DF32-FE70-435B-A704-FC1D21524248">
+                <File Id="filD5365F617DB5E6B47B698DB4AB82CBE1" KeyPath="yes" Source="meshkernel\include\MeshKernel\OrthogonalizationAndSmoothing.hpp" />
               </Component>
-              <Component Id="cmp05E7D565A5079187A0917B09B2DF77E7" Guid="4FCE93C8-F4BD-4FC6-81DB-C055C23096BD">
-                <File Id="fil54B0421289609C4D4890D513B95C016B" KeyPath="yes" Source="meshkernel\include\MeshKernel\PolygonalEnclosure.hpp" />
+              <Component Id="cmpDAD5E85CBBEEA9C855712D6FEC0A0A90" Guid="38261FC4-2643-470A-9769-369D311F453B">
+                <File Id="filBF55F7718A6687DD34D46CE11A323698" KeyPath="yes" Source="meshkernel\include\MeshKernel\Orthogonalizer.hpp" />
               </Component>
-              <Component Id="cmpFA07291C29473F84F9F55A295176B3BF" Guid="ABE37934-3E7D-40DD-9FD7-4FCB56C19356">
-                <File Id="filB90897EAC2F29C7D3000C9392551E084" KeyPath="yes" Source="meshkernel\include\MeshKernel\Polygons.hpp" />
+              <Component Id="cmp47F2A6275B46DF84758CF9CABF84DCA8" Guid="851E2ED0-7269-42D0-8170-F82D412F6EEE">
+                <File Id="fil803BF14058094DB040BA9D141850CD34" KeyPath="yes" Source="meshkernel\include\MeshKernel\Parameters.hpp" />
               </Component>
-              <Component Id="cmpFFB2E011CC40D54F9F5A11C2146786BE" Guid="88076052-FA30-4F62-A4C7-D48E0CEC6494">
-                <File Id="fil7C32E13C84132155771C8B74BF5AC64A" KeyPath="yes" Source="meshkernel\include\MeshKernel\RangeCheck.hpp" />
+              <Component Id="cmp96AAB0BC2C9800D8F4B2D698330440A1" Guid="0F517AF5-D994-4A23-925A-6DC6761AB4C2">
+                <File Id="fil6CB069BCF170B12EAA2C46CBB84D836F" KeyPath="yes" Source="meshkernel\include\MeshKernel\Point.hpp" />
               </Component>
-              <Component Id="cmp6765ABDE86E3D50A071C51D86754FF4A" Guid="B3DA6103-DB5E-4FB7-9919-334F7141CB15">
-                <File Id="filE25A91889D96FD49D80DD65B32A870E8" KeyPath="yes" Source="meshkernel\include\MeshKernel\RemoveDisconnectedRegions.hpp" />
+              <Component Id="cmp09A2A1623902421B76EC4536EA3672BE" Guid="28F5A22E-F6FF-46D9-8116-84580DA74493">
+                <File Id="filA0A978CC081B1F55E0E4377B84636842" KeyPath="yes" Source="meshkernel\include\MeshKernel\Polygon.hpp" />
               </Component>
-              <Component Id="cmp7A99D01B00C04D452606D52EE5555049" Guid="551C8FE7-1F2F-4ACA-8A84-6A7AFDB6E3C0">
-                <File Id="fil5C56C41F86FE227A61CE44AD548FC073" KeyPath="yes" Source="meshkernel\include\MeshKernel\Smoother.hpp" />
+              <Component Id="cmpD179E447E5900BDB18586F2ABD567DA4" Guid="E06B4535-ABB9-44BF-8D2C-7A5AC8F77C30">
+                <File Id="fil40B9A06643F1F422A5E2BFBC30CF6604" KeyPath="yes" Source="meshkernel\include\MeshKernel\PolygonalEnclosure.hpp" />
               </Component>
-              <Component Id="cmp8F9DFA9CCB9176DE2BCCEC288A3C7794" Guid="EC10EFF1-F493-47A3-8842-231356BD598C">
-                <File Id="filF4F11B8E9E4F17188C930FFFB24D8BF5" KeyPath="yes" Source="meshkernel\include\MeshKernel\SplineAlgorithms.hpp" />
+              <Component Id="cmp5D210BFC83AE854D64A567DE4E9CD0D1" Guid="4C5C7388-2F0C-468C-BE50-2E4EEF3B4A49">
+                <File Id="fil5AFE9867303AB8575BC7FB968F92B99F" KeyPath="yes" Source="meshkernel\include\MeshKernel\Polygons.hpp" />
               </Component>
-              <Component Id="cmp0F719243F1740E571C8099A51E292972" Guid="4FC97BE0-F581-49AB-A6D4-87F81E1E3B00">
-                <File Id="fil4326095EC7AE8B0770F52C011B35CB18" KeyPath="yes" Source="meshkernel\include\MeshKernel\Splines.hpp" />
+              <Component Id="cmpA7BCD45504572382BE2C99536BC9B1C9" Guid="9F375608-2FEC-4AB0-9577-5EAC022BC867">
+                <File Id="fil6E59EE4A5174229BA5AF46FBD602F525" KeyPath="yes" Source="meshkernel\include\MeshKernel\ProjectionConversions.hpp" />
               </Component>
-              <Component Id="cmpCA8B107A65C11F98B15860A3EF1A8B08" Guid="1A7AA256-8F0A-4F97-A895-DDDEA2BF3C10">
-                <File Id="fil892057217EE4F45C593273FCCDEE6F10" KeyPath="yes" Source="meshkernel\include\MeshKernel\TriangulationInterpolation.hpp" />
+              <Component Id="cmpCBD3DA937C803D324EDBDC4C70EC9FBA" Guid="F835B62C-7AC8-468D-928B-B4D6E9AC5C26">
+                <File Id="fil9C07D0A0A073BF4EFB022F18E872D3D5" KeyPath="yes" Source="meshkernel\include\MeshKernel\RangeCheck.hpp" />
               </Component>
-              <Component Id="cmp03E347EFA79F6E722B6147F943132813" Guid="E8085E0F-0F88-4DC3-88F6-778D05E8579B">
-                <File Id="fil854E475FABB9F481B6E9039DAA3B4DF1" KeyPath="yes" Source="meshkernel\include\MeshKernel\TriangulationWrapper.hpp" />
+              <Component Id="cmp968958EB495FEC0A9B92C022AAD0F0EE" Guid="792CD185-8073-4222-9C76-2F70B5328C90">
+                <File Id="filE6593284B3789E67844924EB42CEA5EA" KeyPath="yes" Source="meshkernel\include\MeshKernel\RemoveDisconnectedRegions.hpp" />
               </Component>
-              <Component Id="cmp7AD0F0832A53910F96F21C9EE396834E" Guid="4274055A-1638-4785-996E-F47A4BF60809">
-                <File Id="fil4043FB259E7992555165241EAF8528F1" KeyPath="yes" Source="meshkernel\include\MeshKernel\Vector.hpp" />
+              <Component Id="cmp14652C3D3C50C49F6B0250A20E0E6121" Guid="02EAEE88-EFA7-4F3F-BA61-42FEC28911B9">
+                <File Id="fil52076E276B3430EBA48EDE7B69A7681D" KeyPath="yes" Source="meshkernel\include\MeshKernel\SamplesHessianCalculator.hpp" />
               </Component>
-              <Directory Id="dirA3A5FCEA1596E4102D23E3BB5C8A8219" Name="AveragingStrategies">
-                <Component Id="cmpF3527948FBFC35A3BFEF4ED3061CABCD" Guid="EF01C5F2-BAA8-400B-8DED-6ABB61BEE81A">
-                  <File Id="fil4F80D30180D0315AE1FCADFD4A664EAF" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\AveragingStrategy.hpp" />
+              <Component Id="cmp859289C33FDAF2BC42FD39831A54256A" Guid="3D11F4E5-EA41-421A-A94B-FACD177A032E">
+                <File Id="filE0A09DE706479D2DB0AE7BCA7D7DB8DC" KeyPath="yes" Source="meshkernel\include\MeshKernel\Smoother.hpp" />
+              </Component>
+              <Component Id="cmp588CA4E1B7FC2C374382872304D2F31E" Guid="EA3C3116-8AC7-41E1-9C15-FF01F350198F">
+                <File Id="fil6453B87D03E2867981AAB2E3D2505475" KeyPath="yes" Source="meshkernel\include\MeshKernel\SplineAlgorithms.hpp" />
+              </Component>
+              <Component Id="cmpAFA60AFDAD9134C6C6EF902090D5E6AA" Guid="C42F380B-11BF-4469-A3EA-CF74582F3E94">
+                <File Id="fil1EC43F001702D88E3B7FC520C04E0A5E" KeyPath="yes" Source="meshkernel\include\MeshKernel\Splines.hpp" />
+              </Component>
+              <Component Id="cmp110BB5C53AF5A12D1E107B8DCC97FC75" Guid="D80BFE92-E8CC-42BC-A028-83DFC4705D46">
+                <File Id="filC6D4D4BD3B6C82D36A234750CFC70A31" KeyPath="yes" Source="meshkernel\include\MeshKernel\TriangulationInterpolation.hpp" />
+              </Component>
+              <Component Id="cmp790594B37A11BAECAA65167C28C8D7F2" Guid="65EAC62B-767F-480D-A562-F24B142186ED">
+                <File Id="fil51EB555B71844565F504674972F86742" KeyPath="yes" Source="meshkernel\include\MeshKernel\TriangulationWrapper.hpp" />
+              </Component>
+              <Component Id="cmpB1DCE6A550D5048340D5D4DBD06BABDB" Guid="C0008CB2-A844-4F8E-8E54-599D1B9AD5D3">
+                <File Id="fil6DD0A6B5A7ACF0BCA423769212A162EF" KeyPath="yes" Source="meshkernel\include\MeshKernel\Vector.hpp" />
+              </Component>
+              <Directory Id="dir020FC73980F00091CBFF0802933DBD71" Name="AveragingStrategies">
+                <Component Id="cmpF1A6E54ED5FB430B1B8317676C102096" Guid="D30FC50D-B55D-429D-84D6-7C8A6269C311">
+                  <File Id="fil04AE53B03C25E21A2DD5187B09A3AF0C" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\AveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmp033A01B7E080FDEDBDEF0EF778634531" Guid="9D43779A-6105-4E6D-9B4C-5A58FCFCC479">
-                  <File Id="filBC563BA26150BB00FBF28F37F7F00B81" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\AveragingStrategyFactory.hpp" />
+                <Component Id="cmp75A8BC5AF9DACE360B12C92FB8F44D07" Guid="323902FD-3DAC-442E-BD31-652CEE4AFDD4">
+                  <File Id="fil588030F1E8A510CC3EFE90000821129E" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\AveragingStrategyFactory.hpp" />
                 </Component>
-                <Component Id="cmpE36641702D8E5BFA8B54492DA988D5F9" Guid="541044B9-BD73-48C3-B629-E65D1666D319">
-                  <File Id="fil4B47B87FA026A7A645BF7B8C9A0990D6" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\ClosestAveragingStrategy.hpp" />
+                <Component Id="cmpD91F18E1A4DFCA1016A6859EC056CA28" Guid="C5B763D7-2AEE-4F1A-860E-17B8D3FF3580">
+                  <File Id="filF3BA41A093F295603A7F957A4A496216" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\ClosestAveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmpEF06D8D554FFE8FA9EB985E6312E6342" Guid="C544EB87-4ED6-454D-A236-23E3E14678CF">
-                  <File Id="filAB45F8D7810AAC7A851A91C24CD0DC22" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\InverseWeightedAveragingStrategy.hpp" />
+                <Component Id="cmpAD1AD9563A21C64FE98D20B69737B321" Guid="E8530F4C-5ACF-43CF-9EA2-90CB8120436E">
+                  <File Id="filE02EE69D3047514C4730A8A09A591BB2" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\InverseWeightedAveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmpDC9A0CF745B375C80B6999CD1666B70E" Guid="2DC71736-448F-4987-9738-04CA91D69EE8">
-                  <File Id="fil7B25CCABF191EEEAFACDE368F2CC98D2" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MaxAveragingStrategy.hpp" />
+                <Component Id="cmpD93DF18D278AB78A151D47E93C1064C3" Guid="C373209D-895E-48E8-881D-2C56933B147D">
+                  <File Id="filF7F698DB45FFC6910155A12A5B78BDA1" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MaxAveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmpB2078128AAA5E07706CB27F2FC03A009" Guid="6D08FF75-DE4E-47AC-AE61-2E8B0835E8E8">
-                  <File Id="fil7913877DE205D885D03D090929DE1557" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MinAbsAveragingStrategy.hpp" />
+                <Component Id="cmpBE4323DAEF6CC9C63D5ABDAFC4B69B34" Guid="6C13ACE1-810C-4964-BFAB-68CE85FFD03B">
+                  <File Id="fil6322756E8349CB323D1363DE4433C248" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MinAbsAveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmp836A3DBAD66EA39761444A721A774516" Guid="3129EC5A-18D7-402D-873C-F58254EEE60D">
-                  <File Id="fil70C3188A3B8964A4B0BA250A26B17C77" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MinAveragingStrategy.hpp" />
+                <Component Id="cmp4BAEBCA980E5179EE32098CDDEC9C76B" Guid="F93CABC2-31A1-44A2-BB3A-F69104BF8AD8">
+                  <File Id="filD2221E4620890F4B7C62D10D016605E2" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\MinAveragingStrategy.hpp" />
                 </Component>
-                <Component Id="cmp4FB54CF5DBEA2BC578501E1B02184305" Guid="545E83AF-3A4E-41AB-ABC2-54B5BA92D49C">
-                  <File Id="fil9DF8C54A34EFB9B90956F49B27E7CB98" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\SimpleAveragingStrategy.hpp" />
+                <Component Id="cmp1283553E9E9113F139F72193F1E069E9" Guid="C174149C-BFBF-4082-A6BE-977CC175A736">
+                  <File Id="filFD9DD287961DBDA665E21806B20CA806" KeyPath="yes" Source="meshkernel\include\MeshKernel\AveragingStrategies\SimpleAveragingStrategy.hpp" />
                 </Component>
               </Directory>
-              <Directory Id="dir23CFEB4BC49A9C18AEC90EAB8EEA498B" Name="CurvilinearGrid">
-                <Component Id="cmpB907897E4418EF018A7E31BCA7DCF16F" Guid="CC096B1F-87A0-43C9-80E4-F06D231E2A28">
-                  <File Id="filD0326DF85411231027E14A634190E3F8" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGrid.hpp" />
+              <Directory Id="dirE7348B2688014EFC4C4CC79ACF85E7DF" Name="CurvilinearGrid">
+                <Component Id="cmpF13531B41E957ABE1B673FE5C5C154E1" Guid="CA2CCEFE-0614-449D-AE6A-968064656276">
+                  <File Id="filCA1EE76BEC0F9F62808F05AC9ACB345B" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGrid.hpp" />
                 </Component>
-                <Component Id="cmpD4979C344523C628C0E0C7835DDF2383" Guid="795C9220-B1F5-4714-A2B8-E511A08BE2ED">
-                  <File Id="filEBA3408169D0866A6B58FE92FC0FB203" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridAlgorithm.hpp" />
+                <Component Id="cmpAD9704F153A4E555763A3A3D0DC95847" Guid="FE741F7F-9DD0-47D8-BDEC-8E48FDA19286">
+                  <File Id="fil08028E1FB92C19C90E5719DE028E8F5C" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridAlgorithm.hpp" />
                 </Component>
-                <Component Id="cmp1F58936AE553416FE4689DBCC3732874" Guid="48F5E9D6-A761-4297-B31B-697A16148C1B">
-                  <File Id="fil9CE5DC9B1CE921ED73672FF266C6EDC8" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridDeRefinement.hpp" />
+                <Component Id="cmp220939C9B91BCF986C6B1E446238EDF8" Guid="CA86D91E-98CC-4558-ABD6-9AA645F49D47">
+                  <File Id="filA387B380031350E1937794BA4E6AE864" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridCurvature.hpp" />
                 </Component>
-                <Component Id="cmp8F4B4BE64793EE7C98D301C78A29EED5" Guid="962BC933-A8B1-43C6-896B-8F625922124C">
-                  <File Id="filB15F1E50C43D42869E054E2E263A52DB" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromPolygon.hpp" />
+                <Component Id="cmp09410FBE16D1C476C49D2017B1DC9CBB" Guid="528BBACC-FC45-4683-AD0A-64F7D04743AE">
+                  <File Id="filCAC3C2964E8025C11ED912243FB2E0FA" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridDeleteExterior.hpp" />
                 </Component>
-                <Component Id="cmp6054F7D144E03BFA075F6C315E094FF6" Guid="B75D7CE4-CB30-460B-812A-750B836A2F72">
-                  <File Id="fil88E353DE83359277ED266C22133DA1CE" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromSplines.hpp" />
+                <Component Id="cmp7B87CF8035EF5C0FE14456C3B528E115" Guid="861FF375-E6A7-4309-BE61-9CEC9BBF7152">
+                  <File Id="fil1F2AAEC1AD7DA8F16FC81E9B1B631C20" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridDeleteInterior.hpp" />
                 </Component>
-                <Component Id="cmp51153BA7D3C2B3938A7353D833A0E3DD" Guid="0C0C36EF-9D42-4266-9946-A892F01AAA70">
-                  <File Id="fil9DC9D9E2377B19B5EB6F706A4584CD36" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromSplinesTransfinite.hpp" />
+                <Component Id="cmp93E048F5039D65EAD9375E34C43169E8" Guid="D835BE07-AFA9-440C-9225-7EEDF80DAB3D">
+                  <File Id="fil4BFEA20DBF1F2F47AF4EAC1507996DFA" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridDeRefinement.hpp" />
                 </Component>
-                <Component Id="cmp8928488D81960C4EA7D7CA3AE393E50B" Guid="905C4B69-E2B3-4165-A6A6-AF075D852828">
-                  <File Id="fil2A20E8BD105994E737AFE195041B6B4B" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLine.hpp" />
+                <Component Id="cmpD0288A2C69EA808CF28EACC1D676A511" Guid="16E613A4-1BA9-456C-823E-2E38EFED2869">
+                  <File Id="fil368286BACABC88F4A9425E740CEDD53D" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromPolygon.hpp" />
                 </Component>
-                <Component Id="cmp7413BDAA8D80AE8583EC77F6AB129185" Guid="F989CAC8-9F5F-4AE5-B66D-08671E0AA25C">
-                  <File Id="fil4673C6CFBFBA40CEFDA06F34674933AB" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineAttractionRepulsion.hpp" />
+                <Component Id="cmp1F788E60119F70594CEEDFEB4C40026A" Guid="A6D1908F-21DD-4BD3-AE2F-E0531FA68D19">
+                  <File Id="fil0A521B87ED58E91AF4ADF5DC5C5BBC47" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromSplines.hpp" />
                 </Component>
-                <Component Id="cmp2FC303F62DC05057642A7FA7833EB8D8" Guid="BAE7CFB7-8F6A-4658-B66C-EF44231B42AD">
-                  <File Id="fil5916A8B856D547C6E1B57AED1CE3535E" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineMirror.hpp" />
+                <Component Id="cmp00D909AF7B82E42884C972A14AADC232" Guid="319C550B-15E4-495A-873C-122D0D6C02FE">
+                  <File Id="fil34E05C033AEACB67AE97CF4976909C1E" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridFromSplinesTransfinite.hpp" />
                 </Component>
-                <Component Id="cmp8D4C0C4B7874A5C26B73092977F43263" Guid="744CA90B-4D8C-4A84-B560-029F323C9941">
-                  <File Id="filBD26B2589DEE31630F1C8615C1E04E58" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineShift.hpp" />
+                <Component Id="cmpDF923B28A4831D1A71B1F625DA25CBFD" Guid="212804EB-2A62-40FF-9061-9EA845D7D881">
+                  <File Id="fil41E395AB9050B80FF9F424006FC1AAD5" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLine.hpp" />
                 </Component>
-                <Component Id="cmpE5C8D34B152B3A9F7850211616333C29" Guid="7275ED75-E3ED-4C4E-B643-7AA50ABDF0CA">
-                  <File Id="filFE82DFED2054274A9D7E8BA6AED2F7B8" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridNodeIndices.hpp" />
+                <Component Id="cmp84C03E75861C9E6E28E46E286FBEE5F8" Guid="EEEB5042-70BB-4A4D-95EA-E300E8E2F10A">
+                  <File Id="fil9F87174BD1C0E0F1BC04E3DFCF031D30" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineAttractionRepulsion.hpp" />
                 </Component>
-                <Component Id="cmp6AEF9CD4F181261D844B00F5C659346D" Guid="7668AE13-98F4-45D4-B8FF-EA7C733FA358">
-                  <File Id="fil60CDBAFF5651B3C6378D005F683DE13F" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridOrthogonalization.hpp" />
+                <Component Id="cmpEE8F8E45ABB6942BF1EEF6AF4E6E8063" Guid="69105DE0-6383-4470-877C-CEE531413B2C">
+                  <File Id="fil54A4CD0BCE40237A21F3B231AA801635" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineMirror.hpp" />
                 </Component>
-                <Component Id="cmpBDC6D2AC80181AC00F5C0DEC37901655" Guid="8C2129F6-1999-4E5D-AF77-067D4197C8EB">
-                  <File Id="filDCA2930F1DF455D2B5FE8C46F4FBA591" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridRectangular.hpp" />
+                <Component Id="cmp2B8E06C5871D5A2E807B616A6979825B" Guid="18C4B3D6-6001-4E7E-BEF3-3BCEDB7AA418">
+                  <File Id="fil8433F35F51542432B26C6D9B329A7545" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridLineShift.hpp" />
                 </Component>
-                <Component Id="cmpB86391990F8DF88C3BEEC564CC0B0D30" Guid="46C490FA-DA4E-431A-AF4D-C094953740BD">
-                  <File Id="filB3F8E3A1F65E22499C3167EAA9CBCF90" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridRefinement.hpp" />
+                <Component Id="cmpCCBA2EF5B96EB6C6B029ADB1BE0C1E8F" Guid="F94DDB7E-C392-404A-B015-FC912BCF4571">
+                  <File Id="fil8C118233E5647424036C2F952A5E4178" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridNodeIndices.hpp" />
                 </Component>
-                <Component Id="cmpE9D439149DFE9295493442D4A5E5DB9F" Guid="35574C4C-398C-47D9-B653-7FBFA898865A">
-                  <File Id="fil85CDAA39FA57794DC087F9FE64DE17AE" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridSmoothing.hpp" />
+                <Component Id="cmp865AD5CACB3EE3D263084553CFD0D645" Guid="1CDABFFB-6E6C-4BAB-84F0-F45B42435F06">
+                  <File Id="fil6A13FB390A40EF9FE7DE9BCAAE2DE94D" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridOrthogonalization.hpp" />
                 </Component>
-                <Component Id="cmp285DEC29213448A902EDFC5FA1A58CCC" Guid="1A1BFE23-EABD-406B-89E5-CD08B9C2005E">
-                  <File Id="fil8B0C49055C165E1EE13D17224FCEC4C7" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridSnapping.hpp" />
+                <Component Id="cmp714E8F8CFF92200EC3AC9CB730AFB4A0" Guid="2F756168-C3D0-4B71-8938-F811852F16D5">
+                  <File Id="filADEEFB690DDB0D36850693447937A7C3" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridRectangular.hpp" />
+                </Component>
+                <Component Id="cmp79C93C3918A6328741B2C7F3BCED71FC" Guid="25DF0871-071A-4D40-BD59-F26D23935210">
+                  <File Id="fil7DAD4E8B8D6167DA914F01BBAF8B7364" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridRefinement.hpp" />
+                </Component>
+                <Component Id="cmp39EC0C2C108397BD1E59AE7C5474B4FA" Guid="C590D069-0258-48C1-8B16-A38D8C1BED5E">
+                  <File Id="fil06A833572A4983435CBA47133C3764BF" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridSmoothing.hpp" />
+                </Component>
+                <Component Id="cmp73F3FA2DED59EEA13FFED0D8E25A08A4" Guid="03E8179A-E6A8-48EF-B657-6D6199EC80AC">
+                  <File Id="filF53F3B723829424C976BA253706B5902" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridSmoothness.hpp" />
+                </Component>
+                <Component Id="cmp207F5C7A801392B41D216A1682EEF0BD" Guid="BA03A791-39E2-4E71-B029-7D97E9266699">
+                  <File Id="fil3781005AC0A5CACFA22006E5803B2743" KeyPath="yes" Source="meshkernel\include\MeshKernel\CurvilinearGrid\CurvilinearGridSnapping.hpp" />
                 </Component>
               </Directory>
-              <Directory Id="dir4CCBE94879419B01F2F8DC4BB7DADEC1" Name="Utilities">
-                <Component Id="cmpC9ED58930B84388E95C57DB2FF994AA1" Guid="2E8C3C8B-45D0-4C44-90B4-8FF3899D6753">
-                  <File Id="fil71A6616DD1B3527D1B362A17664C9408" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\LinearAlgebra.hpp" />
+              <Directory Id="dir9BA45E684767F7F746F3B1B00DDEB958" Name="Utilities">
+                <Component Id="cmpE0FDFD68ABA637F9601B9AC85B737838" Guid="E4EA747E-4D49-4C31-BEDF-3ABC959ACE69">
+                  <File Id="fil660D2700971EA4656269CF0AC13CB15B" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\LinearAlgebra.hpp" />
+                </Component>
+                <Component Id="cmp8429390F5F56C49A0722793E834E9A3F" Guid="042E136C-9E7D-4A4A-8D44-6F55355E6BEC">
+                  <File Id="filE9761762208424FF975CE2E63DF659EA" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\NumericFunctions.hpp" />
+                </Component>
+                <Component Id="cmpBB3862893979C6699CB80484A7E3CB12" Guid="2A713446-A249-416B-A9D7-D0C1916CDED2">
+                  <File Id="fil3ED261C1D14C5123166EFC36C36C090C" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\RTree.hpp" />
                 </Component>
-                <Component Id="cmp0581C2BBDCE885462F80CB27B6286608" Guid="7E22E92B-9DE1-48E6-A5B5-9193D44DEBC4">
-                  <File Id="fil6E8F5754FFD03B9567EB1680AF6A45BF" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\NumericFunctions.hpp" />
+                <Component Id="cmp1BE8092AF0D7A94D8FF7A62D3F0927BF" Guid="F57599DB-2B09-4EFC-BAA4-147D8F222488">
+                  <File Id="fil95617D35960BE7C1874B0F296FE40082" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\RTreeBase.hpp" />
                 </Component>
-                <Component Id="cmp621E30D0978E7F46F1276D7771FFB60F" Guid="8E738386-8394-4A71-8196-BCCF7B3CD6EF">
-                  <File Id="fil1535D02ABE3906D5C9D032C4680D21EC" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\RTree.hpp" />
+                <Component Id="cmp113A98B2DCF1F9DEF865B5C5C40FCF09" Guid="E9780D3A-9982-4075-AFEC-B44CD242616E">
+                  <File Id="fil509B45E87FE9C564B3A28B9CA2335297" KeyPath="yes" Source="meshkernel\include\MeshKernel\Utilities\RTreeFactory.hpp" />
                 </Component>
               </Directory>
             </Directory>
-            <Directory Id="dir01B227EE1813F50FDED7D18026E0469A" Name="MeshKernelApi">
-              <Component Id="cmp54BC0C372E8DD0C58C4B831F0AF19CFD" Guid="D11A6BEC-327E-4D46-B859-7EFA3BB26FA1">
-                <File Id="fil8CCD8EB3769D29539A5C1CDBEAA0AFF3" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Contacts.hpp" />
+            <Directory Id="dirF4388DDD0773A7CEAD8CACD599DCCF27" Name="MeshKernelApi">
+              <Component Id="cmp313E67D464734BEEFC28F7FACCD0A8A9" Guid="2BF81E06-8E08-4396-BEED-A1A34694FCB8">
+                <File Id="filD13B707FE21DCE833F27AF160F71754F" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Contacts.hpp" />
               </Component>
-              <Component Id="cmpFF37B22DA5A608F72CDD77241527436F" Guid="F3D563F4-6B99-4B0B-88E8-187CC606D8B6">
-                <File Id="filE2EF9205FB452F38AE27BA84D168E80C" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\CurvilinearGrid.hpp" />
+              <Component Id="cmpDF77634B9AB8989FE5A5623DEA498F8A" Guid="F8254A7F-B25D-467C-87AA-2BFF7D0B698D">
+                <File Id="filC4E2BADF6549F8790C34179E9BBAE25D" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\CurvilinearGrid.hpp" />
               </Component>
-              <Component Id="cmp18EC53651C4E39B0AA6BF01A046FD126" Guid="A17988D6-F06C-489E-9348-A894A6DBF922">
-                <File Id="filFD4DA680527CF9218D8F30AA1FA570BA" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\GeometryList.hpp" />
+              <Component Id="cmpF92486CA7D145D12E735098468C0CF6C" Guid="544649CB-0073-4AF1-9C08-53016B782F3B">
+                <File Id="fil4B1AD336F95CC2088DB8D8859B362E91" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\GeometryList.hpp" />
               </Component>
-              <Component Id="cmp82FC5B1ADEFD6AD5D58F5815A0872237" Guid="6FED5241-65B3-45FE-ACD0-820C400A746E">
-                <File Id="fil59CE8F8EEA84FE9695A476A65949557B" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\GriddedSamples.hpp" />
+              <Component Id="cmp89425D963274969AF0BD7DCF1F325E05" Guid="2A7E848A-E086-49EA-8C2D-AE472A41DBC5">
+                <File Id="filBEF9D3DBADA0A4ED3576D29604239F34" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\GriddedSamples.hpp" />
               </Component>
-              <Component Id="cmp7E2E665570A53CABDCA83C52015A46D1" Guid="8A8BF39A-04E1-4049-873D-10D454B3DD71">
-                <File Id="filEC43FEEF3072D4B96618CAAE6F16A57E" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Mesh1D.hpp" />
+              <Component Id="cmpD4A4C7FAF86F7A98088D54A4EE635AF5" Guid="D6239A6C-5588-4D45-A812-B319914E15E2">
+                <File Id="fil06B58FD0C8686A2BC2AADB9713905B41" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Mesh1D.hpp" />
               </Component>
-              <Component Id="cmpCD70FB6FF8600CC5C7A41E36ACB11A41" Guid="2C7C42C2-8F4C-4402-87BA-6234CB2BB873">
-                <File Id="fil4ACF675308363E917BB095991FDE5928" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Mesh2D.hpp" />
+              <Component Id="cmpFF97E97FA11BC4EA0C3F26F89016B0D5" Guid="FF0E2CC1-6945-4F81-B5CF-0722177C8FEE">
+                <File Id="fil4D5399CA018F293E249B1C38FBCEB50B" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Mesh2D.hpp" />
               </Component>
-              <Component Id="cmp81448812E2AF01D00C1D20F9C2598E7F" Guid="F6DA6607-5403-4128-AA60-1DA9E0EBEAA5">
-                <File Id="fil84F1726D99DDD86350C7CF410F043EAC" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\MeshKernel.hpp" />
+              <Component Id="cmp482DDDC110E3CD181AAE8272EFFAE571" Guid="815A11D5-7424-46BA-82A9-85118641B372">
+                <File Id="filFB2239F62FD5447A62F32E83E903E194" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\MeshKernel.hpp" />
               </Component>
-              <Component Id="cmp55922D4B5B602E27B077C3FD4B41E740" Guid="13ED1051-96A3-481C-A2E2-C628B1F6F7BF">
-                <File Id="filCBB3FCF42CC7D478EB49134D7FED8D8E" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\State.hpp" />
+              <Component Id="cmp4FB1A5717CA143BB0AFA76346A823439" Guid="C29F9D99-BB58-468A-A37C-22096EE49BB0">
+                <File Id="fil1023BDA1C423ADD34331373230C0A09C" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\State.hpp" />
               </Component>
-              <Component Id="cmpE8F685607421A7D7BE7F23A6DCD5E56C" Guid="359BA986-62BD-4A47-A370-25E1A9A9B3AA">
-                <File Id="fil674B5928722D51E2BB4C35BFC4299F9D" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Utils.hpp" />
+              <Component Id="cmp5A92FE6B4D2723C5FF85607D0DF73DB6" Guid="142F70DC-9F44-4D06-922D-7E0FE5BBC27F">
+                <File Id="fil2FC821BD755A9B88341562FFD2235E2F" KeyPath="yes" Source="meshkernel\include\MeshKernelApi\Utils.hpp" />
               </Component>
             </Directory>
-            <Directory Id="dir23352FECA9085F891E6638B099825CC2" Name="Version">
-              <Component Id="cmp0DA6C5DC100F5F273C179B7629385E77" Guid="78558543-7A61-4E04-B813-6AA7445F5C85">
-                <File Id="fil6D3A1301627B9AF22B6D04BD2CCCF03B" KeyPath="yes" Source="meshkernel\include\Version\Version.hpp" />
+            <Directory Id="dir611829BA73F5B7CAD837053B605EE35D" Name="Version">
+              <Component Id="cmpDBB16EFAE7BB5BD81682351E7DAB8C4A" Guid="78459BAE-C825-4B92-BB09-75F2B3ABE641">
+                <File Id="fil5D93E22F69A8ABB2F3C0CE8755D5E17E" KeyPath="yes" Source="meshkernel\include\Version\Version.hpp" />
               </Component>
             </Directory>
           </Directory>
-          <Directory Id="dir8D007A0B564F5A5CA8980256CBD49B4B" Name="lib">
-            <Component Id="cmpA33DB2A1E5E3165A99D9764984A60891" Guid="4D8F4CED-FECA-4A59-A67A-15F0E8154920">
-              <File Id="filEE829EAB0B2F2C6BE2F4AA07B2E22CDF" KeyPath="yes" Source="meshkernel\lib\MeshKernel.lib" />
+          <Directory Id="dirAAA193B5A5015AADBAB7F9C7DDB27425" Name="lib">
+            <Component Id="cmp03CD772CB82F66CC9B3B9A814A68BDD8" Guid="29689BFA-AC3E-4F8A-9035-667335BF9A69">
+              <File Id="filDD1DC3D2B7223ECB8F2E13CC4258766E" KeyPath="yes" Source="meshkernel\lib\MeshKernel.lib" />
             </Component>
-            <Component Id="cmpD8D20E522861F9C0BE849875F314E5C8" Guid="13B2C0B8-E05D-472E-8FFF-B9854AB8AA58">
-              <File Id="filC591DFFB1EFBC9AD0480DDA75CA4205D" KeyPath="yes" Source="meshkernel\lib\MeshKernelApi.lib" />
+            <Component Id="cmp1887F4907424537FE6C06FD3609F2806" Guid="BBCAAFF8-89F3-443F-97AF-5F042F5EFF9B">
+              <File Id="fil540546A295F259C93D1D03151A374241" KeyPath="yes" Source="meshkernel\lib\MeshKernelApi.lib" />
             </Component>
           </Directory>
 
@@ -297,82 +333,94 @@
 
         <ComponentRef Id='cId_readme.txt1158be' />
 
-        <ComponentRef Id="cmpA46A85FE588D49B502C57F26FC33CC6D" />
-        <ComponentRef Id="cmpA33FE6F55D365228AE322B0501E84019" />
-        <ComponentRef Id="cmpDF722CEE38D77FC11E77DAA84AC0DA24" />
-        <ComponentRef Id="cmp9D66767375ABFA0C4318728AB3A9821F" />
-        <ComponentRef Id="cmpB2C13CD3E1E8A7B1DA7E82382902D3C7" />
-        <ComponentRef Id="cmpCAF58E7B16F8F762AB058C2ED68C50EE" />
-        <ComponentRef Id="cmp2ED791785B7432A010E12CADA56F9571" />
-        <ComponentRef Id="cmp160F93DBECA2BDE46797470E75DAFE7F" />
-        <ComponentRef Id="cmpE1534E3DBCBCA43DD0BD03F71EB71428" />
-        <ComponentRef Id="cmp03D27B89953A0E9788F179ECEEFB1C50" />
-        <ComponentRef Id="cmp1104353E7061812054689594406CAC4E" />
-        <ComponentRef Id="cmp10F3B88E09D62C5CE13A2BC44592DFF6" />
-        <ComponentRef Id="cmpB68DE4150AD8B54CBE0FE8CE8CDB53D2" />
-        <ComponentRef Id="cmpB899FA8503C67F00E67A28D3A31CE8B2" />
-        <ComponentRef Id="cmp60D257B08548E16946D26AAEF98610DD" />
-        <ComponentRef Id="cmp6B27A1EFD1D8DB27A217BF319D55EC61" />
-        <ComponentRef Id="cmpE4CD81C72326911EED37BFFE3157FBFD" />
-        <ComponentRef Id="cmpDC21E12FA6857E37995488B15807924B" />
-        <ComponentRef Id="cmp730A6145BFC3A6EB3A6A97379BB1521C" />
-        <ComponentRef Id="cmp6EEACD8C0C56A4E80E2378F8B9613FD4" />
-        <ComponentRef Id="cmpB4BA75ECA0322D55629EA1B29705887C" />
-        <ComponentRef Id="cmp22B5A8CD33E66DA41F4F4A997C7472E6" />
-        <ComponentRef Id="cmp0B34CBE6D0384650233592A534BB153C" />
-        <ComponentRef Id="cmpBE150BD84E571F14233AAA5B1CF4353F" />
-        <ComponentRef Id="cmpF22254F3531F62C57E390F9AEF5FC62A" />
-        <ComponentRef Id="cmp3497863DF0AF2378F59E051F0BB215BE" />
-        <ComponentRef Id="cmp0A765A7A422030F1790B8522E662AC65" />
-        <ComponentRef Id="cmp05E7D565A5079187A0917B09B2DF77E7" />
-        <ComponentRef Id="cmpFA07291C29473F84F9F55A295176B3BF" />
-        <ComponentRef Id="cmpFFB2E011CC40D54F9F5A11C2146786BE" />
-        <ComponentRef Id="cmp6765ABDE86E3D50A071C51D86754FF4A" />
-        <ComponentRef Id="cmp7A99D01B00C04D452606D52EE5555049" />
-        <ComponentRef Id="cmp8F9DFA9CCB9176DE2BCCEC288A3C7794" />
-        <ComponentRef Id="cmp0F719243F1740E571C8099A51E292972" />
-        <ComponentRef Id="cmpCA8B107A65C11F98B15860A3EF1A8B08" />
-        <ComponentRef Id="cmp03E347EFA79F6E722B6147F943132813" />
-        <ComponentRef Id="cmp7AD0F0832A53910F96F21C9EE396834E" />
-        <ComponentRef Id="cmpF3527948FBFC35A3BFEF4ED3061CABCD" />
-        <ComponentRef Id="cmp033A01B7E080FDEDBDEF0EF778634531" />
-        <ComponentRef Id="cmpE36641702D8E5BFA8B54492DA988D5F9" />
-        <ComponentRef Id="cmpEF06D8D554FFE8FA9EB985E6312E6342" />
-        <ComponentRef Id="cmpDC9A0CF745B375C80B6999CD1666B70E" />
-        <ComponentRef Id="cmpB2078128AAA5E07706CB27F2FC03A009" />
-        <ComponentRef Id="cmp836A3DBAD66EA39761444A721A774516" />
-        <ComponentRef Id="cmp4FB54CF5DBEA2BC578501E1B02184305" />
-        <ComponentRef Id="cmpB907897E4418EF018A7E31BCA7DCF16F" />
-        <ComponentRef Id="cmpD4979C344523C628C0E0C7835DDF2383" />
-        <ComponentRef Id="cmp1F58936AE553416FE4689DBCC3732874" />
-        <ComponentRef Id="cmp8F4B4BE64793EE7C98D301C78A29EED5" />
-        <ComponentRef Id="cmp6054F7D144E03BFA075F6C315E094FF6" />
-        <ComponentRef Id="cmp51153BA7D3C2B3938A7353D833A0E3DD" />
-        <ComponentRef Id="cmp8928488D81960C4EA7D7CA3AE393E50B" />
-        <ComponentRef Id="cmp7413BDAA8D80AE8583EC77F6AB129185" />
-        <ComponentRef Id="cmp2FC303F62DC05057642A7FA7833EB8D8" />
-        <ComponentRef Id="cmp8D4C0C4B7874A5C26B73092977F43263" />
-        <ComponentRef Id="cmpE5C8D34B152B3A9F7850211616333C29" />
-        <ComponentRef Id="cmp6AEF9CD4F181261D844B00F5C659346D" />
-        <ComponentRef Id="cmpBDC6D2AC80181AC00F5C0DEC37901655" />
-        <ComponentRef Id="cmpB86391990F8DF88C3BEEC564CC0B0D30" />
-        <ComponentRef Id="cmpE9D439149DFE9295493442D4A5E5DB9F" />
-        <ComponentRef Id="cmp285DEC29213448A902EDFC5FA1A58CCC" />
-        <ComponentRef Id="cmpC9ED58930B84388E95C57DB2FF994AA1" />
-        <ComponentRef Id="cmp0581C2BBDCE885462F80CB27B6286608" />
-        <ComponentRef Id="cmp621E30D0978E7F46F1276D7771FFB60F" />
-        <ComponentRef Id="cmp54BC0C372E8DD0C58C4B831F0AF19CFD" />
-        <ComponentRef Id="cmpFF37B22DA5A608F72CDD77241527436F" />
-        <ComponentRef Id="cmp18EC53651C4E39B0AA6BF01A046FD126" />
-        <ComponentRef Id="cmp82FC5B1ADEFD6AD5D58F5815A0872237" />
-        <ComponentRef Id="cmp7E2E665570A53CABDCA83C52015A46D1" />
-        <ComponentRef Id="cmpCD70FB6FF8600CC5C7A41E36ACB11A41" />
-        <ComponentRef Id="cmp81448812E2AF01D00C1D20F9C2598E7F" />
-        <ComponentRef Id="cmp55922D4B5B602E27B077C3FD4B41E740" />
-        <ComponentRef Id="cmpE8F685607421A7D7BE7F23A6DCD5E56C" />
-        <ComponentRef Id="cmp0DA6C5DC100F5F273C179B7629385E77" />
-        <ComponentRef Id="cmpA33DB2A1E5E3165A99D9764984A60891" />
-        <ComponentRef Id="cmpD8D20E522861F9C0BE849875F314E5C8" />
+        <ComponentRef Id="cmp81DF6E3D34F87B447F05F2A216D7690C" />
+        <ComponentRef Id="cmp6D37E0BC9BC7EC792FABCDAA5ED8DFD8" />
+        <ComponentRef Id="cmpC4BA1E9CEE4A56AEB48DFD855DBF0E9A" />
+        <ComponentRef Id="cmp05A162193F10DE931414C1A8C82124D5" />
+        <ComponentRef Id="cmpF5C48B4CAE9BDBBD8064F9A7F2F75820" />
+        <ComponentRef Id="cmpD1586C8C11BD943EA86A8378C60C12C8" />
+        <ComponentRef Id="cmp727B8FD2452677AC9B3DE9E23FA36EF5" />
+        <ComponentRef Id="cmpD756AE078D842F38995ABCE61203E677" />
+        <ComponentRef Id="cmpDE878AC6CA9D2DBB32C3C71259CC29C6" />
+        <ComponentRef Id="cmp0D6640CD583376AEC71C23B90A3D4791" />
+        <ComponentRef Id="cmp7C3C32B14C595F4ECEEF0F6DBDE2DBE5" />
+        <ComponentRef Id="cmp04299DE8D359B514022B89B1B60A3095" />
+        <ComponentRef Id="cmp208659C053D064D43802E1CC07474E47" />
+        <ComponentRef Id="cmp50FB6B27D2E7A58E754701BAC5017152" />
+        <ComponentRef Id="cmp135DC8E883798E8EDF4098CAF954D66E" />
+        <ComponentRef Id="cmp8CA0C6EA6F2236AC6E543EE70B7F8916" />
+        <ComponentRef Id="cmp9F29F612122A49F5DB702ADA4701133A" />
+        <ComponentRef Id="cmp8171E1B15DE98190DB1B5661B9EB7178" />
+        <ComponentRef Id="cmp4FC4E33C8C298CA68D5408A806006A70" />
+        <ComponentRef Id="cmp8D927B13775357E446F130DF7136F243" />
+        <ComponentRef Id="cmp3745A3CBF28C3C4A2A051F55F235EB82" />
+        <ComponentRef Id="cmp272DE54FA9A6D13E33510CE565787E12" />
+        <ComponentRef Id="cmp0CC0A4F80A5F7A4C91C0E8E5E264AB76" />
+        <ComponentRef Id="cmpE62F3486005A907A7FA478124C2C81CF" />
+        <ComponentRef Id="cmp751BBBAD16A795D03B1EC4C401B8DF52" />
+        <ComponentRef Id="cmp76F7C68519E35827B771E19B146F8BC2" />
+        <ComponentRef Id="cmp165D5AC63E262A3749203997BB7DB4D3" />
+        <ComponentRef Id="cmpDAD5E85CBBEEA9C855712D6FEC0A0A90" />
+        <ComponentRef Id="cmp47F2A6275B46DF84758CF9CABF84DCA8" />
+        <ComponentRef Id="cmp96AAB0BC2C9800D8F4B2D698330440A1" />
+        <ComponentRef Id="cmp09A2A1623902421B76EC4536EA3672BE" />
+        <ComponentRef Id="cmpD179E447E5900BDB18586F2ABD567DA4" />
+        <ComponentRef Id="cmp5D210BFC83AE854D64A567DE4E9CD0D1" />
+        <ComponentRef Id="cmpA7BCD45504572382BE2C99536BC9B1C9" />
+        <ComponentRef Id="cmpCBD3DA937C803D324EDBDC4C70EC9FBA" />
+        <ComponentRef Id="cmp968958EB495FEC0A9B92C022AAD0F0EE" />
+        <ComponentRef Id="cmp14652C3D3C50C49F6B0250A20E0E6121" />
+        <ComponentRef Id="cmp859289C33FDAF2BC42FD39831A54256A" />
+        <ComponentRef Id="cmp588CA4E1B7FC2C374382872304D2F31E" />
+        <ComponentRef Id="cmpAFA60AFDAD9134C6C6EF902090D5E6AA" />
+        <ComponentRef Id="cmp110BB5C53AF5A12D1E107B8DCC97FC75" />
+        <ComponentRef Id="cmp790594B37A11BAECAA65167C28C8D7F2" />
+        <ComponentRef Id="cmpB1DCE6A550D5048340D5D4DBD06BABDB" />
+        <ComponentRef Id="cmpF1A6E54ED5FB430B1B8317676C102096" />
+        <ComponentRef Id="cmp75A8BC5AF9DACE360B12C92FB8F44D07" />
+        <ComponentRef Id="cmpD91F18E1A4DFCA1016A6859EC056CA28" />
+        <ComponentRef Id="cmpAD1AD9563A21C64FE98D20B69737B321" />
+        <ComponentRef Id="cmpD93DF18D278AB78A151D47E93C1064C3" />
+        <ComponentRef Id="cmpBE4323DAEF6CC9C63D5ABDAFC4B69B34" />
+        <ComponentRef Id="cmp4BAEBCA980E5179EE32098CDDEC9C76B" />
+        <ComponentRef Id="cmp1283553E9E9113F139F72193F1E069E9" />
+        <ComponentRef Id="cmpF13531B41E957ABE1B673FE5C5C154E1" />
+        <ComponentRef Id="cmpAD9704F153A4E555763A3A3D0DC95847" />
+        <ComponentRef Id="cmp220939C9B91BCF986C6B1E446238EDF8" />
+        <ComponentRef Id="cmp09410FBE16D1C476C49D2017B1DC9CBB" />
+        <ComponentRef Id="cmp7B87CF8035EF5C0FE14456C3B528E115" />
+        <ComponentRef Id="cmp93E048F5039D65EAD9375E34C43169E8" />
+        <ComponentRef Id="cmpD0288A2C69EA808CF28EACC1D676A511" />
+        <ComponentRef Id="cmp1F788E60119F70594CEEDFEB4C40026A" />
+        <ComponentRef Id="cmp00D909AF7B82E42884C972A14AADC232" />
+        <ComponentRef Id="cmpDF923B28A4831D1A71B1F625DA25CBFD" />
+        <ComponentRef Id="cmp84C03E75861C9E6E28E46E286FBEE5F8" />
+        <ComponentRef Id="cmpEE8F8E45ABB6942BF1EEF6AF4E6E8063" />
+        <ComponentRef Id="cmp2B8E06C5871D5A2E807B616A6979825B" />
+        <ComponentRef Id="cmpCCBA2EF5B96EB6C6B029ADB1BE0C1E8F" />
+        <ComponentRef Id="cmp865AD5CACB3EE3D263084553CFD0D645" />
+        <ComponentRef Id="cmp714E8F8CFF92200EC3AC9CB730AFB4A0" />
+        <ComponentRef Id="cmp79C93C3918A6328741B2C7F3BCED71FC" />
+        <ComponentRef Id="cmp39EC0C2C108397BD1E59AE7C5474B4FA" />
+        <ComponentRef Id="cmp73F3FA2DED59EEA13FFED0D8E25A08A4" />
+        <ComponentRef Id="cmp207F5C7A801392B41D216A1682EEF0BD" />
+        <ComponentRef Id="cmpE0FDFD68ABA637F9601B9AC85B737838" />
+        <ComponentRef Id="cmp8429390F5F56C49A0722793E834E9A3F" />
+        <ComponentRef Id="cmpBB3862893979C6699CB80484A7E3CB12" />
+        <ComponentRef Id="cmp1BE8092AF0D7A94D8FF7A62D3F0927BF" />
+        <ComponentRef Id="cmp113A98B2DCF1F9DEF865B5C5C40FCF09" />
+        <ComponentRef Id="cmp313E67D464734BEEFC28F7FACCD0A8A9" />
+        <ComponentRef Id="cmpDF77634B9AB8989FE5A5623DEA498F8A" />
+        <ComponentRef Id="cmpF92486CA7D145D12E735098468C0CF6C" />
+        <ComponentRef Id="cmp89425D963274969AF0BD7DCF1F325E05" />
+        <ComponentRef Id="cmpD4A4C7FAF86F7A98088D54A4EE635AF5" />
+        <ComponentRef Id="cmpFF97E97FA11BC4EA0C3F26F89016B0D5" />
+        <ComponentRef Id="cmp482DDDC110E3CD181AAE8272EFFAE571" />
+        <ComponentRef Id="cmp4FB1A5717CA143BB0AFA76346A823439" />
+        <ComponentRef Id="cmp5A92FE6B4D2723C5FF85607D0DF73DB6" />
+        <ComponentRef Id="cmpDBB16EFAE7BB5BD81682351E7DAB8C4A" />
+        <ComponentRef Id="cmp03CD772CB82F66CC9B3B9A814A68BDD8" />
+        <ComponentRef Id="cmp1887F4907424537FE6C06FD3609F2806" />
 
         <!-- Menu plus ENV -->
         <ComponentRef Id='ProgramMenuDir' />