[commit] r2545 - in trunk: . Install Install/Build

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Oct 1 10:04:16 CDT 2014


Author: ksmyth
Date: Wed Oct  1 10:04:16 2014
New Revision: 2545

Log:
Move away from Merge Modules: automatically generating Component Guids was never supported in merge modules (http://sourceforge.net/p/wix/bugs/1840/). Use .wixlibs instead, which are better supported

Modified:
   trunk/.gitignore
   trunk/Install/Build/build.py
   trunk/Install/Build/tools.py
   trunk/Install/GME.wxs
   trunk/Install/GME_SDK.wxs
   trunk/Install/GME_bin.wxs
   trunk/Install/GME_inc.wxi
   trunk/Install/GME_paradigms.wxs

Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/.gitignore	Wed Oct  1 10:04:16 2014	(r2545)
@@ -19,6 +19,7 @@
 *.log
 *-emergency*.mga
 *.nupkg
+*.wixlib
 Release_PGO
 obj/
 GME/XmlBackEnd/XmlBackEnd.h

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/Build/build.py	Wed Oct  1 10:04:16 2014	(r2545)
@@ -359,7 +359,9 @@
         "-OutputDirectory", os.path.join(GME_ROOT, "Install")])
 
 def build_msms():
-    "Build WiX merge modules (msm files)"
+    """Build WiX libraries (wixlibs files)
+    (Still called build_msms, for historical reasons)
+    """
     
     # Prepare include file with dynamic data
     f = open(os.path.join(GME_ROOT, "Install", "GME_dyn.wxi"), 'w')
@@ -373,10 +375,15 @@
     f.close()
    
     import glob
-    tools.build_WiX([]
-        + [file for file in glob.glob(os.path.join(GME_ROOT, "Install", "*.wxs")) if file.find('GME.wxs') == -1 ]
-        + glob.glob(os.path.join(GME_ROOT, "Install", "PIA*/*.wxi"))
-        )
+    sources = [f for f in glob.glob(os.path.join(GME_ROOT, "Install", "*.wxs")) if f.find('GME.wxs') == -1 ]
+    if prefs['arch'] == 'x64':
+        sources.remove(os.path.join(GME_ROOT, "Install", "GME_SDK.wxs"))
+        sources.remove(os.path.join(GME_ROOT, "Install", "GME_paradigms.wxs"))
+    for file_ in sources:
+        extras = []
+        if os.path.basename(file_) == 'GME_paradigms.wxs':
+            extras = glob.glob(os.path.join(GME_ROOT, "Install", "PIA*/*.wxi"))
+        tools.build_WiX([file_] + extras)
 
 def build_msi():
     "Build WiX installer (msi file)"

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/Build/tools.py	Wed Oct  1 10:04:16 2014	(r2545)
@@ -3,6 +3,7 @@
 # Copyright (c) 2006 ISIS, Vanderbilt University
 #
 # Author: Peter Volgyesi (peter.volgyesi at vanderbilt.edu)
+# Kevin Smyth (ksmyth at isis.vanderbilt.edu)
 #
 """GME Build System - tools module"""
 
@@ -189,12 +190,20 @@
     finally:
         metaproject.Close()
 
+
+def _get_wix_path():
+    import _winreg
+    for wix_ver in ('3.8', '3.7', '3.6', '3.5'):
+        try:
+            with _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Microsoft\\Windows Installer XML\\' + wix_ver) as wixkey:
+                return _winreg.QueryValueEx(wixkey, 'InstallRoot')[0]
+        except Exception as e:
+            pass
+        
 def test_WiX():
     "Test for WiX. Raises exception if not found."
     toolmsg("Trying to execute WiX tool candle.exe")
-    exepath = WIX_CANDLE_PRG
-    if 'WIX' in os.environ.keys():
-        exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
+    exepath = os.path.join(_get_wix_path(), WIX_CANDLE_PRG)
     system([exepath])
     
 
@@ -204,9 +213,7 @@
     return _x64_suffix(os.path.splitext(file)[0]) + ".wixobj"
 
 def _candle(file):
-    exepath = WIX_CANDLE_PRG
-    if 'WIX' in os.environ.keys():
-        exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
+    exepath = os.path.join(_get_wix_path(), WIX_CANDLE_PRG)
     cmd_line = [exepath] + WIX_CANDLE_ARG.split() + ['-dVERSIONSTR=' + prefs['version_string'], '-arch', prefs['arch'], '-out', _get_wixobj(file), file]
     system(cmd_line, os.path.dirname(file))
 
@@ -225,10 +232,16 @@
     for file in wix_files:
         _candle(file)
     
-    exepath = WIX_LIGHT_PRG
-    if 'WIX' in os.environ.keys():
-        exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
     for wxs in mm_files:
-        ext = ('.msm' if wxs.find('GME.wxs') == -1 else '.msi')
-        cmd_line = [exepath] + WIX_LIGHT_ARG.split() + ['-o', _x64_suffix(os.path.splitext(wxs)[0]) + ext] + [ _get_wixobj(file) for file in wxi_files ] + [ _get_wixobj(wxs)]
+        if wxs.find('GME.wxs') == -1:
+            exepath = os.path.join(_get_wix_path(), 'lit.exe')
+            ext = '.wixlib'
+            wixlibs = ['-bf']
+        else:
+            exepath = os.path.join(_get_wix_path(), 'light.exe')
+            ext = '.msi'
+            wixlibs = WIX_LIGHT_ARG.split() + ['GME_bin.wixlib', 'GME_SDK.wixlib', 'GME_paradigms.wixlib']
+            if prefs['arch'] == 'x64':
+                wixlibs += ['GME_bin_x64.wixlib']
+        cmd_line = [exepath] + ['-o', _x64_suffix(os.path.splitext(wxs)[0]) + ext] + [ _get_wixobj(file) for file in wxi_files ] + [ _get_wixobj(wxs)] + wixlibs
         system(cmd_line, dirname)

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/GME.wxs	Wed Oct  1 10:04:16 2014	(r2545)
@@ -88,6 +88,9 @@
       <RemoveExistingProducts After="InstallValidate" />
     </InstallExecuteSequence>
 
+    <SetProperty Id="NETFRAMEWORK" Value="#1" After="AppSearch">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
+    <SetProperty Id="NETFRAMEWORK40" Value="#1" After="AppSearch">NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
+
     <Media Id='1' Cabinet='GME.cab' EmbedCab='yes' />
 
     <Condition Message="This application is only supported on Windows XP or higher.">
@@ -97,7 +100,7 @@
     <Property Id='ARPPRODUCTICON' Value='GME.ico' />
 
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch GME" />
-    <Property Id="WixShellExecTarget" Value="[#GME.exe.$(var.GME_bin_Package_Id_Underscores)]" />
+    <Property Id="WixShellExecTarget" Value="[#GME.exe]" />
     <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
 
     <WixVariable Id="WixUILicenseRtf" Value="..\Doc\Legal\License.rtf" />
@@ -110,10 +113,189 @@
     <!-- DIRECTORY STRUCTURE -->
     <!-- =========================================================== -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='$(var.ProgramFilesNativeFolder)'>
-        <Directory Id='INSTALLDIR' Name='GME'>
+      <Directory Id='ProgramFilesFolder'>
+        <Directory Id='INSTALLDIRx86' Name='GME'>
+          <Directory Id='INSTALLDIR_DOCx86' Name='Doc'>
+            <Directory Id='INSTALLDIR_DOC' />
+            <Directory Id='INSTALLDIR_DOC_TUTORIALS' Name='Tutorials'>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_ICONS' Name='Icons'/>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1' Name='L1'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F1' Name='F1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F2' Name='F2' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F3' Name='F3' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F4' Name='F4' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F5' Name='F5' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F6' Name='F6' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F7' Name='F7' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2' Name='L2'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F1' Name='F1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F2' Name='F2' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F3' Name='F3' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3' Name='L3'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON1' Name='BON1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON2' Name='BON2' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON2Ex' Name='BON2Ex' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4' Name='L4'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F1' Name='F1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F2' Name='F2' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F3' Name='F3' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F4' Name='F4' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F5' Name='F5' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F6' Name='F6' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F7' Name='F7' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5' Name='L5'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F1' Name='F1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F2' Name='F2' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F3' Name='F3' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F4' Name='F4' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F5' Name='F5' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6' Name='L6'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6_F1' Name='F1' />
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6_F2' Name='F2' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L7' Name='L7'>
+                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L7_F1' Name='F1' />
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L8' Name='L8'>
+              </Directory>
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T1' Name='T1' />
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T2' Name='T2' />
+              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T3' Name='T3' />
+            </Directory>
+          </Directory>
+          <Directory Id='INSTALLDIR_BINx86' Name='Bin'/>
+          <Directory Id='INSTALLDIR_INTERFACESx86' Name='Interfaces'>
+            <Directory Id='INSTALLDIR_INTERFACES'/>
+          </Directory>
+          <Directory Id='INSTALLDIR_PARADIGMSx86' Name='Paradigms'>
+            <Directory Id='INSTALLDIR_PARADIGMS32'/>
+            <Directory Id='INSTALLDIR_PARADIGMS_HFSMx86' Name='HFSM'>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_ICONSx86' Name='icons'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATORx86' Name='HFSMSimulator'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_METAGMEx86' Name='MetaGME'>
+              <Directory Id='INSTALLDIR_PARADIGMS_METAGME_PARADIGM'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_UML' Name='UML'>
+              <Directory Id='INSTALLDIR_PARADIGMS_UMLx86'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_UML_PARADIGM'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_UML_DECORATOR' Name='Decorator'>
+                <Directory Id='INSTALLDIR_PARADIGMS_UML_DECORATOR_RES' Name='res' />
+              </Directory>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_HFSM' Name='HFSM'>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_ICONS' Name='icons'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATOR' Name='HFSMSimulator'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_METAGME' Name='MetaGME'>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_SF' Name='SF'>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_BON2SFINTERPRETER' Name='BON2SFInterpreter'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_BON2SFSAMPLE' Name='BON2SFSample'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO' Name='demo'>
+                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_INCLUDE' Name='include' />
+                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_LIB' Name='lib' />
+                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_SCRIPTS' Name='scripts' />
+              </Directory>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_ICONS' Name='icons'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_SFINTERPRETER' Name='SFInterpreter'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE' Name='JavaBONSFExample'>
+                <Directory Id='INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE_SFINTERPRETER' Name='sfInterpreter' />
+              </Directory>
+              <Directory Id='INSTALLDIR_PARADIGMS_SF_XSLT' Name='xslt'/>
+            </Directory>
+          </Directory>
+          <Directory Id='INSTALLDIR_SDKx86' Name='SDK'>
+            <Directory Id='INSTALLDIR_SDK' />
+            <Directory Id='INSTALLDIR_SDK_JAVAx86' Name='Java'>
+              <Directory Id='INSTALLDIR_SDK_JAVA'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSORx86' Name='PatternProcessor' />
+            <Directory Id='INSTALLDIR_SDK_DOTNET' Name='DotNet'>
+              <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR' Name='CSharpDSMLGenerator'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSOR' Name='PatternProcessor' />
+            <Directory Id='INSTALLDIR_SDK_SCRIPTS' Name='Scripts' />
+            <Directory Id='INSTALLDIR_SDK_BON' Name='BON'>
+              <Directory Id='INSTALLDIR_SDK_BON_COMMON' Name='Common' />
+              <Directory Id='INSTALLDIR_SDK_BON_WIZARD' Name='Wizard'>
+                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_1033' Name='1033'>
+                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_1033_IMAGES' Name='Images' />
+                </Directory>
+                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_HTML' Name='HTML'>
+                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_HTML_1033' Name='1033' />
+                </Directory>
+                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_IMAGES' Name='Images' />
+                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_SCRIPTS' Name='Scripts'>
+                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_SCRIPTS_1033' Name='1033' />
+                </Directory>
+                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_TEMPLATES' Name='Templates'>
+                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_TEMPLATES_1033' Name='1033' />
+                </Directory>
+              </Directory>
+            </Directory>
+            <Directory Id='INSTALLDIR_SDK_DECORATORLIB' Name='DecoratorLib'>
+              <Directory Id='INSTALLDIR_SDK_DECORATORLIB_RES' Name='res' />
+            </Directory>
+            <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD' Name='DecoratorWizard'>
+              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_1033' Name='1033'>
+                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_1033_IMAGES' Name='Images' />
+              </Directory>
+              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_HTML' Name='HTML'>
+                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_HTML_1033' Name='1033' />
+              </Directory>
+              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_IMAGES' Name='Images' />
+              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS' Name='Scripts'>
+                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS_1033' Name='1033' />
+              </Directory>
+              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES' Name='Templates'>
+                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES_1033' Name='1033' />
+              </Directory>
+            </Directory>
+            <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES' Name='Decorator Examples'>
+              <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES_NEWSAMPLE' Name='NewSample' />
+              <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES_PLAINSAMPLE' Name='PlainSample' />
+            </Directory>
+          </Directory>
+          <Directory Id='INSTALLDIR_TOOLSx86' Name='Tools' />
+          <Directory Id='INSTALLDIR_LIBSx86' Name='Lib' />
+        </Directory>
+      </Directory>
+      <Directory Id='ProgramMenuFolder'>
+        <Directory Id='ShortcutFolder' Name='GME'>
+          <Directory Id='ShortcutDocFolder' Name='Documentation'>
+            <Directory Id='ShortcutTutorialsFolder' Name='Tutorials' />
+          </Directory>
         </Directory>
       </Directory>
+      <?if $(sys.BUILDARCH)=x64 ?>
+      <Directory Id='ProgramFiles64Folder'>
+        <Directory Id='INSTALLDIRx64' Name='GME'>
+          <Directory Id='INSTALLDIR_DOCx64' Name='Doc'/>
+          <Directory Id='INSTALLDIR_BINx64' Name='Bin'/>
+          <Directory Id='INSTALLDIR_INTERFACESx64' Name='Interfaces'/>
+          <Directory Id='INSTALLDIR_PARADIGMSx64' Name='Paradigms'>
+            <Directory Id='INSTALLDIR_PARADIGMS_HFSMx64' Name='HFSM'>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_ICONSx64' Name='icons'/>
+              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATORx64' Name='HFSMSimulator'/>
+            </Directory>
+            <Directory Id='INSTALLDIR_PARADIGMS_METAGMEx64' Name='MetaGME'/>
+            <Directory Id='INSTALLDIR_PARADIGMS_UMLx64' Name='UML'/>
+          </Directory>
+          <Directory Id='INSTALLDIR_SDKx64' Name='SDK'>
+            <Directory Id='INSTALLDIR_SDK_JAVAx64' Name='Java' />
+            <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSORx64' Name='PatternProcessor' />
+          </Directory>
+          <Directory Id='INSTALLDIR_TOOLSx64' Name='Tools' />
+          <Directory Id='INSTALLDIR_LIBSx64' Name='Lib' />
+        </Directory>
+      </Directory>
+      <?endif?>
     </Directory>
 
     <!-- =========================================================== -->
@@ -126,35 +308,26 @@
       <Merge Id="MFC100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_$(sys.BUILDARCH).msm" DiskId="1" />
       <Merge Id="ATL100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_ATL_$(sys.BUILDARCH).msm" DiskId="1" />
 
-      <Merge Id="GME_bin" Language="1033" SourceFile="GME_bin.msm" DiskId="1" />
-      <Merge Id="GME_SDK" Language="1033" SourceFile="GME_SDK.msm" DiskId="1"/>
-      <Merge Id="GME_paradigms" Language="1033" SourceFile="GME_paradigms.msm" DiskId="1"/>
       <?if $(sys.BUILDARCH)=x64 ?>
-      <Merge Id="GME_bin_x64" Language="1033" SourceFile="GME_bin_x64.msm" DiskId="1" />
       <Merge Id="CRT100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
       <Merge Id="MFC100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_x86.msm" DiskId="1" />
       <Merge Id="ATL100_x86" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_ATL_x86.msm" DiskId="1" />
       <?endif?>
     </DirectoryRef>
 
-    <CustomAction Id="SetWindowsFolder" Property="WindowsFolder.$(var.GME_bin_Package_Id_Underscores)" Value="[WindowsFolder]"/>
-    <InstallExecuteSequence>
-        <Custom Action="SetWindowsFolder" Before="AppSearch" />
-    </InstallExecuteSequence>
-
     <!-- =========================================================== -->
     <!-- FEATURES -->
     <!-- =========================================================== -->
-    <Feature Id='Complete' Title='Generic Modeling Environment' Description='The complete package' Display='expand' Level='1'
-        ConfigurableDirectory='INSTALLDIR'>
+    <Feature Id='Complete' Title='Generic Modeling Environment' Description='The complete package' Display='expand' Level='1'>
 
       <Feature Id='GMEApplication' Title='GME Application' Description='This feature contains the core modeling framework and the meta environment'
           Level='1'>
 
-        <MergeRef Id='GME_bin' />
-        <MergeRef Id='GME_paradigms' />
+        <ComponentGroupRef Id='GME_binx86' />
+        <ComponentGroupRef Id='GME_SDKx86' />
+        <ComponentGroupRef Id='GME_paradigmsx86' />
         <?if $(sys.BUILDARCH)=x64 ?>
-        <MergeRef Id='GME_bin_x64'/>
+        <ComponentGroupRef Id='GME_binx64' />
         <MergeRef Id='CRT100_x86' />
         <MergeRef Id='MFC100_x86' />
         <MergeRef Id='ATL100_x86' />
@@ -170,7 +343,7 @@
 
       <Feature Id='Samples' Title='Samples' Description='These are sample paradigms and interpreters with source code'
           Level='1'>
-        <MergeRef Id='GME_SDK'/>
+        <ComponentGroupRef Id='GME_SDKx86'/>
       </Feature>
     </Feature>
 

Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/GME_SDK.wxs	Wed Oct  1 10:04:16 2014	(r2545)
@@ -5,217 +5,53 @@
 
   <?include GME_dyn.wxi ?>
   <?include GME_inc.wxi ?>
-  <Module Id='GME_bin' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
-
-    <Package Id='8135017B-44EB-4343-BA9F-1998947387E6' Keywords='GME, MIC, modeling, domain specific languages' Description='Generic Modeling Environment Installer'
-        Manufacturer='Vanderbilt University, ISIS'
-        InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
-        InstallPrivileges='elevated' InstallScope='perMachine'/>
-
+  <Fragment>
     <PropertyRef Id="NETFRAMEWORK20"/>
     <PropertyRef Id="NETFRAMEWORK40FULL"/>
     <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-    <SetProperty Id="NETFRAMEWORK" Value="#1" After="AppSearch">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
-    <SetProperty Id="NETFRAMEWORK40" Value="#1" After="AppSearch">NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
-
-    <!-- =========================================================== -->
-    <!-- DIRECTORY STRUCTURE -->
-    <!-- =========================================================== -->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='$(var.ProgramFilesNativeFolder)'>
-        <Directory Id='INSTALLDIR' Name='GME'>
-          <Directory Id='INSTALLDIR_DOC' Name='Doc'>
-            <Directory Id='INSTALLDIR_DOC_TUTORIALS' Name='Tutorials'>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_ICONS' Name='Icons'/>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1' Name='L1'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F1' Name='F1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F2' Name='F2' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F3' Name='F3' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F4' Name='F4' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F5' Name='F5' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F6' Name='F6' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L1_F7' Name='F7' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2' Name='L2'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F1' Name='F1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F2' Name='F2' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L2_F3' Name='F3' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3' Name='L3'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON1' Name='BON1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON2' Name='BON2' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L3_BON2Ex' Name='BON2Ex' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4' Name='L4'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F1' Name='F1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F2' Name='F2' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F3' Name='F3' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F4' Name='F4' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F5' Name='F5' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F6' Name='F6' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L4_F7' Name='F7' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5' Name='L5'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F1' Name='F1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F2' Name='F2' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F3' Name='F3' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F4' Name='F4' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L5_F5' Name='F5' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6' Name='L6'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6_F1' Name='F1' />
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L6_F2' Name='F2' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L7' Name='L7'>
-                <Directory Id='INSTALLDIR_DOC_TUTORIALS_L7_F1' Name='F1' />
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_L8' Name='L8'>
-              </Directory>
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T1' Name='T1' />
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T2' Name='T2' />
-              <Directory Id='INSTALLDIR_DOC_TUTORIALS_T3' Name='T3' />
-            </Directory>
-          </Directory>
-          <Directory Id='INSTALLDIR_INTERFACES' Name='Interfaces'/>
-          <Directory Id='INSTALLDIR_PARADIGMS' Name='Paradigms'>
-            <Directory Id='INSTALLDIR_PARADIGMS_HFSM' Name='HFSM'>
-              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_ICONS' Name='icons'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATOR' Name='HFSMSimulator'/>
-            </Directory>
-            <Directory Id='INSTALLDIR_PARADIGMS_METAGME' Name='MetaGME'>
-            </Directory>
-            <Directory Id='INSTALLDIR_PARADIGMS_SF' Name='SF'>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_BON2SFINTERPRETER' Name='BON2SFInterpreter'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_BON2SFSAMPLE' Name='BON2SFSample'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO' Name='demo'>
-                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_INCLUDE' Name='include' />
-                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_LIB' Name='lib' />
-                <Directory Id='INSTALLDIR_PARADIGMS_SF_DEMO_SCRIPTS' Name='scripts' />
-              </Directory>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_ICONS' Name='icons'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_SFINTERPRETER' Name='SFInterpreter'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE' Name='JavaBONSFExample'>
-                <Directory Id='INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE_SFINTERPRETER' Name='sfInterpreter' />
-              </Directory>
-              <Directory Id='INSTALLDIR_PARADIGMS_SF_XSLT' Name='xslt'/>
-            </Directory>
-            <Directory Id='INSTALLDIR_PARADIGMS_UML' Name='UML'>
-              <Directory Id='INSTALLDIR_PARADIGMS_UML_DECORATOR' Name='Decorator'>
-                <Directory Id='INSTALLDIR_PARADIGMS_UML_DECORATOR_RES' Name='res' />
-              </Directory>
-            </Directory>
-          </Directory>
-          <Directory Id='INSTALLDIR_SDK' Name='SDK'>
-            <Directory Id='INSTALLDIR_SDK_BON' Name='BON'>
-              <Directory Id='INSTALLDIR_SDK_BON_COMMON' Name='Common' />
-              <Directory Id='INSTALLDIR_SDK_BON_WIZARD' Name='Wizard'>
-                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_1033' Name='1033'>
-                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_1033_IMAGES' Name='Images' />
-                </Directory>
-                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_HTML' Name='HTML'>
-                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_HTML_1033' Name='1033' />
-                </Directory>
-                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_IMAGES' Name='Images' />
-                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_SCRIPTS' Name='Scripts'>
-                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_SCRIPTS_1033' Name='1033' />
-                </Directory>
-                <Directory Id='INSTALLDIR_SDK_BON_WIZARD_TEMPLATES' Name='Templates'>
-                  <Directory Id='INSTALLDIR_SDK_BON_WIZARD_TEMPLATES_1033' Name='1033' />
-                </Directory>
-              </Directory>
-            </Directory>
-            <Directory Id='INSTALLDIR_SDK_DECORATORLIB' Name='DecoratorLib'>
-              <Directory Id='INSTALLDIR_SDK_DECORATORLIB_RES' Name='res' />
-            </Directory>
-            <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD' Name='DecoratorWizard'>
-              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_1033' Name='1033'>
-                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_1033_IMAGES' Name='Images' />
-              </Directory>
-              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_HTML' Name='HTML'>
-                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_HTML_1033' Name='1033' />
-              </Directory>
-              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_IMAGES' Name='Images' />
-              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS' Name='Scripts'>
-                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS_1033' Name='1033' />
-              </Directory>
-              <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES' Name='Templates'>
-                <Directory Id='INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES_1033' Name='1033' />
-              </Directory>
-            </Directory>
-            <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES' Name='Decorator Examples'>
-              <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES_NEWSAMPLE' Name='NewSample' />
-              <Directory Id='INSTALLDIR_SDK_DECORATOREXAMPLES_PLAINSAMPLE' Name='PlainSample' />
-            </Directory>
-            <Directory Id='INSTALLDIR_SDK_JAVA' Name='Java' />
-            <Directory Id='INSTALLDIR_SDK_DOTNET' Name='DotNet'>
-              <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR' Name='CSharpDSMLGenerator'/>
-            </Directory>
-            <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSOR' Name='PatternProcessor' />
-            <Directory Id='INSTALLDIR_SDK_SCRIPTS' Name='Scripts' />
-          </Directory>
-        </Directory>
-      </Directory>
-
-      <Directory Id='ProgramMenuFolder'>
-        <Directory Id='ShortcutFolder' Name='GME'>
-          <?if $(sys.BUILDARCH)=x86 ?>
-          <Directory Id='ShortcutDocFolder' Name='Documentation'>
-            <Directory Id='ShortcutTutorialsFolder' Name='Tutorials' />
-          </Directory>
-          <?endif?>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- =========================================================== -->
-    <!-- COMPONENTS -->
-    <!-- =========================================================== -->
 
     <?if $(sys.BUILDARCH)=x86 ?>
-
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
-      <Component Id="MetaParadigmFiles" Guid="18535c6e-aeff-4e89-b262-f3eb0a7854ee">
+    <ComponentGroup Id='GME_SDK$(sys.BUILDARCH)'>
+      <Component Id="MetaParadigmFiles" Guid="18535c6e-aeff-4e89-b262-f3eb0a7854ee" Directory="INSTALLDIR_PARADIGMS_METAGMEx86">
         <File Id="MetaGME.xmp" Name="MetaGME.xmp" KeyPath="yes" Source="..\Paradigms\MetaGME\MetaGME.xmp" />
         <File Id="MetaGME_model.xme" Name="MetaGME-model.xme" Source="..\Paradigms\MetaGME\MetaGME-model.xme" />
       </Component>
-    </DirectoryRef>
 
-    <Component Id="CSharpDSMLGenerator.dll" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-      <File Id="CSharpDSMLGenerator.dll" Name="CSharpDSMLGenerator.dll" KeyPath="yes" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\CSharpDSMLGenerator.dll" />
-      <Class Id="{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}" Context="InprocServer32" Description="MGA.Interpreter.CSharpDSMLGenerator" ThreadingModel="both" ForeignServer="mscoree.dll">
-        <ProgId Id="MGA.Interpreter.CSharpDSMLGenerator" Description="MGA.Interpreter.CSharpDSMLGenerator" />
-      </Class>
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.14.3, Culture=neutral" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" Type="string" Action="write" />
-      <RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />
-      <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.Interpreter.CSharpDSMLGenerator'>
-        <RegistryValue Name='Description' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
-        <RegistryValue Name='Icon' Type='string' Value='[#CSharpDSMLGenerator.ico]'/>
-        <RegistryValue Name='Paradigm' Type='string' Value='MetaGME'/>
-        <RegistryValue Name='Tooltip' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
-        <RegistryValue Name='Type' Type='integer' Value='1'/>
+      <Component Id="CSharpDSMLGenerator.dll" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
+        <File Id="CSharpDSMLGenerator.dll" Name="CSharpDSMLGenerator.dll" KeyPath="yes" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\CSharpDSMLGenerator.dll" />
+        <Class Id="{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}" Context="InprocServer32" Description="MGA.Interpreter.CSharpDSMLGenerator" ThreadingModel="both" ForeignServer="mscoree.dll">
+          <ProgId Id="MGA.Interpreter.CSharpDSMLGenerator" Description="MGA.Interpreter.CSharpDSMLGenerator" />
+        </Class>
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\Implemented Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Value="" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.14.3, Culture=neutral" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />
+        <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.Interpreter.CSharpDSMLGenerator'>
+          <RegistryValue Name='Description' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
+          <RegistryValue Name='Icon' Type='string' Value='[#CSharpDSMLGenerator.ico]'/>
+          <RegistryValue Name='Paradigm' Type='string' Value='MetaGME'/>
+          <RegistryValue Name='Tooltip' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
+          <RegistryValue Name='Type' Type='integer' Value='1'/>
 
-        <RegistryKey Key='Associated'>
-          <RegistryValue Name='MetaGME' Type='string' Value=''/>
+          <RegistryKey Key='Associated'>
+            <RegistryValue Name='MetaGME' Type='string' Value=''/>
+          </RegistryKey>
         </RegistryKey>
-      </RegistryKey>
-    </Component>
-    <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-      <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\CSharpDSMLGenerator.ico" />
-    </Component>
-    <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR" Guid="{AEE769E8-E82D-46AF-AF94-F61B2C41DF5A}" Permanent="yes">
-      <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\ISIS.GME.Common.dll" KeyPath="yes" Assembly=".net"/>
-      <Condition>NETFRAMEWORK40</Condition>
-    </Component>
-    <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-      <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\MgaMeta.dll" />
-    </Component>
+      </Component>
+      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
+        <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\CSharpDSMLGenerator.ico" />
+      </Component>
+      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR" Guid="{AEE769E8-E82D-46AF-AF94-F61B2C41DF5A}" Permanent="yes">
+        <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\ISIS.GME.Common.dll" KeyPath="yes" Assembly=".net"/>
+        <Condition>NETFRAMEWORK40</Condition>
+      </Component>
+      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
+        <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\MgaMeta.dll" />
+      </Component>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF">
-      <Component Id="BON2SFInterpreter.dll">
+      <Component Id="BON2SFInterpreter.dll" Directory="INSTALLDIR_PARADIGMS_SF">
         <File Id="BON2SFInterpreter.dll" Name="BON2SFInterpreter.dll" KeyPath="yes" Source="..\Paradigms\SF\BON2SFInterpreter\$(var.Release)\BON2SFInterpreter.dll">
           <TypeLib Id="34ADD188-D227-43A3-82DD-F920A2081424" Description="MGA Interpreter TypeLibrary (BON2SFInterpreter)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{257C467E-C7F2-4E70-8B44-817E40C8DE51}" Context="InprocServer32" Description="MGA.Interpreter.BON2SFInterpreter">
@@ -234,10 +70,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_INTERFACES">
-      <Component Id="Interfaces" Guid="fde16217-618a-46ad-ab96-ee0a08c8ddba">
+      <Component Id="Interfaces" Guid="fde16217-618a-46ad-ab96-ee0a08c8ddba" Directory="INSTALLDIR_INTERFACES">
         <File Id="InterfaceVersion.h" Name="InterfaceVersion.h" KeyPath="yes" Source="..\GME\Interfaces\InterfaceVersion.h" />
         <File Id="InterfaceColl.h" Name="InterfaceColl.h" Source="..\GME\Interfaces\InterfaceColl.h" />
         <File Id="GMEVersion.h" Name="GMEVersion.h" Source="..\GME\Gme\GMEVersion.h" />
@@ -260,10 +94,8 @@
         <File Id="Parser.h" Name="Parser.h" Source="..\GME\Interfaces\Parser.h" />
         <File Id="Parser_i.c" Name="Parser_i.c" Source="..\GME\Interfaces\Parser_i.c" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_BON2SFINTERPRETER">
-      <Component Id="BON2SFInterpreterSource" Guid="{cffb44fa-c59c-4695-9db7-ca410d6bdca0}">
+      <Component Id="BON2SFInterpreterSource" Guid="{cffb44fa-c59c-4695-9db7-ca410d6bdca0}" Directory="INSTALLDIR_PARADIGMS_SF_BON2SFINTERPRETER">
         <File Id="BON2SFInterpreterSource_BON2Component.cpp" Name="BON2Component.cpp" Source="..\Paradigms\SF\BON2SFInterpreter\BON2Component.cpp" />
         <File Id="BON2SFInterpreterSource_BON2Component.h" Name="BON2Component.h"  Source="..\Paradigms\SF\BON2SFInterpreter\BON2Component.h" />
         <File Id="BON2SFInterpreter.sln" Name="BON2SFInterpreter.sln" KeyPath="yes" Source="..\Paradigms\SF\BON2SFInterpreter\BON2SFInterpreter.sln" />
@@ -284,10 +116,8 @@
         <File Id="SFBonExtension.h" Name="SFBonExtension.h"  Source="..\Paradigms\SF\BON2SFInterpreter\SFBonExtension.h" />
         <File Id="SFBonUserExtension.cpp" Name="SFBonUserExtension.cpp"  Source="..\Paradigms\SF\BON2SFInterpreter\SFBonUserExtension.cpp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF">
-      <Component Id="BON2SFSample.dll">
+      <Component Id="BON2SFSample.dll" Directory="INSTALLDIR_PARADIGMS_SF">
         <File Id="BON2SFSample.dll" Name="BON2SFSample.dll" KeyPath="yes" Source="..\Paradigms\SF\BON2SFSample\$(var.Release)\BON2SFSample.dll">
           <TypeLib Id="55BC0291-4034-4185-8E9D-0909CF06C983" Description="MGA Interpreter TypeLibrary (BON2SFSample)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{71B6B8C2-00B1-4D23-BE17-D6172C271AA8}" Context="InprocServer32" Description="MGA.Interpreter.BON2SFSample">
@@ -306,10 +136,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_BON2SFSAMPLE">
-      <Component Id="BON2SFSampleSource" Guid="d5166390-ad67-4bc9-b315-267c0ceda262">
+      <Component Id="BON2SFSampleSource" Guid="d5166390-ad67-4bc9-b315-267c0ceda262" Directory="INSTALLDIR_PARADIGMS_SF_BON2SFSAMPLE">
         <File Id="BON2SFSample.sln" Name="BON2SFSample.sln" KeyPath="yes" Source="..\Paradigms\SF\BON2SFSample\BON2SFSample.sln" />
         <File Id="BON2SFSampleSource_BON2Component.cpp" Name="BON2Component.cpp" Source="..\Paradigms\SF\BON2SFSample\BON2Component.cpp" />
         <File Id="BON2SFSampleSource_BON2Component.h" Name="BON2Component.h" Source="..\Paradigms\SF\BON2SFSample\BON2Component.h" />
@@ -325,19 +153,15 @@
         <File Id="BON2SFSampleSource_StdAfx.cpp" Name="StdAfx.cpp" Source="..\Paradigms\SF\BON2SFSample\StdAfx.cpp" />
         <File Id="BON2SFSampleSource_StdAfx.h" Name="StdAfx.h" Source="..\Paradigms\SF\BON2SFSample\StdAfx.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_HFSM_ICONS">
-      <Component Id="HFSMIcons" Guid="9bfd7482-92b5-4500-870a-a35d859145bd">
+      <Component Id="HFSMIcons" Guid="9bfd7482-92b5-4500-870a-a35d859145bd" Directory="INSTALLDIR_PARADIGMS_HFSM_ICONS">
         <File Id="focusstate.bmp" Name="focusstate.bmp" KeyPath="yes" Source="..\Paradigms\HFSM\icons\focusstate.bmp" />
         <File Id="defaultstate.bmp" Name="defaultstate.bmp" Source="..\Paradigms\HFSM\icons\defaultstate.bmp" />
         <File Id="event.bmp" Name="event.bmp" Source="..\Paradigms\HFSM\icons\event.bmp" />
         <File Id="eventsel.bmp" Name="eventsel.bmp" Source="..\Paradigms\HFSM\icons\eventsel.bmp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_HFSM">
-      <Component Id="HFSMSimulator.dll">
+      <Component Id="HFSMSimulator.dll" Directory="INSTALLDIR_PARADIGMS_HFSM">
         <File Id="HFSMSimulator.dll" Name="HFSMSimulator.dll" KeyPath="yes" Source="..\Paradigms\HFSM\HFSMSimulator\$(var.Release)\HFSMSimulator.dll">
           <TypeLib Id="69653354-C8DE-4331-9CF1-F6B73AF6B09D" Description="MGA Interpreter TypeLibrary (HFSMSimulator)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{3E52908A-15DB-47CC-A569-4F852ED56C5E}" Context="InprocServer32" Description="MGA.Interpreter.HFSMSimulator">
@@ -356,10 +180,9 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATOR">
-      <Component Id="HFSMSimulatorSource" Guid="{C47EFE8D-DDEF-41FE-A987-41D7EC381E6E}">
+
+      <Component Id="HFSMSimulatorSource" Guid="{C47EFE8D-DDEF-41FE-A987-41D7EC381E6E}" Directory="INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATOR">
         <File Id="HFSMSimulatorSource_BONComponent.cpp" Name="BONComponent.cpp" Source="..\Paradigms\HFSM\HFSMSimulator\BONComponent.cpp" />
         <File Id="HFSMSimulatorSource_BONComponent.h" Name="BONComponent.h"  Source="..\Paradigms\HFSM\HFSMSimulator\BONComponent.h" />
         <File Id="HFSMSimulatorSource_CompIcon.ico" Name="CompIcon.ico"  Source="..\Paradigms\HFSM\HFSMSimulator\CompIcon.ico" />
@@ -373,10 +196,8 @@
         <File Id="HFSMSimulatorSource_StdAfx.cpp" Name="StdAfx.cpp"  Source="..\Paradigms\HFSM\HFSMSimulator\StdAfx.cpp" />
         <File Id="HFSMSimulatorSource_StdAfx.h" Name="StdAfx.h"  Source="..\Paradigms\HFSM\HFSMSimulator\StdAfx.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_HFSM">
-      <Component Id="HFSMParadigmFiles" Guid="{F0FC5FD0-32AF-4314-A7F9-AC3A6E6967A8}">
+      <Component Id="HFSMParadigmFiles" Guid="{F0FC5FD0-32AF-4314-A7F9-AC3A6E6967A8}" Directory="INSTALLDIR_PARADIGMS_HFSM">
         <File Id="HFSM_Demo01.mga" Name="HFSM-Demo01.mga" Source="..\Paradigms\HFSM\HFSM-Demo01.mga" />
         <File Id="HFSM_Demo01.xme" Name="HFSM-Demo01.xme"  Source="..\Paradigms\HFSM\HFSM-Demo01.xme" />
         <File Id="HFSM_Demo02.mga" Name="HFSM-Demo02.mga"  Source="..\Paradigms\HFSM\HFSM-Demo02.mga" />
@@ -393,10 +214,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE_SFINTERPRETER">
-      <Component Id="JavaBONSFExample" Guid="{DADD2807-D77B-4C25-9138-ACE483C929FD}">
+      <Component Id="JavaBONSFExample" Guid="{DADD2807-D77B-4C25-9138-ACE483C929FD}" Directory="INSTALLDIR_PARADIGMS_SF_JAVABONSFEXAMPLE_SFINTERPRETER">
         <File Id="SFBONComponent.java" Name="SFBONComponent.java" KeyPath="yes" Source="..\Paradigms\SF\JavaBONSFExample\sfInterpreter\SFBONComponent.java" />
         <File Id="SFCompound.java" Name="SFCompound.java"  Source="..\Paradigms\SF\JavaBONSFExample\sfInterpreter\SFCompound.java" />
         <File Id="SFDataflowConn.java" Name="SFDataflowConn.java"  Source="..\Paradigms\SF\JavaBONSFExample\sfInterpreter\SFDataflowConn.java" />
@@ -411,10 +230,8 @@
         <File Id="SFProcessing.java" Name="SFProcessing.java"  Source="..\Paradigms\SF\JavaBONSFExample\sfInterpreter\SFProcessing.java" />
         <File Id="SFSignal.java" Name="SFSignal.java"  Source="..\Paradigms\SF\JavaBONSFExample\sfInterpreter\SFSignal.java" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_DEMO">
-      <Component Id="SFDemo" Guid="{F9C50B52-EE34-457E-8124-FEB1AF02919E}">
+      <Component Id="SFDemo" Guid="{F9C50B52-EE34-457E-8124-FEB1AF02919E}" Directory="INSTALLDIR_PARADIGMS_SF_DEMO">
         <File Id="FFT.c" Name="FFT.c" Source="..\Paradigms\SF\demo\FFT.c" />
         <File Id="FFT.h" Name="FFT.h"  Source="..\Paradigms\SF\demo\FFT.h" />
         <File Id="Generator.c" Name="Generator.c"  Source="..\Paradigms\SF\demo\Generator.c" />
@@ -426,17 +243,13 @@
         <File Id="mdemo.vcpxroj" Name="mdemo.vcxproj"  Source="..\Paradigms\SF\demo\mdemo.vcxproj" />
         <File Id="ui.cfg" Name="ui.cfg"  Source="..\Paradigms\SF\demo\ui.cfg" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_DEMO_INCLUDE">
-      <Component Id="SFDemoInclude" Guid="{A0844E53-B230-4AF9-BE22-D78E948B95FB}">
+      <Component Id="SFDemoInclude" Guid="{A0844E53-B230-4AF9-BE22-D78E948B95FB}" Directory="INSTALLDIR_PARADIGMS_SF_DEMO_INCLUDE">
         <File Id="mgk60.h" Name="mgk60.h" KeyPath="yes" Source="..\Paradigms\SF\demo\include\mgk60.h" />
         <File Id="simgui.h" Name="simgui.h"  Source="..\Paradigms\SF\demo\include\simgui.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_DEMO_LIB">
-      <Component Id="SFDemoLib" Guid="{2F45BE36-9B7F-45B6-B7BC-8958666A6B3C}">
+      <Component Id="SFDemoLib" Guid="{2F45BE36-9B7F-45B6-B7BC-8958666A6B3C}" Directory="INSTALLDIR_PARADIGMS_SF_DEMO_LIB">
         <File Id="gplotw32.lib" Name="gplotw32.lib" KeyPath="yes" Source="..\Paradigms\SF\demo\lib\gplotw32.lib" />
         <File Id="gui20w32.lib" Name="gui20w32.lib"  Source="..\Paradigms\SF\demo\lib\gui20w32.lib" />
         <File Id="mgk60.lib" Name="mgk60.lib"  Source="..\Paradigms\SF\demo\lib\mgk60.lib" />
@@ -444,10 +257,8 @@
         <File Id="simuiw32.lib" Name="simuiw32.lib"  Source="..\Paradigms\SF\demo\lib\simuiw32.lib" />
         <File Id="simuiw32_d.lib" Name="simuiw32_d.lib"  Source="..\Paradigms\SF\demo\lib\simuiw32_d.lib" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_DEMO_SCRIPTS">
-      <Component Id="SFDemoScripts" Guid="{5112DC25-CFB6-4CD6-B06B-96C7F8AAD039}">
+      <Component Id="SFDemoScripts" Guid="{5112DC25-CFB6-4CD6-B06B-96C7F8AAD039}" Directory="INSTALLDIR_PARADIGMS_SF_DEMO_SCRIPTS">
         <File Id="abs_phas.c" Name="abs_phas.c" KeyPath="yes" Source="..\Paradigms\SF\demo\scripts\abs_phas.c" />
         <File Id="datagen.c" Name="datagen.c"  Source="..\Paradigms\SF\demo\scripts\datagen.c" />
         <File Id="dbsetup.c" Name="dbsetup.c"  Source="..\Paradigms\SF\demo\scripts\dbsetup.c" />
@@ -462,10 +273,8 @@
         <File Id="splitter.c" Name="splitter.c"  Source="..\Paradigms\SF\demo\scripts\splitter.c" />
         <File Id="template.c" Name="template.c"  Source="..\Paradigms\SF\demo\scripts\template.c" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_ICONS">
-      <Component Id="SFIcons" Guid="{338B4AAD-6D0C-4954-A340-C304551AD035}">
+      <Component Id="SFIcons" Guid="{338B4AAD-6D0C-4954-A340-C304551AD035}" Directory="INSTALLDIR_PARADIGMS_SF_ICONS">
         <File Id="inparam_atom.bmp" Name="inparam-atom.bmp" KeyPath="yes" Source="..\Paradigms\SF\icons\inparam-atom.bmp" />
         <File Id="inparam_port.bmp" Name="inparam-port.bmp"  Source="..\Paradigms\SF\icons\inparam-port.bmp" />
         <File Id="isig_atom.bmp" Name="isig-atom.bmp"  Source="..\Paradigms\SF\icons\isig-atom.bmp" />
@@ -476,10 +285,8 @@
         <File Id="outparam_port.bmp" Name="outparam-port.bmp"  Source="..\Paradigms\SF\icons\outparam-port.bmp" />
         <File Id="param.bmp" Name="param.bmp"  Source="..\Paradigms\SF\icons\param.bmp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF">
-      <Component Id="SFInterpreter.dll">
+      <Component Id="SFInterpreter.dll" Directory="INSTALLDIR_PARADIGMS_SF">
         <File Id="SFInterpreter.dll" Name="SFInterpreter.dll" KeyPath="yes" Source="..\Paradigms\SF\SFInterpreter\$(var.Release)\SFInterpreter.dll">
           <TypeLib Id="C82BDC79-7F10-4A22-B91B-2CF6C39B844E" Description="MGA Interpreter TypeLibrary (SFInterpreter)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{980075B4-C664-462B-BDD4-6E875CD1EC41}" Context="InprocServer32" Description="MGA.Interpreter.SFInterpreter">
@@ -498,10 +305,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_SFINTERPRETER">
-      <Component Id="SFInterpreterSource" Guid="{A08E1C4E-25E5-4D55-929E-8FD9A6CF1604}">
+      <Component Id="SFInterpreterSource" Guid="{A08E1C4E-25E5-4D55-929E-8FD9A6CF1604}" Directory="INSTALLDIR_PARADIGMS_SF_SFINTERPRETER">
         <File Id="SFInterpreterSource_BONComponent.cpp" Name="BONComponent.cpp" Source="..\Paradigms\SF\SFInterpreter\BONComponent.cpp" />
         <File Id="SFInterpreterSource_BONComponent.h" Name="BONComponent.h"  Source="..\Paradigms\SF\SFInterpreter\BONComponent.h" />
         <File Id="SFInterpreterSource_CompIcon.ico" Name="CompIcon.ico"  Source="..\Paradigms\SF\SFInterpreter\CompIcon.ico" />
@@ -517,10 +322,8 @@
         <File Id="SFInterpreterSource_StdAfx.cpp" Name="StdAfx.cpp"  Source="..\Paradigms\SF\SFInterpreter\StdAfx.cpp" />
         <File Id="SFInterpreterSource_StdAfx.h" Name="StdAfx.h"  Source="..\Paradigms\SF\SFInterpreter\StdAfx.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF">
-      <Component Id="SFParadigmFiles" Guid="{2FBE476E-B813-48DB-9BB0-0F6DE025463A}">
+      <Component Id="SFParadigmFiles" Guid="{2FBE476E-B813-48DB-9BB0-0F6DE025463A}" Directory="INSTALLDIR_PARADIGMS_SF">
         <File Id="SF.mta" Name="SF.mta"  Source="..\Paradigms\SF\SF.mta" />
         <File Id="SF.xmp" Name="SF.xmp" KeyPath="yes" Source="..\Paradigms\SF\SF.xmp" />
         <File Id="SFDemo.mga" Name="SFDemo.mga"  Source="..\Paradigms\SF\SFDemo.mga" />
@@ -534,19 +337,15 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_SF_XSLT">
-      <Component Id="SFxslt" Guid="{A93D4FEE-4049-4D9A-AA60-4B02953A5286}">
+      <Component Id="SFxslt" Guid="{A93D4FEE-4049-4D9A-AA60-4B02953A5286}" Directory="INSTALLDIR_PARADIGMS_SF_XSLT">
         <File Id="Basic2Primitive.xsl" Name="Basic2Primitive.xsl" KeyPath="yes" Source="..\Paradigms\SF\xslt\Basic2Primitive.xsl" />
         <File Id="Primitive2Basic.xsl" Name="Primitive2Basic.xsl"  Source="..\Paradigms\SF\xslt\Primitive2Basic.xsl" />
         <File Id="SFDemoWithMetaChanged.xme" Name="SFDemoWithMetaChanged.xme"  Source="..\Paradigms\SF\xslt\SFDemoWithMetaChanged.xme" />
         <File Id="SFxslt_mga.dtd" Name="mga.dtd"  Source="..\GME\Parser\mga.dtd" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML_DECORATOR">
-      <Component Id="UMLDecoratorSource" Guid="{3E974827-B233-45F4-82CE-512387924349}">
+      <Component Id="UMLDecoratorSource" Guid="{3E974827-B233-45F4-82CE-512387924349}" Directory="INSTALLDIR_PARADIGMS_UML_DECORATOR">
         <File Id="UMLDecoratorSource_DecoratorConfig.h" Name="DecoratorConfig.h" Source="..\Paradigms\UML\decorator\DecoratorConfig.h" />
         <File Id="UMLDecoratorSource_DecoratorStd.h" Name="DecoratorStd.h"  Source="..\Paradigms\UML\decorator\DecoratorStd.h" />
         <File Id="UMLDecoratorSource_Resource.h" Name="Resource.h"  Source="..\Paradigms\UML\decorator\Resource.h" />
@@ -576,24 +375,18 @@
         <File Id="UMLStereoLabelPart.cpp" Name="UMLStereoLabelPart.cpp"  Source="..\Paradigms\UML\decorator\UMLStereoLabelPart.cpp" />
         <File Id="UMLStereoLabelPart.h" Name="UMLStereoLabelPart.h"  Source="..\Paradigms\UML\decorator\UMLStereoLabelPart.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML_DECORATOR_RES">
-      <Component Id="UMLDecoratorSourceResources">
+      <Component Id="UMLDecoratorSourceResources" Directory="INSTALLDIR_PARADIGMS_UML_DECORATOR_RES">
         <File Id="UMLDecoratorSourceResources_referencesign.bmp" Name="referencesign.bmp" KeyPath="yes" Source="..\Paradigms\UML\decorator\res\referencesign.bmp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML">
-      <Component Id="UMLParadigmFiles" Guid="{28AC87D2-47D6-423E-86E5-36A879A0794E}">
+      <Component Id="UMLParadigmFiles" Guid="{28AC87D2-47D6-423E-86E5-36A879A0794E}" Directory="INSTALLDIR_PARADIGMS_UML">
         <File Id="UML.xmp" Name="UML.xmp" KeyPath="yes" Source="..\Paradigms\UML\UML.xmp" />
         <File Id="UMLMeta.mga" Name="UMLMeta.mga"  Source="..\Paradigms\UML\UMLMeta.mga" />
         <File Id="UMLMeta.xme" Name="UMLMeta.xme"  Source="..\Paradigms\UML\UMLMeta.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS">
-      <Component Id="MiniTutorials" Guid="{8D9A039F-B93C-4791-9116-17D27907F4DB}">
+      <Component Id="MiniTutorials" Guid="{8D9A039F-B93C-4791-9116-17D27907F4DB}" Directory="INSTALLDIR_DOC_TUTORIALS">
         <File Id="Tutorial1.html" Name="Tutorial1.html" KeyPath="yes" Source="..\Doc\Tutorial\Tutorial1.html">
           <Shortcut Id='MiniTutorialShortcut' Name='Mini Tutorial'
         Description='Quickstart tutorial in HTML' Directory='ShortcutTutorialsFolder'/>
@@ -601,10 +394,8 @@
         <File Id="Tutorial2.html" Name="Tutorial2.html"  Source="..\Doc\Tutorial\Tutorial2.html" />
         <File Id="Tutorial3.html" Name="Tutorial3.html"  Source="..\Doc\Tutorial\Tutorial3.html" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_T1">
-      <Component Id="MiniTutorialsT1" Guid="{EDA6A799-E497-4EA0-8C90-FF2BD555DD02}">
+      <Component Id="MiniTutorialsT1" Guid="{EDA6A799-E497-4EA0-8C90-FF2BD555DD02}" Directory="INSTALLDIR_DOC_TUTORIALS_T1">
         <File Id="MiniTutorialsT1_Figure1.jpg" Name="Figure1.jpg" KeyPath="yes" Source="..\Doc\Tutorial\T1\Figure1.jpg" />
         <File Id="MiniTutorialsT1_Figure2.jpg" Name="Figure2.jpg"  Source="..\Doc\Tutorial\T1\Figure2.jpg" />
         <File Id="MiniTutorialsT1_Figure3.jpg" Name="Figure3.jpg"  Source="..\Doc\Tutorial\T1\Figure3.jpg" />
@@ -616,10 +407,8 @@
         <File Id="t1s6.xme" Name="t1s6.xme"  Source="..\Doc\Tutorial\T1\t1s6.xme" />
         <File Id="t1s8.xme" Name="t1s8.xme"  Source="..\Doc\Tutorial\T1\t1s8.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_T2">
-      <Component Id="MiniTutorialsT2" Guid="{16BAC367-4028-40E6-8A14-6A7D09C67EA9}">
+      <Component Id="MiniTutorialsT2" Guid="{16BAC367-4028-40E6-8A14-6A7D09C67EA9}" Directory="INSTALLDIR_DOC_TUTORIALS_T2">
         <File Id="MiniTutorialsT2_Figure1.jpg" Name="Figure1.jpg" KeyPath="yes" Source="..\Doc\Tutorial\T2\Figure1.jpg" />
         <File Id="MiniTutorialsT2_Figure2.jpg" Name="Figure2.jpg"  Source="..\Doc\Tutorial\T2\Figure2.jpg" />
         <File Id="MiniTutorialsT2_Figure3.jpg" Name="Figure3.jpg"  Source="..\Doc\Tutorial\T2\Figure3.jpg" />
@@ -632,10 +421,8 @@
         <File Id="t2Hybrid.xme" Name="t2Hybrid.xme"  Source="..\Doc\Tutorial\T2\t2Hybrid.xme" />
         <File Id="t2SF.xme" Name="t2SF.xme"  Source="..\Doc\Tutorial\T2\t2SF.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_T3">
-      <Component Id="MiniTutorialsT3" Guid="{88DCF5D2-E06B-4FB7-8DF2-68D6000CC626}">
+      <Component Id="MiniTutorialsT3" Guid="{88DCF5D2-E06B-4FB7-8DF2-68D6000CC626}" Directory="INSTALLDIR_DOC_TUTORIALS_T3">
         <File Id="constraint.gif" Name="constraint.gif" KeyPath="yes" Source="..\Doc\Tutorial\T3\constraint.gif" />
         <File Id="MiniTutorialsT3_Figure1.gif" Name="Figure1.gif"  Source="..\Doc\Tutorial\T3\Figure1.gif" />
         <File Id="MiniTutorialsT3_Figure10.gif" Name="Figure10.gif"  Source="..\Doc\Tutorial\T3\Figure10.gif" />
@@ -652,10 +439,8 @@
         <File Id="t3OR.xme" Name="t3OR.xme"  Source="..\Doc\Tutorial\T3\t3OR.xme" />
         <File Id="type.jpg" Name="type.jpg"  Source="..\Doc\Tutorial\T3\type.jpg" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS">
-      <Component Id="Tutorial" Guid="{E63A315C-9884-4AF0-B832-3765839CF68B}">
+      <Component Id="Tutorial" Guid="{E63A315C-9884-4AF0-B832-3765839CF68B}" Directory="INSTALLDIR_DOC_TUTORIALS">
         <File Id="index.html" Name="index.html" KeyPath="yes" Source="..\Doc\Tutorial\index.html">
           <Shortcut Id='TutorialShortcut' Name='Tutorial'
         Description='Comprehensive tutorial in HTML' Directory='ShortcutTutorialsFolder'/>
@@ -670,10 +455,8 @@
         <File Id="Lesson8.html" Name="Lesson8.html"  Source="..\Doc\Tutorial\Lesson8.html" />
         <RemoveFolder Id='RemoveShortcutTutorialsFolder' On='uninstall' Directory='ShortcutTutorialsFolder'/>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_ICONS">
-      <Component Id="TutorialIcons" Guid="{12811C83-2BAF-4F56-B1FC-288F044251E4}">
+      <Component Id="TutorialIcons" Guid="{12811C83-2BAF-4F56-B1FC-288F044251E4}" Directory="INSTALLDIR_DOC_TUTORIALS_ICONS">
         <File Id="AddConnMode.gif" Name="AddConnMode.gif" KeyPath="yes" Source="..\Doc\Tutorial\Icons\AddConnMode.gif" />
         <File Id="Admin.bmp" Name="Admin.bmp"  Source="..\Doc\Tutorial\Icons\Admin.bmp" />
         <File Id="ConnCursor1.gif" Name="ConnCursor1.gif"  Source="..\Doc\Tutorial\Icons\ConnCursor1.gif" />
@@ -696,81 +479,59 @@
         <File Id="syncasp.jpg" Name="syncasp.jpg"  Source="..\Doc\Tutorial\Icons\syncasp.jpg" />
         <File Id="WSGroup.bmp" Name="WSGroup.bmp"  Source="..\Doc\Tutorial\Icons\WSGroup.bmp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F1">
-      <Component Id="TutorialL1F1" Guid="{AB118D9D-F844-4007-BD22-51F6294223BD}">
+      <Component Id="TutorialL1F1" Guid="{AB118D9D-F844-4007-BD22-51F6294223BD}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F1">
         <File Id="Fig1_1.png" Name="Fig1_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F1\Fig1_1.png" />
         <File Id="TutorialL1F1_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L1\F1\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F2">
-      <Component Id="TutorialL1F2" Guid="{8EDDA785-6349-45B7-8EF8-D10096730369}">
+      <Component Id="TutorialL1F2" Guid="{8EDDA785-6349-45B7-8EF8-D10096730369}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F2">
         <File Id="Fig1_2.png" Name="Fig1_2.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F2\Fig1_2.png" />
         <File Id="TutorialL1F2_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L1\F2\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F3">
-      <Component Id="TutorialL1F3" Guid="{ADF1EA9D-E4F4-4C92-A008-7321907AC741}">
+      <Component Id="TutorialL1F3" Guid="{ADF1EA9D-E4F4-4C92-A008-7321907AC741}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F3">
         <File Id="Fig1_3.png" Name="Fig1_3.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F3\Fig1_3.png" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F4">
-      <Component Id="TutorialL1F4" Guid="{274A63A9-331C-4F57-B158-F0BE9A3F98A0}">
+      <Component Id="TutorialL1F4" Guid="{274A63A9-331C-4F57-B158-F0BE9A3F98A0}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F4">
         <File Id="Fig1_4.png" Name="Fig1_4.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F4\Fig1_4.png" />
         <File Id="TutorialL1F4_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L1\F4\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F5">
-      <Component Id="TutorialL1F5" Guid="{1677B6BD-444D-4B32-8A46-318593C0F5FA}">
+      <Component Id="TutorialL1F5" Guid="{1677B6BD-444D-4B32-8A46-318593C0F5FA}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F5">
         <File Id="Fig1_5.png" Name="Fig1_5.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F5\Fig1_5.png" />
         <File Id="TutorialL1F5_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L1\F5\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F6">
-      <Component Id="TutorialL1F6" Guid="{0B724163-332A-4406-9544-05B97CF82477}">
+      <Component Id="TutorialL1F6" Guid="{0B724163-332A-4406-9544-05B97CF82477}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F6">
         <File Id="Fig1_6.png" Name="Fig1_6.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F6\Fig1_6.png" />
         <File Id="TutorialL1F6_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L1\F6\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L1_F7">
-      <Component Id="TutorialL1F7" Guid="{EA7C682C-5BFA-4F86-995C-EAB1325F41D9}">
+      <Component Id="TutorialL1F7" Guid="{EA7C682C-5BFA-4F86-995C-EAB1325F41D9}" Directory="INSTALLDIR_DOC_TUTORIALS_L1_F7">
         <File Id="Fig1_7.png" Name="Fig1_7.png" KeyPath="yes" Source="..\Doc\Tutorial\L1\F7\Fig1_7.png" />
         <File Id="TutorialL1F7_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L1\F7\mynetwork.xme" />
         <File Id="TutorialL1F7_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L1\F7\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L2_F1">
-      <Component Id="TutorialL2F1" Guid="{98A9EDA2-864C-480A-B1D0-AB2388669926}">
+      <Component Id="TutorialL2F1" Guid="{98A9EDA2-864C-480A-B1D0-AB2388669926}" Directory="INSTALLDIR_DOC_TUTORIALS_L2_F1">
         <File Id="Fig2_1.png" Name="Fig2_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L2\F1\Fig2_1.png" />
         <File Id="TutorialL2F1_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L2\F1\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L2_F2">
-      <Component Id="TutorialL2F2" Guid="{14B54F34-BFD6-4784-96C6-174E937CB3CE}">
+      <Component Id="TutorialL2F2" Guid="{14B54F34-BFD6-4784-96C6-174E937CB3CE}" Directory="INSTALLDIR_DOC_TUTORIALS_L2_F2">
         <File Id="Fig2_2.png" Name="Fig2_2.png" KeyPath="yes" Source="..\Doc\Tutorial\L2\F2\Fig2_2.png" />
         <File Id="TutorialL2F2_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L2\F2\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L2_F3">
-      <Component Id="TutorialL2F3" Guid="{33B82F23-C80C-4455-BCFE-D946126DEB04}">
+      <Component Id="TutorialL2F3" Guid="{33B82F23-C80C-4455-BCFE-D946126DEB04}" Directory="INSTALLDIR_DOC_TUTORIALS_L2_F3">
         <File Id="Fig2_3.png" Name="Fig2_3.png" KeyPath="yes" Source="..\Doc\Tutorial\L2\F3\Fig2_3.png" />
         <File Id="TutorialL2F3_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L2\F3\mynetwork.xme" />
         <File Id="TutorialL2F3_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L2\F3\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L3">
-      <Component Id="TutorialL3" Guid="{81FBBA0B-91ED-42A3-8C93-B78468C3AA4D}">
+      <Component Id="TutorialL3" Guid="{81FBBA0B-91ED-42A3-8C93-B78468C3AA4D}" Directory="INSTALLDIR_DOC_TUTORIALS_L3">
         <File Id="BON_classes.png" Name="BON classes.png" KeyPath="yes" Source="..\Doc\Tutorial\L3\BON classes.png" />
         <File Id="networking_meta.png" Name="networking meta.png"  Source="..\Doc\Tutorial\L3\networking meta.png" />
         <File Id="BON_Extender_interpreter_dialog.png" Name="BON Extender interpreter dialog.png"  Source="..\Doc\Tutorial\L3\BON Extender interpreter dialog.png" />
@@ -778,179 +539,129 @@
         <File Id="VS_empty_BON1_project.png" Name="VS empty BON1 project.png"  Source="..\Doc\Tutorial\L3\VS empty BON1 project.png" />
         <File Id="VS_GME_Component_wizard.png" Name="VS GME Component wizard.png"  Source="..\Doc\Tutorial\L3\VS GME Component wizard.png" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L3_BON1">
-      <Component Id="TutorialL3BON1" Guid="{3834D745-CC0A-4627-862F-7C0AC74FD24B}">
+      <Component Id="TutorialL3BON1" Guid="{3834D745-CC0A-4627-862F-7C0AC74FD24B}" Directory="INSTALLDIR_DOC_TUTORIALS_L3_BON1">
         <File Id="TutorialL3BON1_BONComponent.cpp" Name="BONComponent.cpp" KeyPath="yes" Source="..\Doc\Tutorial\L3\BON1\BONComponent.cpp" />
         <File Id="TutorialL3BON1_BONComponent.h" Name="BONComponent.h" Source="..\Doc\Tutorial\L3\BON1\BONComponent.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L3_BON2">
-      <Component Id="TutorialL3BON2" Guid="{E25E2A01-CD17-40EA-9092-FA2419BA3103}">
+      <Component Id="TutorialL3BON2" Guid="{E25E2A01-CD17-40EA-9092-FA2419BA3103}" Directory="INSTALLDIR_DOC_TUTORIALS_L3_BON2">
         <File Id="TutorialL3BON2_BON2Component.cpp" Name="BON2Component.cpp" KeyPath="yes" Source="..\Doc\Tutorial\L3\BON2\BON2Component.cpp" />
         <File Id="TutorialL3BON2_BON2Component.h" Name="BON2Component.h" Source="..\Doc\Tutorial\L3\BON2\BON2Component.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L3_BON2Ex">
-      <Component Id="TutorialL3BON2Ex" Guid="{75C09DE0-9E3B-4876-BD1C-39C8F6503F15}">
+      <Component Id="TutorialL3BON2Ex" Guid="{75C09DE0-9E3B-4876-BD1C-39C8F6503F15}" Directory="INSTALLDIR_DOC_TUTORIALS_L3_BON2Ex">
         <File Id="TutorialL3BON2Ex_BON2Component.cpp" Name="BON2Component.cpp" KeyPath="yes" Source="..\Doc\Tutorial\L3\BON2Ex\BON2Component.cpp" />
         <File Id="TutorialL3BON2Ex_BON2Component.h" Name="BON2Component.h" Source="..\Doc\Tutorial\L3\BON2Ex\BON2Component.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F1">
-      <Component Id="TutorialL4F1" Guid="{4B5D78C7-F693-4236-82BD-41D704921AFD}">
+      <Component Id="TutorialL4F1" Guid="{4B5D78C7-F693-4236-82BD-41D704921AFD}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F1">
         <File Id="Fig4_1.gif" Name="Fig4_1.gif" KeyPath="yes" Source="..\Doc\Tutorial\L4\F1\Fig4_1.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F2">
-      <Component Id="TutorialL4F2" Guid="{22B72896-E159-4CFC-B98C-718F451A029C}">
+      <Component Id="TutorialL4F2" Guid="{22B72896-E159-4CFC-B98C-718F451A029C}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F2">
         <File Id="Fig4_2.gif" Name="Fig4_2.gif" KeyPath="yes" Source="..\Doc\Tutorial\L4\F2\Fig4_2.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F3">
-      <Component Id="TutorialL4F3" Guid="{D278E71F-5082-43D2-A52F-6CB1A0148B8F}">
+      <Component Id="TutorialL4F3" Guid="{D278E71F-5082-43D2-A52F-6CB1A0148B8F}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F3">
         <File Id="Fig4_3.gif" Name="Fig4_3.gif" KeyPath="yes" Source="..\Doc\Tutorial\L4\F3\Fig4_3.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F4">
-      <Component Id="TutorialL4F4" Guid="{006810E2-09A3-4BAF-A84C-7D81BE207FC9}">
+      <Component Id="TutorialL4F4" Guid="{006810E2-09A3-4BAF-A84C-7D81BE207FC9}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F4">
         <File Id="Fig4_4.png" Name="Fig4_4.png" KeyPath="yes" Source="..\Doc\Tutorial\L4\F4\Fig4_4.png" />
         <File Id="TutorialL4F4_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L4\F4\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F5">
-      <Component Id="TutorialL4F5" Guid="{DAAFC8CB-0F28-4383-B838-01A00D357E1A}">
+      <Component Id="TutorialL4F5" Guid="{DAAFC8CB-0F28-4383-B838-01A00D357E1A}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F5">
         <File Id="Fig4_5.png" Name="Fig4_5.png" KeyPath="yes" Source="..\Doc\Tutorial\L4\F5\Fig4_5.png" />
         <File Id="TutorialL4F5_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L4\F5\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F6">
-      <Component Id="TutorialL4F6" Guid="{EBC3BDD8-CE0B-4FCF-99D9-8FF7D4ABA792}">
+      <Component Id="TutorialL4F6" Guid="{EBC3BDD8-CE0B-4FCF-99D9-8FF7D4ABA792}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F6">
         <File Id="Fig4_6.png" Name="Fig4_6.png" KeyPath="yes" Source="..\Doc\Tutorial\L4\F6\Fig4_6.png" />
         <File Id="TutorialL4F6_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L4\F6\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L4_F7">
-      <Component Id="TutorialL4F7" Guid="{D51CC5AE-594A-432F-8F8F-A0E0BE5863AE}">
+      <Component Id="TutorialL4F7" Guid="{D51CC5AE-594A-432F-8F8F-A0E0BE5863AE}" Directory="INSTALLDIR_DOC_TUTORIALS_L4_F7">
         <File Id="Fig4_7.png" Name="Fig4_7.png" KeyPath="yes" Source="..\Doc\Tutorial\L4\F7\Fig4_7.png" />
         <File Id="TutorialL4F7_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L4\F7\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L5_F1">
-      <Component Id="TutorialL5F1" Guid="{F0EEB0B0-3042-4656-A950-44D1160FDDD9}">
+      <Component Id="TutorialL5F1" Guid="{F0EEB0B0-3042-4656-A950-44D1160FDDD9}" Directory="INSTALLDIR_DOC_TUTORIALS_L5_F1">
         <File Id="Fig5_1.png" Name="Fig5_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L5\F1\Fig5_1.png" />
         <File Id="TutorialL5F1_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L5\F1\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L5_F2">
-      <Component Id="TutorialL5F2" Guid="{630A3409-8318-4874-8CB6-257A2835CF97}">
+      <Component Id="TutorialL5F2" Guid="{630A3409-8318-4874-8CB6-257A2835CF97}" Directory="INSTALLDIR_DOC_TUTORIALS_L5_F2">
         <File Id="Fig5_2.png" Name="Fig5_2.png" KeyPath="yes" Source="..\Doc\Tutorial\L5\F2\Fig5_2.png" />
         <File Id="Fig5_2_new.JPG" Name="Fig5_2_new.JPG"  Source="..\Doc\Tutorial\L5\F2\Fig5_2_new.JPG" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L5_F3">
-      <Component Id="TutorialL5F3" Guid="{21E539C2-DE90-4ADF-AF75-57670191C0C2}">
+      <Component Id="TutorialL5F3" Guid="{21E539C2-DE90-4ADF-AF75-57670191C0C2}" Directory="INSTALLDIR_DOC_TUTORIALS_L5_F3">
         <File Id="Fig5_3_1.png" Name="Fig5_3_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L5\F3\Fig5_3_1.png" />
         <File Id="Fig5_3_2.png" Name="Fig5_3_2.png"  Source="..\Doc\Tutorial\L5\F3\Fig5_3_2.png" />
         <File Id="TutorialL5F3_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L5\F3\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L5_F4">
-      <Component Id="TutorialL5F4" Guid="{37E07785-AC30-4AE1-9AD6-54E413A1656A}">
+      <Component Id="TutorialL5F4" Guid="{37E07785-AC30-4AE1-9AD6-54E413A1656A}" Directory="INSTALLDIR_DOC_TUTORIALS_L5_F4">
         <File Id="Fig5_4.png" Name="Fig5_4.png" KeyPath="yes" Source="..\Doc\Tutorial\L5\F4\Fig5_4.png" />
         <File Id="TutorialL5F4_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L5\F4\mynetwork.xme" />
         <File Id="TutorialL5F4_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L5\F4\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L5_F5">
-      <Component Id="TutorialL5F5" Guid="{EB35E41F-6E1E-4C62-9169-DC62B7A9D4F2}">
+      <Component Id="TutorialL5F5" Guid="{EB35E41F-6E1E-4C62-9169-DC62B7A9D4F2}" Directory="INSTALLDIR_DOC_TUTORIALS_L5_F5">
         <File Id="Fig5_5_1.png" Name="Fig5_5_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L5\F5\Fig5_5_1.png" />
         <File Id="Fig5_5_2.png" Name="Fig5_5_2.png"  Source="..\Doc\Tutorial\L5\F5\Fig5_5_2.png" />
         <File Id="Fig5_5_3.png" Name="Fig5_5_3.png"  Source="..\Doc\Tutorial\L5\F5\Fig5_5_3.png" />
         <File Id="TutorialL5F5_mynetwork.xme" Name="mynetwork.xme"  Source="..\Doc\Tutorial\L5\F5\mynetwork.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L6_F1">
-      <Component Id="TutorialL6F1" Guid="{1FD84808-AAEB-49E5-9686-39E30D9ED321}">
+      <Component Id="TutorialL6F1" Guid="{1FD84808-AAEB-49E5-9686-39E30D9ED321}" Directory="INSTALLDIR_DOC_TUTORIALS_L6_F1">
         <File Id="Fig6_1.png" Name="Fig6_1.png" KeyPath="yes" Source="..\Doc\Tutorial\L6\F1\Fig6_1.png" />
         <File Id="TutorialL6F1_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L6\F1\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L6_F2">
-      <Component Id="TutorialL6F2" Guid="{DECEADE2-4656-4BE4-9E78-26216E354828}">
+      <Component Id="TutorialL6F2" Guid="{DECEADE2-4656-4BE4-9E78-26216E354828}" Directory="INSTALLDIR_DOC_TUTORIALS_L6_F2">
         <File Id="Fig6_2.png" Name="Fig6_2.png" KeyPath="yes" Source="..\Doc\Tutorial\L6\F2\Fig6_2.png" />
         <File Id="TutorialL6F2_networking.xme" Name="networking.xme"  Source="..\Doc\Tutorial\L6\F2\networking.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L7">
-      <Component Id="TutorialL7" Guid="{DFCA5588-2BCA-4314-87D2-53D20E05283C}">
+      <Component Id="TutorialL7" Guid="{DFCA5588-2BCA-4314-87D2-53D20E05283C}" Directory="INSTALLDIR_DOC_TUTORIALS_L7">
         <File Id="NetDiagDumper.pat" Name="NetDiagDumper.pat" KeyPath="yes" Source="..\Doc\Tutorial\L7\NetDiagDumper.pat" />
         <File Id="networking.pat" Name="networking.pat"  Source="..\Doc\Tutorial\L7\networking.pat" />
         <File Id="sf.pat" Name="sf.pat"  Source="..\Doc\Tutorial\L7\sf.pat" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L7_F1">
-      <Component Id="TutorialL7F1" Guid="{7D85D0FE-FF14-4BF9-9EC6-64CAB6372B0F}">
+      <Component Id="TutorialL7F1" Guid="{7D85D0FE-FF14-4BF9-9EC6-64CAB6372B0F}" Directory="INSTALLDIR_DOC_TUTORIALS_L7_F1">
         <File Id="Fig7_1.gif" Name="Fig7_1.gif" KeyPath="yes" Source="..\Doc\Tutorial\L7\F1\Fig7_1.gif" />
         <File Id="singsing.xme" Name="singsing.xme"  Source="..\Doc\Tutorial\L7\F1\singsing.xme" />
         <File Id="tmeta.xme" Name="tmeta.xme"  Source="..\Doc\Tutorial\L7\F1\tmeta.xme" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC_TUTORIALS_L8">
-      <Component Id="TutorialL8" Guid="{8FCEC784-DDBD-49BA-88BB-9BE77815EB27}">
+      <Component Id="TutorialL8" Guid="{8FCEC784-DDBD-49BA-88BB-9BE77815EB27}" Directory="INSTALLDIR_DOC_TUTORIALS_L8">
         <File Id="JavaCompRegister.png" Name="JavaCompRegister.png" KeyPath="yes" Source="..\Doc\Tutorial\L8\JavaCompRegister.png" />
         <File Id="Register_Components.png" Name="Register Components.png" Source="..\Doc\Tutorial\L8\Register Components.png" />
         <File Id="Running.png" Name="Running.png" Source="..\Doc\Tutorial\L8\Running.png" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC">
-      <Component Id="IntroductionDoc">
+      <Component Id="IntroductionDoc" Directory="INSTALLDIR_DOC">
         <File Id="The_Generic_Modeling_Environment.pdf" Name="The Generic Modeling Environment.pdf" KeyPath="yes" Source="..\Doc\The Generic Modeling Environment.pdf">
           <Shortcut Id="IntroductionShortcut" Name="The Generic Modeling Environment" Description="Introduction to the Generic Modeling Environment" Directory="ShortcutDocFolder" />
         </File>
       </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLDIR_DOC">
-      <Component Id="MGADoc">
+      <Component Id="MGADoc" Directory="INSTALLDIR_DOC">
         <File Id="Mga.pdf" Name="Mga.pdf" KeyPath="yes" Source="..\Doc\Developer\Mga.pdf">
           <Shortcut Id="MGADocShortcut" Name="MGA Library" Description="MGA Library documentation for component developers" Directory="ShortcutDocFolder" />
         </File>
       </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLDIR_DOC">
-      <Component Id="UserManual">
+      <Component Id="UserManual" Directory="INSTALLDIR_DOC">
         <File Id="GME_Manual_and_User_Guide.pdf" Name="GME Manual and User Guide.pdf" KeyPath="yes" Source="..\Doc\GME Manual and User Guide\GME Manual and User Guide.pdf">
           <Shortcut Id="UserManualShortcut" Name="GME Manual and User Guide" Description="GME User Manual in PDF format" Directory="ShortcutDocFolder" />
         </File>
         <RemoveFolder Id='RemoveShortcutDocFolder' On='uninstall' Directory='ShortcutDocFolder'/>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_COMMON">
-      <Component Id="BONCommonFiles" Guid="{7ED84614-6AA8-470C-A433-2F3F1C8AFDEA}">
+      <Component Id="BONCommonFiles" Guid="{7ED84614-6AA8-470C-A433-2F3F1C8AFDEA}" Directory="INSTALLDIR_SDK_BON_COMMON">
         <File Id="BON.cpp" Name="BON.cpp" KeyPath="yes" Source="..\SDK\BON\Common\BON.cpp" />
         <File Id="BON.h" Name="BON.h"  Source="..\SDK\BON\Common\BON.h" />
         <File Id="BONImpl.cpp" Name="BONImpl.cpp"  Source="..\SDK\BON\Common\BONImpl.cpp" />
@@ -986,10 +697,8 @@
         <File Id="Utils.cpp" Name="Utils.cpp"  Source="..\SDK\BON\Common\Utils.cpp" />
         <File Id="Utils.h" Name="Utils.h"  Source="..\SDK\BON\Common\Utils.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
-      <Component Id="BONExtender.dll">
+      <Component Id="BONExtender.dll" Directory="INSTALLDIR_PARADIGMS_METAGME">
         <File Id="BONExtender.dll" Name="BONExtender.dll" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\BONExtender.dll">
           <TypeLib Id="9EB1F214-EFE1-4B6D-BDA9-7BCD498F2E2C" Description="MGA Interpreter TypeLibrary (BONExtender)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{EE00B878-7208-44AB-8106-1A8320C019A3}" Context="InprocServer32" Description="MGA.Interpreter.BONExtender">
@@ -1008,10 +717,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD">
-      <Component Id="BONWizardFiles" Guid="{0D201E7D-99DE-4B2C-ADD3-AD3308FB5621}">
+      <Component Id="BONWizardFiles" Guid="{0D201E7D-99DE-4B2C-ADD3-AD3308FB5621}" Directory="INSTALLDIR_SDK_BON_WIZARD">
         <File Id="BON2Component.ico" Name="BON2Component.ico" Source="..\SDK\BON\Wizard\BON2Component.ico" />
         <File Id="BON2Component.vsz" Name="BON2Component.vsz"  Source="..\SDK\BON\Wizard\BON2Component.vsz" />
         <File Id="BONComponent.ico" Name="BONComponent.ico"  Source="..\SDK\BON\Wizard\BONComponent.ico" />
@@ -1024,45 +731,33 @@
         <File Id="setup100.js" Name="setup100.js"  Source="..\SDK\BON\Wizard\setup100.js" />
         <File Id="setup110.js" Name="setup11.js"  Source="..\SDK\BON\Wizard\setup11.js" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_1033">
-      <Component Id="BONWizard1033Files" Guid="{3183F8EB-28B7-433A-B645-E8BB483F7021}">
+      <Component Id="BONWizard1033Files" Guid="{3183F8EB-28B7-433A-B645-E8BB483F7021}" Directory="INSTALLDIR_SDK_BON_WIZARD_1033">
         <File Id="ComponentWizard.css" Name="ComponentWizard.css" KeyPath="yes" Source="..\SDK\BON\Wizard\1033\ComponentWizard.css" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_1033_IMAGES">
-      <Component Id="BONWizard1033ImageFiles" Guid="{20777D70-CC74-4162-B6B2-C117A1CB31C2}">
+      <Component Id="BONWizard1033ImageFiles" Guid="{20777D70-CC74-4162-B6B2-C117A1CB31C2}" Directory="INSTALLDIR_SDK_BON_WIZARD_1033_IMAGES">
         <File Id="DottedHori.gif" Name="DottedHori.gif" KeyPath="yes" Source="..\SDK\BON\Wizard\1033\Images\DottedHori.gif" />
         <File Id="DottedVert.gif" Name="DottedVert.gif"  Source="..\SDK\BON\Wizard\1033\Images\DottedVert.gif" />
         <File Id="spacer.gif" Name="spacer.gif"  Source="..\SDK\BON\Wizard\1033\Images\spacer.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_HTML_1033">
-      <Component Id="BONWizardHTML1033Files" Guid="{D719B394-349C-4D95-817D-BFC201177D74}">
+      <Component Id="BONWizardHTML1033Files" Guid="{D719B394-349C-4D95-817D-BFC201177D74}" Directory="INSTALLDIR_SDK_BON_WIZARD_HTML_1033">
         <File Id="Advanced.htm" Name="Advanced.htm" Source="..\SDK\BON\Wizard\HTML\1033\Advanced.htm" />
         <File Id="Basic.htm" Name="Basic.htm"  Source="..\SDK\BON\Wizard\HTML\1033\Basic.htm" />
         <File Id="default.htm" Name="default.htm" KeyPath="yes" Source="..\SDK\BON\Wizard\HTML\1033\default.htm" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_IMAGES">
-      <Component Id="BONWizardImageFiles" Guid="{7D1E07B3-D51C-4D81-875D-632E7F48A394}">
+      <Component Id="BONWizardImageFiles" Guid="{7D1E07B3-D51C-4D81-875D-632E7F48A394}" Directory="INSTALLDIR_SDK_BON_WIZARD_IMAGES">
         <File Id="ComponentWizard.gif" Name="ComponentWizard.gif" KeyPath="yes" Source="..\SDK\BON\Wizard\Images\ComponentWizard.gif" />
         <File Id="ComponentWizard_Background.gif" Name="ComponentWizard_Background.gif"  Source="..\SDK\BON\Wizard\Images\ComponentWizard_Background.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_SCRIPTS_1033">
-      <Component Id="BONWizardScripts1033Files" Guid="{B1111008-F040-4EAD-87D5-08EFB18372D2}">
+      <Component Id="BONWizardScripts1033Files" Guid="{B1111008-F040-4EAD-87D5-08EFB18372D2}" Directory="INSTALLDIR_SDK_BON_WIZARD_SCRIPTS_1033">
         <File Id="default.js" Name="default.js" KeyPath="yes" Source="..\SDK\BON\Wizard\Scripts\1033\default.js" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_BON_WIZARD_TEMPLATES_1033">
-      <Component Id="BONWizardTemplates1033Files" Guid="{D3A13829-3C8D-4F69-8B57-184B7FCD2AB2}">
+      <Component Id="BONWizardTemplates1033Files" Guid="{D3A13829-3C8D-4F69-8B57-184B7FCD2AB2}" Directory="INSTALLDIR_SDK_BON_WIZARD_TEMPLATES_1033">
         <File Id="BONWizardTemplates1033Files_BON2Component.cpp" Name="BON2Component.cpp" KeyPath="yes" Source="..\SDK\BON\Wizard\Templates\1033\BON2Component.cpp" />
         <File Id="BONWizardTemplates1033Files_BON2Component.h" Name="BON2Component.h"  Source="..\SDK\BON\Wizard\Templates\1033\BON2Component.h" />
         <File Id="BONWizardTemplates1033Files_BONComponent.cpp" Name="BONComponent.cpp"  Source="..\SDK\BON\Wizard\Templates\1033\BONComponent.cpp" />
@@ -1079,10 +774,8 @@
         <File Id="BONWizardTemplates1033Files_StdAfx.h" Name="StdAfx.h"  Source="..\SDK\BON\Wizard\Templates\1033\StdAfx.h" />
         <File Id="Templates.inf" Name="Templates.inf"  Source="..\SDK\BON\Wizard\Templates\1033\Templates.inf" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATORLIB">
-      <Component Id="DecoratorLib" Guid="{C8C3EC1B-DD30-475E-84DC-3A874C6909E4}">
+      <Component Id="DecoratorLib" Guid="{C8C3EC1B-DD30-475E-84DC-3A874C6909E4}" Directory="INSTALLDIR_SDK_DECORATORLIB">
         <File Id="AtomBitmapPart.cpp" Name="AtomBitmapPart.cpp"  Source="..\SDK\DecoratorLib\AtomBitmapPart.cpp" />
         <File Id="AtomBitmapPart.h" Name="AtomBitmapPart.h"  Source="..\SDK\DecoratorLib\AtomBitmapPart.h" />
         <File Id="AttributePart.cpp" Name="AttributePart.cpp"  Source="..\SDK\DecoratorLib\AttributePart.cpp" />
@@ -1197,10 +890,8 @@
         <File Id="VectorPart.cpp" Name="VectorPart.cpp"  Source="..\SDK\DecoratorLib\VectorPart.cpp" />
         <File Id="VectorPart.h" Name="VectorPart.h"  Source="..\SDK\DecoratorLib\VectorPart.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATORLIB_RES">
-      <Component Id="DecoratorLibResources" Guid="{F676A777-7C0C-44E8-ABB0-5FE06B27BCF2}">
+      <Component Id="DecoratorLibResources" Guid="{F676A777-7C0C-44E8-ABB0-5FE06B27BCF2}" Directory="INSTALLDIR_SDK_DECORATORLIB_RES">
         <File Id="atom.bmp" Name="atom.bmp" KeyPath="yes" Source="..\SDK\DecoratorLib\res\atom.bmp" />
         <File Id="atomport.bmp" Name="atomport.bmp"  Source="..\SDK\DecoratorLib\res\atomport.bmp" />
         <File Id="collapsesign.bmp" Name="collapsesign.bmp"  Source="..\SDK\DecoratorLib\res\collapsesign.bmp" />
@@ -1222,54 +913,41 @@
         <File Id="set.bmp" Name="set.bmp"  Source="..\SDK\DecoratorLib\res\set.bmp" />
         <File Id="setport.bmp" Name="setport.bmp"  Source="..\SDK\DecoratorLib\res\setport.bmp" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD">
-      <Component Id="DecoratorWizardFiles" Guid="{7A86D167-09F3-41a9-9691-E2CC9E6E52B7}">
+      <Component Id="DecoratorWizardFiles" Guid="{7A86D167-09F3-41a9-9691-E2CC9E6E52B7}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD">
         <File Id="Decorator.ico" Name="Decorator.ico" Source="..\SDK\DecoratorWizard\Decorator.ico" />
         <File Id="Decorator.vsz" Name="Decorator.vsz"  Source="..\SDK\DecoratorWizard\Decorator.vsz" />
         <File Id="DecoratorWizard.vsdir" Name="DecoratorWizard.vsdir" KeyPath="yes" Source="..\SDK\DecoratorWizard\DecoratorWizard.vsdir" />
         <File Id="DecoratorWizard_default.vcproj" Name="default.vcproj"  Source="..\SDK\DecoratorWizard\default.vcproj" />
         <File Id="DecoratorWizard_setup100.js" Name="setup100.js"  Source="..\SDK\DecoratorWizard\setup100.js" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_1033">
-      <Component Id="DecoratorWizard1033Files" Guid="{FD5EDE74-DB08-4405-9FF8-DDDD23D0C4CE}">
+      <Component Id="DecoratorWizard1033Files" Guid="{FD5EDE74-DB08-4405-9FF8-DDDD23D0C4CE}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_1033">
         <File Id="DecoratorWizard.css" Name="DecoratorWizard.css" KeyPath="yes" Source="..\SDK\DecoratorWizard\1033\DecoratorWizard.css" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_1033_IMAGES">
-      <Component Id="DecoratorWizard1033ImageFiles" Guid="{397E64F4-C55D-4558-878B-18D28FBF8461}">
+      <Component Id="DecoratorWizard1033ImageFiles" Guid="{397E64F4-C55D-4558-878B-18D28FBF8461}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_1033_IMAGES">
         <File Id="DecoratorWizard_DottedHori.gif" Name="DottedHori.gif" KeyPath="yes" Source="..\SDK\DecoratorWizard\1033\Images\DottedHori.gif" />
         <File Id="DecoratorWizard_DottedVert.gif" Name="DottedVert.gif"  Source="..\SDK\DecoratorWizard\1033\Images\DottedVert.gif" />
         <File Id="DecoratorWizard_spacer.gif" Name="spacer.gif"  Source="..\SDK\DecoratorWizard\1033\Images\spacer.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_HTML_1033">
-      <Component Id="DecoratorWizardHTML1033Files" Guid="{84C178D1-8A88-435d-BBC6-A785DF226F69}">
+
+      <Component Id="DecoratorWizardHTML1033Files" Guid="{84C178D1-8A88-435d-BBC6-A785DF226F69}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_HTML_1033">
         <File Id="DecoratorWizard_default.htm" Name="default.htm" KeyPath="yes" Source="..\SDK\DecoratorWizard\HTML\1033\default.htm" />
         <File Id="Settings.htm" Name="Settings.htm" Source="..\SDK\DecoratorWizard\HTML\1033\Settings.htm" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_IMAGES">
-      <Component Id="DecoratorWizardImageFiles" Guid="{E7599C06-7384-49e1-B0A7-272B8425BAB9}">
+      <Component Id="DecoratorWizardImageFiles" Guid="{E7599C06-7384-49e1-B0A7-272B8425BAB9}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_IMAGES">
         <File Id="DecoratorWizard.gif" Name="DecoratorWizard.gif" KeyPath="yes" Source="..\SDK\DecoratorWizard\Images\DecoratorWizard.gif" />
         <File Id="DecoratorWizard_Background.gif" Name="DecoratorWizard_Background.gif"  Source="..\SDK\DecoratorWizard\Images\DecoratorWizard_Background.gif" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS_1033">
-      <Component Id="DecoratorWizardScripts1033Files" Guid="{5190D806-B76A-40dc-8B6E-30C9CB4EE9C2}">
+      <Component Id="DecoratorWizardScripts1033Files" Guid="{5190D806-B76A-40dc-8B6E-30C9CB4EE9C2}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_SCRIPTS_1033">
         <File Id="DecoratorWizard_default.js" Name="default.js" KeyPath="yes" Source="..\SDK\DecoratorWizard\Scripts\1033\default.js" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES_1033">
-      <Component Id="DecoratorWizardTemplates1033Files" Guid="{9FA284BB-FA1F-4cbf-A939-21C9DE413B91}">
+      <Component Id="DecoratorWizardTemplates1033Files" Guid="{9FA284BB-FA1F-4cbf-A939-21C9DE413B91}" Directory="INSTALLDIR_SDK_DECORATOR_WIZARD_TEMPLATES_1033">
         <File Id="DecoratorWizard_Decorator.cpp" Name="Decorator.cpp" Source="..\SDK\DecoratorWizard\Templates\1033\Decorator.cpp" />
         <File Id="DecoratorWizard_Decorator.h" Name="Decorator.h" Source="..\SDK\DecoratorWizard\Templates\1033\Decorator.h" />
         <File Id="DecoratorWizard_Decorator.rc" Name="Decorator.rc" KeyPath="yes" Source="..\SDK\DecoratorWizard\Templates\1033\Decorator.rc" />
@@ -1293,10 +971,8 @@
         <File Id="DecoratorWizard_StdAfx.h" Name="StdAfx.h" Source="..\SDK\DecoratorWizard\Templates\1033\StdAfx.h" />
         <File Id="DecoratorWizard_Templates.inf" Name="Templates.inf"  Source="..\SDK\DecoratorWizard\Templates\1033\Templates.inf" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOREXAMPLES_NEWSAMPLE">
-      <Component Id="DecoratorExamplesNewSample" Guid="{1E84229B-F4DE-48f7-B762-D9C50874B855}">
+      <Component Id="DecoratorExamplesNewSample" Guid="{1E84229B-F4DE-48f7-B762-D9C50874B855}" Directory="INSTALLDIR_SDK_DECORATOREXAMPLES_NEWSAMPLE">
         <File Id="DecoratorExamplesNewSample_Decorator.cpp" Name="Decorator.cpp" Source="..\SDK\Decorator Examples\NewSample\Decorator.cpp" />
         <File Id="DecoratorExamplesNewSample_Decorator.h" Name="Decorator.h" Source="..\SDK\Decorator Examples\NewSample\Decorator.h" />
         <File Id="DecoratorExamplesNewSample_Decorator.rc" Name="Decorator.rc" KeyPath="yes" Source="..\SDK\Decorator Examples\NewSample\Decorator.rc" />
@@ -1320,10 +996,8 @@
         <File Id="DecoratorExamplesNewSample_StdAfx.cpp" Name="StdAfx.cpp" Source="..\SDK\Decorator Examples\NewSample\StdAfx.cpp" />
         <File Id="DecoratorExamplesNewSample_StdAfx.h" Name="StdAfx.h" Source="..\SDK\Decorator Examples\NewSample\StdAfx.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOREXAMPLES_PLAINSAMPLE">
-      <Component Id="DecoratorExamplesPlainSample" Guid="{A8F5CCA0-3BAE-4089-9A6F-54E46FA89173}">
+      <Component Id="DecoratorExamplesPlainSample" Guid="{A8F5CCA0-3BAE-4089-9A6F-54E46FA89173}" Directory="INSTALLDIR_SDK_DECORATOREXAMPLES_PLAINSAMPLE">
         <File Id="DecoratorExamplesPlainSample_CommonError.cpp" Name="CommonError.cpp" KeyPath="yes" Source="..\SDK\Decorator Examples\PlainSample\CommonError.cpp" />
         <File Id="DecoratorExamplesPlainSample_CommonError.h" Name="CommonError.h" Source="..\SDK\Decorator Examples\PlainSample\CommonError.h" />
         <File Id="DecoratorExamplesPlainSample_CommonSmart.h" Name="CommonSmart.h" Source="..\SDK\Decorator Examples\PlainSample\CommonSmart.h" />
@@ -1342,29 +1016,21 @@
         <File Id="DecoratorExamplesPlainSample_StdAfx.cpp" Name="StdAfx.cpp" Source="..\SDK\Decorator Examples\PlainSample\StdAfx.cpp" />
         <File Id="DecoratorExamplesPlainSample_StdAfx.h" Name="StdAfx.h" Source="..\SDK\Decorator Examples\PlainSample\StdAfx.h" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DECORATOREXAMPLES">
-      <Component>
+      <Component Directory="INSTALLDIR_SDK_DECORATOREXAMPLES">
         <File Source="..\SDK\Decorator Examples\SampleDecorator.cs" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_DOTNET">
-      <Component Id="CSharpComponentWizard.exe" Guid="DB3B2614-7590-4F6D-8BCA-AEB8EB9A47FC">
+      <Component Id="CSharpComponentWizard.exe" Guid="DB3B2614-7590-4F6D-8BCA-AEB8EB9A47FC" Directory="INSTALLDIR_SDK_DOTNET">
         <File Id="CSharpComponentWizard.exe" Source="..\SDK\DotNet\CSharpComponentWizard\bin\Release\CSharpComponentWizard.exe"/>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC">
-      <Component Id="JavaDocs" Guid="501a65f3-9394-4da8-bec1-99cfff03ccb8">
+      <Component Id="JavaDocs" Guid="501a65f3-9394-4da8-bec1-99cfff03ccb8" Directory="INSTALLDIR_DOC">
         <File Id="javagmedoc.zip" Name="javagmedoc.zip" KeyPath="yes" Source="..\SDK\java\javagmedoc.zip" />
         <File Id="GME_JavaInterface_Users_Manual.pdf" Name="GME_JavaInterface - Users Manual.pdf" Source="..\Doc\Developer\GME_JavaInterface - Users Manual.pdf" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_SCRIPTS">
-      <Component Id="Scripts" Guid="{8321FCA0-1DA5-48C7-B0C1-F5435759C32B}">
+      <Component Id="Scripts" Guid="{8321FCA0-1DA5-48C7-B0C1-F5435759C32B}" Directory="INSTALLDIR_SDK_SCRIPTS">
         <File Id="GMEModelBuilder.py" Name="GMEModelBuilder.py" KeyPath="yes" Source="..\SDK\Scripts\GMEModelBuilder.py" />
         <File Id="GMEObjectQuery.js" Name="GMEObjectQuery.js"  Source="..\SDK\Scripts\GMEObjectQuery.js" />
         <File Id="GMEObjectQuery.py" Name="GMEObjectQuery.py"  Source="..\SDK\Scripts\GMEObjectQuery.py" />
@@ -1372,14 +1038,11 @@
         <File Id="GMETraversor.py" Name="GMETraversor.py"  Source="..\SDK\Scripts\GMETraversor.py" />
         <File Id="GMETraversor.vbs" Name="GMETraversor.vbs"  Source="..\SDK\Scripts\GMETraversor.vbs" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK">
-      <Component Id="ScriptSDK.zip" Guid="{0fe37757-8f9c-4488-a0bc-5fa42ed22b6c}">
+      <Component Id="ScriptSDK.zip" Guid="{0fe37757-8f9c-4488-a0bc-5fa42ed22b6c}" Directory="INSTALLDIR_SDK">
         <File Id="ScriptSDK.zip" Name="ScriptSDK.zip" KeyPath="yes" Source="..\SDK\ScriptSDK\ScriptSDK.zip" />
       </Component>
-    </DirectoryRef>
-    <?endif?>
-
-  </Module>
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
 </Wix>

Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/GME_bin.wxs	Wed Oct  1 10:04:16 2014	(r2545)
@@ -5,58 +5,23 @@
   <?include GME_dyn.wxi ?>
   <?include GME_inc.wxi ?>
 
-  <Module Id='GME_bin' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+  <Fragment>
 
-    <Package Id='$(var.GME_bin_Package_Id)' Keywords='GME, MIC, modeling, domain specific languages' Description='Generic Modeling Environment Installer'
-        Manufacturer='Vanderbilt University, ISIS'
-        InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
-        InstallPrivileges='elevated' InstallScope='perMachine'/>
-
-    <Icon Id='GME.ico' SourceFile='..\GME\Gme\res\GME.ico' />
-    <!-- =========================================================== -->
-    <!-- DIRECTORY STRUCTURE -->
-    <!-- =========================================================== -->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='$(var.ProgramFilesNativeFolder)'>
-        <Directory Id='INSTALLDIR' Name='GME'>
-          <Directory Id='INSTALLDIR_DOC' Name='Doc'/>
-          <Directory Id='INSTALLDIR_BIN' Name='Bin'/>
-          <Directory Id='INSTALLDIR_INTERFACES' Name='Interfaces'/>
-          <Directory Id='INSTALLDIR_PARADIGMS' Name='Paradigms'>
-            <Directory Id='INSTALLDIR_PARADIGMS_HFSM' Name='HFSM'>
-              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_ICONS' Name='icons'/>
-              <Directory Id='INSTALLDIR_PARADIGMS_HFSM_HFSMSIMULATOR' Name='HFSMSimulator'/>
-            </Directory>
-            <Directory Id='INSTALLDIR_PARADIGMS_METAGME' Name='MetaGME'/>
-            <Directory Id='INSTALLDIR_PARADIGMS_UML' Name='UML'/>
-          </Directory>
-          <Directory Id='INSTALLDIR_SDK' Name='SDK'>
-            <Directory Id='INSTALLDIR_SDK_JAVA' Name='Java' />
-            <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSOR' Name='PatternProcessor' />
-          </Directory>
-          <Directory Id='INSTALLDIR_TOOLS' Name='Tools' />
-          <Directory Id='INSTALLDIR_LIBS' Name='Lib' />
-        </Directory>
-      </Directory>
-
-      <Directory Id='ProgramMenuFolder'>
-        <Directory Id='ShortcutFolder' Name='GME'/>
-      </Directory>
-    </Directory>
-
-    <!-- =========================================================== -->
-    <!-- COMPONENTS -->
-    <!-- =========================================================== -->
-    <DirectoryRef Id='INSTALLDIR_BIN'>
-      <Component Id='GME.exe'>
-        <File Id='GME.exe' Name='GME.exe' DiskId='1' Source='..\GME\$(var.Release)\GME.exe' KeyPath='yes' Checksum='yes'>
+    <ComponentGroup Id='GME_bin$(sys.BUILDARCH)'>
+
+
+      <!-- =========================================================== -->
+      <!-- COMPONENTS -->
+      <!-- =========================================================== -->
+      <Component Id='GME.exe$(sys.BUILDARCH)' Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id='GME.exe$(sys.BUILDARCH)' Name='GME.exe' DiskId='1' Source='..\GME\$(var.Release)\GME.exe' KeyPath='yes' Checksum='yes'>
           <?if $(sys.BUILDARCH)=x86 ?>
-          <Shortcut Id='ApplicationStartMenuShortcut' Name='GME' Icon='GME.ico' Description='Generic Modeling Environment' Directory='ShortcutFolder' Advertise="yes" />
+          <Shortcut Id='ApplicationStartMenuShortcut$(sys.BUILDARCH)' Name='GME' Icon='GME.ico' Description='Generic Modeling Environment' Directory='ShortcutFolder' Advertise="yes" />
           <?else?>
-          <Shortcut Id='ApplicationStartMenuShortcut' Name='GME (64 bit)' Icon='GME.ico' Description='Generic Modeling Environment' Directory='ShortcutFolder' Advertise="yes" />
+          <Shortcut Id='ApplicationStartMenuShortcut$(sys.BUILDARCH)' Name='GME (64 bit)' Icon='GME.ico' Description='Generic Modeling Environment' Directory='ShortcutFolder' Advertise="yes" />
           <?endif?>
           <TypeLib Id="{0ADEEC71-D83A-11D3-B36B-005004CC8592}" Description="GME Type Library" Language="0" MajorVersion="1" MinorVersion="0">
-            <Class Id='C7DCCC2E-1642-4a40-8060-51A7B9FAE488' Context='LocalServer32' Server='GME.exe' Handler='2'>
+            <Class Id='C7DCCC2E-1642-4a40-8060-51A7B9FAE488' Context='LocalServer32' Server='GME.exe$(sys.BUILDARCH)' Handler='2'>
               <ProgId Id='GME.Application' />
             </Class>
             <Interface Id="{81191A44-B898-4143-BF8B-CA7501FEC19A}" Name="IGMEOLEApp" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
@@ -82,41 +47,37 @@
           <RegistryValue Name='Path' Type='string' Value='[INSTALLDIR]'/>
         </RegistryKey>
 
-        <ProgId Id='GME.mgafile' Description='GME project file'>
+        <ProgId Id='GME.mgafile$(sys.BUILDARCH)' Description='GME project file'>
           <Extension Id='mga' ContentType='application/x-mga'>
             <?if $(sys.BUILDARCH)=x86 ?>
-            <Verb Id='open' Command='Open with GME' TargetFile='GME.exe' Argument='"%1"' />
-            <Verb Id='open_x86' Command='Open with GME' TargetFile='GME.exe' Argument='"%1"' />
+            <Verb Id='open' Command='Open with GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
+            <Verb Id='open_x86' Command='Open with GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
             <?else?>
-            <Verb Id='open_x64' Command='Open with 64bit GME' TargetFile='GME.exe' Argument='"%1"' />
+            <Verb Id='open_x64' Command='Open with 64bit GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
             <?endif?>
           </Extension>
         </ProgId>
         <ProgId Id='GME.xmefile' Description='GME XML project file'>
           <Extension Id='xme' ContentType='application/x-xme'>
             <?if $(sys.BUILDARCH)=x86 ?>
-            <Verb Id='open' Command='Open with GME' TargetFile='GME.exe' Argument='"%1"' />
-            <Verb Id='open_x86' Command='Open with GME' TargetFile='GME.exe' Argument='"%1"' />
+            <Verb Id='open' Command='Open with GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
+            <Verb Id='open_x86' Command='Open with GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
             <?else?>
-            <Verb Id='open_x64' Command='Open with 64bit GME' TargetFile='GME.exe' Argument='"%1"' />
+            <Verb Id='open_x64' Command='Open with 64bit GME' TargetFile='GME.exe$(sys.BUILDARCH)' Argument='"%1"' />
             <?endif?>
           </Extension>
         </ProgId>
-        <Registry Id='MGADesc' Root='HKCR' Key='GME.mgafile' Action='write' Type='string' Value='GME model file' />
-        <Registry Id='XMEDesc' Root='HKCR' Key='GME.xmefile' Action='write' Type='string' Value='GME XML model file' />
-        <Registry Id='XMEIcon' Root='HKCR' Key='GME.xmefile\DefaultIcon' Action='write' Type='string' Value='[#GME.exe],5' />
         <?if $(sys.BUILDARCH)=x86 ?>
+        <Registry Id='GME.mgafile_desc' Root='HKCR' Key='GME.mgafile' Action='write' Type='string' Value='GME model file' />
+        <Registry Id='GME.xmefile_desc' Root='HKCR' Key='GME.xmefile' Action='write' Type='string' Value='GME XML model file' />
+        <Registry Id='GME.xmefile_icon' Root='HKCR' Key='GME.xmefile\DefaultIcon' Action='write' Type='string' Value='[#GME.exe$(sys.BUILDARCH)],5' />
         <Environment Id="GME_ROOT" Action="set" System="yes" Name="GME_ROOT" Value="[INSTALLDIR]" />
-        <?endif?>
         <RemoveFolder Id='RemoveShortcutFolder' On='uninstall' Directory='ShortcutFolder'/>
+        <?endif?>
       </Component>
 
-    </DirectoryRef>
-
-
-    <DirectoryRef Id='INSTALLDIR_BIN'>
-      <Component Id='Annotator.dll'>
-        <File Id="Annotator.dll" Name="Annotator.dll" KeyPath="yes" Source="..\GME\$(var.Release)\Annotator.dll">
+      <Component Id='Annotator.dll$(sys.BUILDARCH)' Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id='Annotator.dll$(sys.BUILDARCH)' KeyPath="yes" Source="..\GME\$(var.Release)\Annotator.dll">
           <TypeLib Id="{F0E585D5-1697-4698-B374-D73B0D6127D0}" Description="GME Annotator Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{D3CF55F1-D1AA-433E-982B-D2A6E22D8299}" Context="InprocServer32" Description="MGA Decorator CoClass (Annotator)" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="MGA.Decorator.Annotator.1" Description="MGA Decorator CoClass (Annotator)">
@@ -126,11 +87,10 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_TOOLS">
-      <Component Id="AutoLayout.dll">
-        <File Id="AutoLayout.dll" Name="AutoLayout.dll" KeyPath="yes" Source="..\Tools\AutoLayout\$(var.Release)\AutoLayout.dll">
+
+      <Component Id="AutoLayout.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_TOOLS$(sys.BUILDARCH)">
+        <File Id="AutoLayout.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\Tools\AutoLayout\$(var.Release)\AutoLayout.dll">
           <TypeLib Id="E0EDD212-6AEC-41AE-8F45-4A75921D16C7" Description="MGA Interpreter TypeLibrary (AutoLayout)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{DB312634-F076-4FB2-BCA9-CEF7D239590D}" Context="InprocServer32" Description="MGA.Interpreter.AutoLayout">
               <ProgId Id="MGA.Interpreter.AutoLayout" Description="MGA.Interpreter.AutoLayout" />
@@ -153,11 +113,9 @@
 
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="Console.ocx">
-        <File Id="Console.ocx" Name="Console.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\Console.ocx">
+      <Component Id="Console.ocx$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="Console.ocx$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\Console.ocx">
           <TypeLib Id="{339FD307-717B-4698-AC13-4ACCCF5D4C91}" Description="Console ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{A9B2B82A-B753-4FB0-8F0B-3661BC307053}" Context="InprocServer32" Description="GME Console Property Page" />
             <AppId Description="MgaUtil" Id="{461F30AF-3BF0-11D4-B3F0-005004D38590}">
@@ -173,11 +131,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="ConstraintManager.dll">
-        <File Id="ConstraintManager.dll" Name="ConstraintManager.dll" KeyPath="yes" Source="..\GME\$(var.Release)\ConstraintManager.dll">
+      <Component Id="ConstraintManager.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="ConstraintManager.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\ConstraintManager.dll">
           <TypeLib Id="{D69D91D0-4550-4A5D-848C-9BBA92693D22}" Description="ConstraintManager 1.0 Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{44055854-A45B-4357-9D2C-FC66D6C0DFFA}" Context="InprocServer32" Description="ConstraintManager Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.AddOn.ConstraintManager.1" Description="ConstraintManager Class">
@@ -211,11 +167,9 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="Core.dll">
-        <File Id="Core.dll" Name="Core.dll" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Core.dll">
+      <Component Id="Core.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="Core.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Core.dll">
           <TypeLib Id="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" Description="MGA Core Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{7281C07A-3E09-11D3-B2F7-005004D38590}" Context="InprocServer32" Description="CoreBinFile Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.CoreBinFile.1" Description="CoreBinFile Class">
@@ -232,16 +186,14 @@
                 <ProgId Id="Mga.CoreProject" Description="CoreProject Class" />
               </ProgId>
             </Class>
-            <Class Id="{9FE3BB80-B596-41BA-910F-0FF9C3B4F38A}" Context="InprocServer32" Description="CoreCollectionHandler Class" ThreadingModel="both" Programmable="yes" Handler="[#Core.dll]" />
+            <Class Id="{9FE3BB80-B596-41BA-910F-0FF9C3B4F38A}" Context="InprocServer32" Description="CoreCollectionHandler Class" ThreadingModel="both" Programmable="yes" Handler="[#Core.dll$(sys.BUILDARCH)]" />
             <Interface Id="{9A228010-020B-11D2-BBB3-0040051F7117}" Name="IGMEVersionInfo" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="GMEActiveBrowser.ocx">
-        <File Id="GMEActiveBrowser.ocx" Name="GMEActiveBrowser.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\GMEActiveBrowser.ocx">
+      <Component Id="GMEActiveBrowser.ocx$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="GMEActiveBrowser.ocx$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\GMEActiveBrowser.ocx">
           <TypeLib Id="{FDA9EDB8-ED6A-468F-A3A9-E9361FEED051}" Description="GMEActiveBrowser ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{4B4C56DA-A2A0-4AE3-BC4B-B07151DE732C}" Context="InprocServer32" Description="GMEActiveBrowser Property Page" />
             <Class Id="{DD4F2DEB-D064-4844-9EE1-04673C872E7B}" Context="InprocServer32" Description="GMEActiveBrowser Control" ThreadingModel="apartment" Version="1.0" Control="yes" Insertable="yes">
@@ -250,38 +202,25 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="CrashRpt.dll">
-        <File Id="CrashRpt.dll" Name="CrashRpt.dll" KeyPath="yes" Source="..\GME\lib\CrashRpt\$(var.bin)\CrashRpt.dll" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="CrashRpt.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\lib\CrashRpt\$(var.bin)\CrashRpt.dll" />
       </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="crashrpt_lang.ini">
-        <File Id="crashrpt_lang.ini" Name="crashrpt_lang.ini" KeyPath="yes" Source="..\GME\lib\CrashRpt\bin\crashrpt_lang.ini" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="crashrpt_lang.ini$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\lib\CrashRpt\bin\crashrpt_lang.ini" />
       </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="CrashSender.exe">
-        <File Id="CrashSender.exe" Name="CrashSender.exe" KeyPath="yes" Source="..\GME\lib\CrashRpt\$(var.bin)\CrashSender.exe" />
+      <Component  Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="CrashSender.exe$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\lib\CrashRpt\$(var.bin)\CrashSender.exe" />
       </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="CrashRpt.license">
-        <File Id="CrashRpt.license" Name="CrashRpt.license" KeyPath="yes" Source="..\GME\lib\CrashRpt\License.txt" />
+      <Component Directory='INSTALLDIR$(sys.BUILDARCH)'>
+        <File Id="CrashRpt.license$(sys.BUILDARCH)" Name="CrashRpt.license" KeyPath="yes" Source="..\GME\lib\CrashRpt\License.txt" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component>
-        <File Source="..\GME\CSGUI\bin\Release\CSGUI.dll" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id='CSGUI.dll$(sys.BUILDARCH)' Source="..\GME\CSGUI\bin\Release\CSGUI.dll" />
       </Component>
-      <Component Id="Meta.dll">
-        <File Id="Meta.dll" Name="Meta.dll" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Meta.dll">
+      <Component Id="Meta.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="Meta.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Meta.dll">
           <TypeLib Id="{0ADEEC71-D83A-11D3-B36B-005004D38590}" Description="MGA Meta Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{8216325A-B7C8-1AD3-ABAE-000000000000}" Context="InprocServer32" Description="MgaMetaEnumItem Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.MgaMetaEnumItem.1" Description="MgaMetaEnumItem Class">
@@ -415,11 +354,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
-      <Component Id="MetaDecorator.dll">
-        <File Id="MetaDecorator.dll" Name="MetaDecorator.dll" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\MetaDecorator.dll">
+      <Component Id="MetaDecorator.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_PARADIGMS_METAGME$(sys.BUILDARCH)">
+        <File Id="MetaDecorator.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\MetaDecorator.dll">
           <TypeLib Id="{315F4696-6E31-48d2-8580-FA6CBB805520}" Description="MGA MetaDecorator Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{E0062203-4CF9-424A-BF05-4F6590942015}" Context="InprocServer32" Description="MGA Decorator CoClass (MetaDecorator)" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="MGA.Decorator.MetaDecorator.1" Description="MGA Decorator CoClass (MetaDecorator)">
@@ -429,11 +366,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
-      <Component Id="MetaInterpreter.dll">
-        <File Id="MetaInterpreter.dll" Name="MetaInterpreter.dll" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\MetaInterpreter.dll">
+      <Component Id="MetaInterpreter.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_PARADIGMS_METAGME$(sys.BUILDARCH)">
+        <File Id="MetaInterpreter.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\MetaInterpreter.dll">
           <TypeLib Id="1CB9FEAE-D8F7-48B0-A776-1541149AAF50" Description="MGA Interpreter TypeLibrary (MetaInterpreter)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{F15CF3E9-7383-44B3-9AB8-A275283BBCA9}" Context="InprocServer32" Description="MGA.Interpreter.MetaInterpreter">
               <ProgId Id="MGA.Interpreter.MetaInterpreter" Description="MGA.Interpreter.MetaInterpreter" />
@@ -451,11 +386,9 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML">
-      <Component Id="UMLDecorator.dll">
-        <File Id="UMLDecorator.dll" Name="UMLDecorator.dll" KeyPath="yes" Source="..\Paradigms\UML\decorator\$(var.Release)\UMLDecorator.dll">
+      <Component Id="UMLDecorator.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_PARADIGMS_UML$(sys.BUILDARCH)">
+        <File Id="UMLDecorator.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\Paradigms\UML\decorator\$(var.Release)\UMLDecorator.dll">
           <TypeLib Id="{4696E82A-ABFD-4B36-BC6B-4248CC56FD89}" Description="UMLDecoratorLib 1.0 Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{26AC9143-6F73-4E6A-B942-F641B37F87B5}" Context="InprocServer32" Description="UMLDecorator Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.UMLDecorator.1" Description="UMLDecorator Class">
@@ -465,11 +398,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="Mga.dll">
-        <File Id="Mga.dll" Name="Mga.dll" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Mga.dll">
+      <Component Id="Mga.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="Mga.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)_PGO\Mga.dll">
           <TypeLib Id="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" Description="MGA Mga Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{1DF52E42-BCC0-4439-B3CD-75610AC372A3}" Context="InprocServer32" Description="MgaO Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.MgaO.1" Description="MgaO Class">
@@ -539,11 +470,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="MgaDecorators.dll">
-        <File Id="MgaDecorators.dll" Name="MgaDecorators.dll" KeyPath="yes" Source="..\GME\$(var.Release)\MgaDecorators.dll">
+      <Component Id="MgaDecorators.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="MgaDecorators.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\MgaDecorators.dll">
           <TypeLib Id="{F5D9A9A0-5A1C-40B8-9EEF-4890FEECC8CD}" Description="MgaDecoratorLib 1.0 Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{3FA0768D-F832-4C6A-973D-5D8E3EF05FFA}" Context="InprocServer32" Description="BoxDecorator Class" ThreadingModel="apartment" Programmable="yes">
               <ProgId Id="Mga.BoxDecorator.1" Description="BoxDecorator Class">
@@ -553,11 +482,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="MgaDotNetServices.dll">
-        <File Id="MgaDotNetServices.dll" Name="MgaDotNetServices.dll" KeyPath="yes" Source="..\GME\Release\MgaDotNetServices.dll" />
+      <Component Id="MgaDotNetServices.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="MgaDotNetServices.dll$(sys.BUILDARCH)" Name="MgaDotNetServices.dll" KeyPath="yes" Source="..\GME\Release\MgaDotNetServices.dll" />
         <Class Id="{0BB0C371-6835-4F09-A156-0BD8E3DF8216}" Context="InprocServer32" Description="MGA.DotNetServices.Registrar" ThreadingModel="both" ForeignServer="mscoree.dll">
           <ProgId Id="MGA.DotNetRegistrar" Description="MGA.DotNetServices.Registrar" />
         </Class>
@@ -566,19 +493,17 @@
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32\1.0.0.0" Name="Assembly" Value="MgaDotNetServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32\1.0.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32\1.0.0.0" Name="SupportedRuntimeVersions" Value="v4.0.30319;v2.0.50727" Type="string" Action="write" />
-        <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32\1.0.0.0" Name="CodeBase" Value="file:///[#MgaDotNetServices.dll]" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32\1.0.0.0" Name="CodeBase" Value="file:///[#MgaDotNetServices.dll$(sys.BUILDARCH)]" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="Class" Value="MGA.DotNetServices.Registrar" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="Assembly" Value="MgaDotNetServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="SupportedRuntimeVersions" Value="v4.0.30319;v2.0.50727" Type="string" Action="write" />
-        <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="CodeBase" Value="file:///[#MgaDotNetServices.dll]" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{0BB0C371-6835-4F09-A156-0BD8E3DF8216}\InprocServer32" Name="CodeBase" Value="file:///[#MgaDotNetServices.dll$(sys.BUILDARCH)]" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="MgaUtil.dll">
-        <File Id="MgaUtil.dll" Name="MgaUtil.dll" KeyPath="yes" Source="..\GME\$(var.Release)\MgaUtil.dll">
+      <Component Id="MgaUtil.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="MgaUtil.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\MgaUtil.dll">
           <TypeLib Id="{461F30AE-3BF0-11D4-B3F0-005004D38590}" Description="MGA Utilities Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <AppId Description="MgaUtil" Id="{461F30AF-3BF0-11D4-B3F0-005004D38590}">
               <Class Id="{F1D6BB06-42EE-11D4-B3F4-005004D38590}" Context="InprocServer32" Description="MgaRegistrar Class" ThreadingModel="apartment" Programmable="yes">
@@ -632,11 +557,9 @@
         <RegistryValue Root="HKCR" Key="CLSID\{F1D6BB06-42EE-11D4-B3F4-005004D38590}\Elevation" Name="Enabled" Value="1" Type="integer" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{F1D6BB06-42EE-11D4-B3F4-005004D38590}" Name="LocalizedString" Value="@[!MgaUtil.dll],-2072" Type="string" Action="write" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
-      <Component Id="NamespaceConfig.dll">
-        <File Id="NamespaceConfig.dll" Name="NamespaceConfig.dll" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\NamespaceConfig.dll">
+      <Component Id="NamespaceConfig.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_PARADIGMS_METAGME$(sys.BUILDARCH)">
+        <File Id="NamespaceConfig.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\Paradigms\MetaGME\$(var.Release)\NamespaceConfig.dll">
           <TypeLib Id="A80F5574-0EA6-44F4-8001-9B803C3E2960" Description="MGA Interpreter TypeLibrary (NamespaceConfig)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{7A7B03E5-9132-45EA-919C-C5BEC40387B1}" Context="InprocServer32" Description="MGA.Interpreter.NamespaceConfig">
               <ProgId Id="MGA.Interpreter.NamespaceConfig" Description="MGA.Interpreter.NamespaceConfig" />
@@ -654,11 +577,9 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="ObjectInspector.ocx">
-        <File Id="ObjectInspector.ocx" Name="ObjectInspector.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\ObjectInspector.ocx">
+      <Component Id="ObjectInspector.ocx$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="ObjectInspector.ocx$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\ObjectInspector.ocx">
           <TypeLib Id="{92B54998-8E88-41A2-924F-7354CAD14565}" Description="ObjectInspector ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{0B4B5A75-BF21-4C8B-A705-E2666E1D9B15}" Context="InprocServer32" Description="ObjectInspector Property Page" />
             <Class Id="{B786F53C-297F-4DB8-8060-D45057217AEE}" Context="InprocServer32" Description="ObjectInspector Control" ThreadingModel="apartment" Version="1.0" Control="yes">
@@ -667,18 +588,14 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_DOC">
-      <Component Id="OnlineHelp">
-        <File Id="GME_Manual_and_User_Guide.chm" Name="GME Manual and User Guide.chm" KeyPath="yes" Source="..\Doc\GME Manual and User Guide\GME Manual and User Guide.chm">
+      <Component Id="OnlineHelp$(sys.BUILDARCH)" Directory="INSTALLDIR_DOC$(sys.BUILDARCH)">
+        <File Id="GME_Manual_and_User_Guide.chm$(sys.BUILDARCH)" KeyPath="yes" Source="..\Doc\GME Manual and User Guide\GME Manual and User Guide.chm">
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="PanningView.ocx">
-        <File Id="PanningView.ocx" Name="PanningView.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\PanningView.ocx">
+      <Component Id="PanningView.ocx$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="PanningView.ocx$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\PanningView.ocx">
           <TypeLib Id="{B6ED16CA-512F-48B7-B5DB-1C064821F7DB}" Description="PanningView ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{458D3476-B3FF-4545-9645-C247A7C17E36}" Context="InprocServer32" Description="PanningView Property Page" />
             <Class Id="{B0C28BAA-7E44-404C-BEAD-83735356F1D2}" Context="InprocServer32" Description="PanningView Control" ThreadingModel="apartment" Version="1.0" Control="yes">
@@ -687,11 +604,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="Parser.dll">
-        <File Id="Parser.dll" Name="Parser.dll" KeyPath="yes" Source="..\GME\$(var.Release)\Parser.dll">
+      <Component Id="Parser.dll$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="Parser.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\Parser.dll">
           <TypeLib Id="{70C41B15-E3CE-11D3-B37A-005004D38590}" Description="MGA Parser Type Library" Language="0" MajorVersion="1" MinorVersion="1">
             <AppId Description="MgaUtil" Id="{461F30AF-3BF0-11D4-B3F0-005004D38590}">
               <Class Id="{70C41B25-E3CE-11D3-B37A-005004D38590}" Context="InprocServer32" Description="MgaMetaParser Class" ThreadingModel="apartment" Programmable="yes">
@@ -719,23 +634,21 @@
           </TypeLib>
         </File>
       </Component>
-      <Component Id="edf.dtd">
-        <File Id="edf.dtd" Name="edf.dtd" Source="..\GME\Parser\edf.dtd" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="edf.dtd$(sys.BUILDARCH)" Source="..\GME\Parser\edf.dtd" />
       </Component>
-      <Component Id="mga.dtd">
-        <File Id="mga.dtd" Name="mga.dtd" Source="..\GME\Parser\mga.dtd" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="mga.dtd$(sys.BUILDARCH)" Source="..\GME\Parser\mga.dtd" />
       </Component>
-      <Component Id="mga2.dtd">
-        <File Id="mga2.dtd" Name="mga2.dtd" Source="..\GME\Parser\mga2.dtd" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="mga2.dtd$(sys.BUILDARCH)" Source="..\GME\Parser\mga2.dtd" />
       </Component>
-      <Component Id="mgaclosure.dtd">
-        <File Id="mgaclosure.dtd" Name="mgaclosure.dtd" Source="..\GME\Parser\mgaclosure.dtd" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="mgaclosure.dtd$(sys.BUILDARCH)" Source="..\GME\Parser\mgaclosure.dtd" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="PartBrowser.ocx">
-        <File Id="PartBrowser.ocx" Name="PartBrowser.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\PartBrowser.ocx">
+      <Component Id="PartBrowser.ocx$(sys.BUILDARCH)" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="PartBrowser.ocx$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.Release)\PartBrowser.ocx">
           <TypeLib Id="{EA3F7431-913A-421F-9B9C-BEB6A735285A}" Description="PartBrowser ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{8E82D238-D222-493D-8ED2-3175A5B1086C}" Context="InprocServer32" Description="PartBrowser Property Page" />
             <Class Id="{1FF57057-D598-4FC2-8F9D-708F59B9C017}" Context="InprocServer32" Description="PartBrowser Control" ThreadingModel="apartment" Version="1.0" Control="yes" Insertable="yes">
@@ -744,35 +657,31 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="ReadmeFiles">
-        <File Id="ReadmeFiles_README.txt" Name="README.txt" KeyPath="yes" Source="..\Doc\README.txt" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="ReadmeFiles_README.txt$(sys.BUILDARCH)" KeyPath="yes" Source="..\Doc\README.txt" />
       </Component>
-      <Component Id="muserdoc.txt">
-        <File Id="muserdoc.txt" Name="muserdoc.txt" Source="..\Doc\muserdoc.txt" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="muserdoc.txt$(sys.BUILDARCH)" Source="..\Doc\muserdoc.txt" />
       </Component>
-      <Component Id="License.txt">
-        <File Id="License.txt" Name="License.txt" Source="..\Doc\Legal\License.txt" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="License.txt$(sys.BUILDARCH)" Source="..\Doc\Legal\License.txt" />
       </Component>
-      <Component Id="APR_Serf_Xerces.license">
-        <File Id="APR_Serf_Xerces.license" Name="APR_Serf_Xerces.license" Source="..\Doc\Legal\APR_Serf_Xerces.license" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="APR_Serf_Xerces.license$(sys.BUILDARCH)" Source="..\Doc\Legal\APR_Serf_Xerces.license" />
       </Component>
-      <Component Id="OpenSSL.license">
-        <File Id="OpenSSL.license" Name="OpenSSL.license" Source="..\Doc\Legal\OpenSSL.license" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="OpenSSL.license$(sys.BUILDARCH)" Source="..\Doc\Legal\OpenSSL.license" />
       </Component>
-      <Component Id="Subversion.license">
-        <File Id="Subversion.license" Name="Subversion.license" Source="..\Doc\Legal\Subversion.license" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="Subversion.license$(sys.BUILDARCH)" Source="..\Doc\Legal\Subversion.license" />
       </Component>
-      <Component Id="Neon.license">
-        <File Id="Neon.license" Name="Neon.license" Source="..\Doc\Legal\Neon.license" />
+      <Component Directory="INSTALLDIR$(sys.BUILDARCH)">
+        <File Id="Neon.license$(sys.BUILDARCH)" Source="..\Doc\Legal\Neon.license" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="Search.ocx">
-        <File Id="Search.ocx" Name="Search.ocx" KeyPath="yes" Source="..\GME\$(var.Release)\Search.ocx">
+      <Component Id='Search.ocx$(sys.BUILDARCH)' Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id='Search.ocx$(sys.BUILDARCH)' KeyPath="yes" Source="..\GME\$(var.Release)\Search.ocx">
           <TypeLib Id="{E65EEDEF-18B7-4F67-BBC7-0E22D0D34C28}" Description="Search ActiveX Control module" Language="0" MajorVersion="1" MinorVersion="0" Control="yes">
             <Class Id="{F299943A-2397-45B1-8C77-A9D29F2FE58E}" Context="InprocServer32" Description="GME Search Property Page" />
             <Class Id="{E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}" Context="InprocServer32" Description="GME Search Control" ThreadingModel="apartment" Version="1.0" Control="yes">
@@ -781,23 +690,17 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="xerces_c_3_1.dll">
-        <File Id="xerces_c_3_1.dll" Name="xerces-c_3_1.dll" KeyPath="yes" Source="..\GME\$(var.lib)\xerces-c_3_1.dll" />
+      <Component Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
+        <File Id="xerces_c_3_1.dll$(sys.BUILDARCH)" KeyPath="yes" Source="..\GME\$(var.lib)\xerces-c_3_1.dll" />
       </Component>
-    </DirectoryRef>
 
-    <?if $(sys.BUILDARCH)=x86 ?>
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="ssleay32.dll">
+      <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Id="ssleay32.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="ssleay32.dll" Name="ssleay32.dll" KeyPath="yes" Source="..\GME\lib\ssleay32.dll" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_TOOLS">
-      <Component Id="TableEditor.dll">
+      <Component Id="TableEditor.dll" Directory="INSTALLDIR_TOOLS$(sys.BUILDARCH)">
         <File Id="TableEditor.dll" Name="TableEditor.dll" KeyPath="yes" Source="..\Tools\TableEditor\$(var.Release)\TableEditor.dll">
           <TypeLib Id="C4970E27-78C0-45E5-93DB-171F34D62C58" Description="MGA Interpreter TypeLibrary (TableEditor)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{E91D51AD-6B6D-44BC-AE35-E7F3CB604B26}" Context="InprocServer32" Description="MGA.Interpreter.TableEditor">
@@ -819,10 +722,8 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="XmlBackEnd.dll">
+      <Component Id="XmlBackEnd.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="XmlBackEnd.dll" Name="XmlBackEnd.dll" KeyPath="yes" Source="..\GME\$(var.Release)\XmlBackEnd.dll">
           <TypeLib Id="{09107441-E750-4516-B6D0-DE6358FDBA9B}" Description="XmlBackEnd 1.0 Type Library" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{F729BE0C-ACE5-470B-8F98-DAE52D6A5949}" Context="InprocServer32" Description="CoreXmlFile Class" ThreadingModel="both" Programmable="yes">
@@ -833,17 +734,13 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="GMEplink.exe">
+      <Component Id="GMEplink.exe" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="GMEplink.exe" Name="GMEplink.exe" KeyPath="yes" Source="..\Tools\GMEplink\Release\GMEplink.exe">
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id='INSTALLDIR_BIN'>
-      <Component Id='Interop_AssemblyFoldersEx'>
+      <Component Id='Interop_AssemblyFoldersEx' Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <RegistryKey Root='HKLM' Key='Software\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx'>
           <RegistryKey Key='GME.MGA.Core' >
             <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.MGA.Core\1.0.1.0__f240a760fe751c2e'/>
@@ -887,60 +784,45 @@
           <RegistryKey Key='ISIS.GME.Common' >
             <RegistryValue Type='string' Value='[WindowsFolder]Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.4.0__1321e6b92842fe54'/>
           </RegistryKey>
-          </RegistryKey>
+        </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="libapr_1.dll">
+      <Component Id="libapr_1.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="libapr_1.dll" Name="libapr-1.dll" KeyPath="yes" Source="..\GME\lib\subv_release\libapr-1.dll" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="libapriconv_1.dll">
+      <Component Id="libapriconv_1.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="libapriconv_1.dll" Name="libapriconv-1.dll" KeyPath="yes" Source="..\GME\lib\subv_release\libapriconv-1.dll" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="libaprutil_1.dll">
+      <Component Id="libaprutil_1.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="libaprutil_1.dll" Name="libaprutil-1.dll" KeyPath="yes" Source="..\GME\lib\subv_release\libaprutil-1.dll" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="libeay32.dll">
+      <Component Id="libeay32.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="libeay32.dll" Name="libeay32.dll" KeyPath="yes" Source="..\GME\lib\libeay32.dll" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_BIN">
-      <Component Id="JAUT.dll">
+      <Component Id="JAUT.dll" Directory='INSTALLDIR_BIN$(sys.BUILDARCH)'>
         <File Id="JAUT.dll" Name="JAUT.dll" KeyPath="yes" Source="..\SDK\java\native\Jaut\$(var.Release)\JAUT.dll">
           <TypeLib Id="{032D8DD2-C470-44C7-972E-4CF5EF9D1362}" Description="JAUT 1.0 Type Library" Language="0" MajorVersion="1" MinorVersion="0" />
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_JAVA">
-      <Component Id="JavaClasses">
+
+      <Component Id="JavaClasses" Directory="INSTALLDIR_SDK_JAVA$(sys.BUILDARCH)">
         <File Id="gme.jar" Name="gme.jar" KeyPath="yes" Source="..\SDK\java\gme.jar" />
         <RegistryKey Root='HKLM' Key='Software\GME'>
           <RegistryValue Name='JavaClassPath' Type='string' Value='[INSTALLDIR_SDK_JAVA]gme.jar'/>
           <RegistryValue Name='JavaMemory' Type='string' Value='64M'/>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_JAVA">
-      <Component Id="JavaCompRegister.exe">
+      <Component Id="JavaCompRegister.exe" Directory="INSTALLDIR_SDK_JAVA$(sys.BUILDARCH)">
         <File Id="JavaCompRegister.exe" Name="JavaCompRegister.exe" KeyPath="yes" Source="..\SDK\java\native\JavaCompRegister\$(var.Release)\JavaCompRegister.exe" />
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_JAVA">
-      <Component Id="JavaCompRunner.dll">
+      <Component Id="JavaCompRunner.dll" Directory="INSTALLDIR_SDK_JAVA$(sys.BUILDARCH)">
         <File Id="JavaCompRunner.dll" Name="JavaCompRunner.dll" KeyPath="yes" Source="..\SDK\java\native\JavaCompRunner\$(var.Release)\JavaCompRunner.dll">
           <TypeLib Id="9E10B423-9625-40E4-8956-FC4FCADFAE40" Description="MGA Interpreter TypeLibrary (JavaCompRunner)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{C97618C3-2574-4257-A6F9-6C3F497DCCED}" Context="InprocServer32" Description="MGA.Interpreter.JavaCompRunner">
@@ -949,10 +831,9 @@
           </TypeLib>
         </File>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_SDK_PATTERNPROCESSOR">
-      <Component Id="PatternProcessor.dll">
+
+      <Component Id="PatternProcessor.dll" Directory="INSTALLDIR_SDK_PATTERNPROCESSOR$(sys.BUILDARCH)">
         <File Id="PatternProcessor.dll" Name="PatternProcessor.dll" KeyPath="yes" Source="..\SDK\PatternProcessor\$(var.Release)\PatternProcessor.dll">
           <TypeLib Id="52B5ADE8-5572-4D32-B389-552CA6A1D367" Description="MGA Interpreter TypeLibrary (PatternProcessor)" Language="0" MajorVersion="1" MinorVersion="0">
             <Class Id="{DF327162-DA68-4CD7-8AEB-BBECA1A65A4E}" Context="InprocServer32" Description="MGA.Interpreter.PatternProcessor">
@@ -967,9 +848,8 @@
           <RegistryValue Name='Type' Type='integer' Value='9'/>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
-
-    <?endif?>
 
-  </Module>
+      <?endif?>
+    </ComponentGroup>
+  </Fragment>
 </Wix>

Modified: trunk/Install/GME_inc.wxi
==============================================================================
--- trunk/Install/GME_inc.wxi	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/GME_inc.wxi	Wed Oct  1 10:04:16 2014	(r2545)
@@ -3,8 +3,6 @@
 <Include>
   <?if $(sys.BUILDARCH)=x64 ?>
   <?define UpgradeCode='D69F58AC-2B74-4B5B-B7E7-EB9AB90A7056'?>
-  <?define GME_bin_Package_Id='58F9967F-6402-4090-A2B6-502D015E9A64'?>
-  <?define GME_bin_Package_Id_Underscores='58F9967F_6402_4090_A2B6_502D015E9A64'?>
   <?define ProgramFilesNativeFolder='ProgramFiles64Folder'?>
   <?define Win64='yes'?>
   <?define ProductName='GME (64 bit)'?>
@@ -13,8 +11,6 @@
   <?define bin='bin\x64'?>
   <?else ?>
   <?define UpgradeCode='dfdd761e-0979-4897-ac89-71f006d92bf8'?>
-  <?define GME_bin_Package_Id='A36F0A48-C4DB-4361-AC95-C9A20F0365F4'?>
-  <?define GME_bin_Package_Id_Underscores='A36F0A48_C4DB_4361_AC95_C9A20F0365F4'?>
   <?define ProgramFilesNativeFolder='ProgramFilesFolder'?>
   <?define Win64='no'?>
   <?define ProductName='GME'?>

Modified: trunk/Install/GME_paradigms.wxs
==============================================================================
--- trunk/Install/GME_paradigms.wxs	Fri Sep 26 09:12:34 2014	(r2544)
+++ trunk/Install/GME_paradigms.wxs	Wed Oct  1 10:04:16 2014	(r2545)
@@ -1,41 +1,23 @@
 <?xml version='1.0' encoding='windows-1252'?>
 
+<!-- this file should not be compiled x64 -->
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
 
   <?include GME_dyn.wxi ?>
   <?include GME_inc.wxi ?>
 
-  <Module Id='GME_paradigms' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+  <Fragment>
 
-    <Package Id='ABD398DE-2F52-4FD6-B372-C323D941EB65' Keywords='GME, MIC, modeling, domain specific languages' Description='Generic Modeling Environment Installer'
-        Manufacturer='Vanderbilt University, ISIS'
-        InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
-        InstallPrivileges='elevated' InstallScope='perMachine'/>
-    
-        <PropertyRef Id="NETFRAMEWORK20"/>
-        <PropertyRef Id="NETFRAMEWORK40FULL"/>
-        <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-        <!-- used by PIAs -->
-    <SetProperty Id="NETFRAMEWORK" Value="#1" After="AppSearch">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
-    <!-- FIXME: doesnt work -->
-    <SetProperty Id="NETFRAMEWORK40" Value="#1" After="AppSearch">NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
-
-    <!-- =========================================================== -->
-    <!-- DIRECTORY STRUCTURE -->
-    <!-- =========================================================== -->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='ProgramFilesFolder'>
-        <Directory Id='installdir32' Name='GME'>
-          <Directory Id='INSTALLDIR_PARADIGMS32' Name='Paradigms'>
-            <Directory Id='INSTALLDIR_PARADIGMS_METAGME_PARADIGM' Name='MetaGME'/>
-            <Directory Id='INSTALLDIR_PARADIGMS_UML_PARADIGM' Name='UML'/>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
+    <PropertyRef Id="NETFRAMEWORK20"/>
+    <PropertyRef Id="NETFRAMEWORK40FULL"/>
+    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME_PARADIGM">
-      <Component Id="MetaGME.mta" Win64="no">
+    <DirectoryRef Id="INSTALLDIR_PARADIGMSx86">
+      <Directory Id="PIApolicy" Name="PIApolicy"/>
+    </DirectoryRef>
+
+    <ComponentGroup Id="GME_paradigms$(sys.BUILDARCH)">
+      <Component Id="MetaGME.mta" Win64="no" Directory="INSTALLDIR_PARADIGMS_METAGME_PARADIGM">
         <File Id="MetaGME.mta" Name="MetaGME.mta" Source="..\Paradigms\MetaGME\MetaGME.mta" />
         <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\MetaGME'>
           <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRMETAGME)'/>
@@ -44,7 +26,7 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-      <Component Id="MetaGME_13.1.24.mta" Win64="no">
+      <Component Id="MetaGME_13.1.24.mta" Win64="no" Directory="INSTALLDIR_PARADIGMS_METAGME_PARADIGM">
         <File Id="MetaGME_13.1.24.mta" Name="MetaGME_13.1.24.mta" Source="..\Paradigms\MetaGME\MetaGME_13.1.24.mta" />
         <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\MetaGME'>
           <RegistryKey Key='{9D3F9884-FE60-409C-8FC1-45789193989B}'>
@@ -52,7 +34,7 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-      <Component Id="MetaGME_13.5.22.mta" Win64="no">
+      <Component Id="MetaGME_13.5.22.mta" Win64="no" Directory="INSTALLDIR_PARADIGMS_METAGME_PARADIGM">
         <File Id="MetaGME_13.5.22.mta" Name="MetaGME_13.5.22.mta" Source="..\Paradigms\MetaGME\MetaGME_13.5.22.mta" />
         <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\MetaGME'>
           <RegistryKey Key='{EA6A1DFA-B2A2-41D7-B08A-6F1203EB6F43}'>
@@ -60,10 +42,9 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML_PARADIGM">
-      <Component Id="UML.mta" Win64="no">
+
+      <Component Id="UML.mta" Win64="no" Directory="INSTALLDIR_PARADIGMS_UML_PARADIGM">
         <File Id="UML.mta" Name="UML.mta"  Source="..\Paradigms\UML\UML.mta" />
         <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\UML'>
           <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRUML)'/>
@@ -72,54 +53,51 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-    </DirectoryRef>
 
-    <ComponentGroupRef Id='GME.1.0.1.0'/>
-    <ComponentGroupRef Id='GME.MGA.1.0.1.0'/>
-    <ComponentGroupRef Id='GME.MGA.Core.1.0.1.0'/>
-    <ComponentGroupRef Id='GME.MGA.Meta.1.0.1.0'/>
-    <ComponentGroupRef Id='GME.MGA.Parser.1.0.1.0'/>
-    <ComponentGroupRef Id='GME.MGA.Parser.1.1.0.0'/>
-    <ComponentGroupRef Id='GME.Util.1.0.1.0'/>
-    <ComponentGroupRef Id='GME'/>
-    <ComponentGroupRef Id='GME.MGA'/>
-    <ComponentGroupRef Id='GME.MGA.Core'/>
-    <ComponentGroupRef Id='GME.MGA.Meta'/>
-    <ComponentGroupRef Id='GME.MGA.Parser'/>
-    <ComponentGroupRef Id='GME.Util'/>
-    
-    <DirectoryRef Id="INSTALLDIR_PARADIGMS32">
-        <Directory Id="PIApolicy" Name="PIApolicy"/>
-    </DirectoryRef>
-        <Component Directory="PIApolicy" Guid="{E9E9C0FB-4B8D-4F27-90A4-7987A822B956}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.config"/>
-        </Component>
-        <Component Directory="PIApolicy" Guid="{877114E5-6F7D-41C7-9985-0E6B01044EF4}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.config"/>
-        </Component>
-        <Component Directory="PIApolicy" Guid="{F3995FC8-B839-4807-9363-079DEE3D9283}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.config"/>
-        </Component>
-        <Component Directory="PIApolicy" Guid="{54513982-DA3B-4165-AD08-A8989007DB88}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.config"/>
-        </Component>
-        <Component Directory="PIApolicy" Guid="{74AED912-FAA1-4604-A638-06CF214731FD}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.config"/>
-        </Component>
-        <Component Directory="PIApolicy" Guid="{CCF7A1A5-60BA-42C0-AB42-1637E11210EB}">
-            <Condition>NETFRAMEWORK</Condition>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.dll" Assembly=".net" KeyPath="yes"/>
-            <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.config"/>
-        </Component>
-  </Module>
+      <ComponentGroupRef Id='GME.1.0.1.0'/>
+      <ComponentGroupRef Id='GME.MGA.1.0.1.0'/>
+      <ComponentGroupRef Id='GME.MGA.Core.1.0.1.0'/>
+      <ComponentGroupRef Id='GME.MGA.Meta.1.0.1.0'/>
+      <ComponentGroupRef Id='GME.MGA.Parser.1.0.1.0'/>
+      <ComponentGroupRef Id='GME.MGA.Parser.1.1.0.0'/>
+      <ComponentGroupRef Id='GME.Util.1.0.1.0'/>
+      <ComponentGroupRef Id='GME'/>
+      <ComponentGroupRef Id='GME.MGA'/>
+      <ComponentGroupRef Id='GME.MGA.Core'/>
+      <ComponentGroupRef Id='GME.MGA.Meta'/>
+      <ComponentGroupRef Id='GME.MGA.Parser'/>
+      <ComponentGroupRef Id='GME.Util'/>
+
+      <Component Directory="PIApolicy" Guid="{E9E9C0FB-4B8D-4F27-90A4-7987A822B956}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.config"/>
+      </Component>
+      <Component Directory="PIApolicy" Guid="{877114E5-6F7D-41C7-9985-0E6B01044EF4}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.config"/>
+      </Component>
+      <Component Directory="PIApolicy" Guid="{F3995FC8-B839-4807-9363-079DEE3D9283}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.config"/>
+      </Component>
+      <Component Directory="PIApolicy" Guid="{54513982-DA3B-4165-AD08-A8989007DB88}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.config"/>
+      </Component>
+      <Component Directory="PIApolicy" Guid="{74AED912-FAA1-4604-A638-06CF214731FD}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.config"/>
+      </Component>
+      <Component Directory="PIApolicy" Guid="{CCF7A1A5-60BA-42C0-AB42-1637E11210EB}">
+        <Condition>NETFRAMEWORK</Condition>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.dll" Assembly=".net" KeyPath="yes"/>
+        <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.config"/>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
 </Wix>


More information about the gme-commit mailing list