diff --git a/installer_autopsy/installer_autopsy.aip b/installer_autopsy/installer_autopsy.aip
index 4c289476e5..52feac8f8d 100644
--- a/installer_autopsy/installer_autopsy.aip
+++ b/installer_autopsy/installer_autopsy.aip
@@ -1158,9 +1158,9 @@
     <ROW Component="opcodes.h" ComponentId="{BA45386B-999D-4F55-B7D3-D693EF1E7680}" Directory_="orc_Dir" Attributes="0" KeyPath="opcodes.h" Type="0"/>
     <ROW Component="orbd.exe" ComponentId="{A3444AC0-F9DB-4634-A31D-C777AEA82E77}" Directory_="bin_3_Dir" Attributes="0" KeyPath="orbd.exe"/>
     <ROW Component="orcarray.h" ComponentId="{0358F3E9-95F9-4A00-9DC0-4F914F6B4B3A}" Directory_="orctest_Dir" Attributes="0" KeyPath="orcarray.h" Type="0"/>
-    <ROW Component="orggnutrove.jar" ComponentId="{199AC2E7-B9F0-4EC2-AE91-DD64749AC302}" Directory_="modules_Dir" Attributes="0" KeyPath="orggnutrove.jar" Type="0"/>
-    <ROW Component="orggnutrove.xml" ComponentId="{61373C2F-23DD-48D7-A323-CB05AB4E89C8}" Directory_="Modules_Dir" Attributes="0" KeyPath="orggnutrove.xml" Type="0"/>
-    <ROW Component="orggnutrove.xml_1" ComponentId="{2F8EF679-4D2E-41A7-8321-64A3C20EF5BB}" Directory_="update_tracking_Dir" Attributes="0" KeyPath="orggnutrove.xml_1" Type="0"/>
+    <ROW Component="orggnutrove.jar" ComponentId="{199AC2E7-B9F0-4EC2-AE91-DD64749AC302}" Directory_="modules_Dir" Attributes="0" KeyPath="orgsleuthkitautopsycasemodule.jar_1" Type="0"/>
+    <ROW Component="orggnutrove.xml" ComponentId="{61373C2F-23DD-48D7-A323-CB05AB4E89C8}" Directory_="Modules_Dir" Attributes="0" KeyPath="orgsleuthkitautopsycasemodule.xml" Type="0"/>
+    <ROW Component="orggnutrove.xml_1" ComponentId="{2F8EF679-4D2E-41A7-8321-64A3C20EF5BB}" Directory_="update_tracking_Dir" Attributes="0" KeyPath="orgsleuthkitautopsycasemodule.xml_1" Type="0"/>
     <ROW Component="orgjdesktopbeansbinding.jar" ComponentId="{F2E2CD4D-DED0-4523-AEA1-D3B5DC9F130F}" Directory_="modules_3_Dir" Attributes="0" KeyPath="orgjdesktopbeansbinding.jar" Type="0"/>
     <ROW Component="orgjdesktopbeansbinding.xml" ComponentId="{B49737E9-6752-4417-884B-42C9D39BC198}" Directory_="Modules_2_Dir" Attributes="0" KeyPath="orgjdesktopbeansbinding.xml" Type="0"/>
     <ROW Component="orgjdesktopbeansbinding.xml_1" ComponentId="{4CF118EB-C346-4738-9015-239F5940E200}" Directory_="update_tracking_2_Dir" Attributes="0" KeyPath="orgjdesktopbeansbinding.xml_1" Type="0"/>
@@ -3429,7 +3429,7 @@
     <ROW File="knuthlfib.h" Component_="aes.h" FileName="knuth-~1.h|knuth-lfib.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\nettle\knuth-lfib.h" SelfReg="false" NextFile="macros.h"/>
     <ROW File="ktab.exe" Component_="ktab.exe" FileName="ktab.exe" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\ktab.exe" SelfReg="false" NextFile="management.dll"/>
     <ROW File="lame.h" Component_="lame.h" FileName="lame.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\lame\lame.h" SelfReg="false" NextFile="avcodec.h"/>
-    <ROW File="lastModified" Component_="lastModified" FileName="lastMo~1|.lastModified" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\.lastModified" SelfReg="false" NextFile="orggnutrove.xml"/>
+    <ROW File="lastModified" Component_="lastModified" FileName="lastMo~1|.lastModified" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\.lastModified" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.xml"/>
     <ROW File="lastModified_2" Component_="lastModified_2" FileName="lastMo~1|.lastModified" Attributes="0" SourcePath="..\dist\autopsy-installer\java\.lastModified" SelfReg="false" NextFile="orgjdesktopbeansbinding.xml"/>
     <ROW File="lastModified_3" Component_="lastModified_3" FileName="lastMo~1|.lastModified" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\.lastModified" SelfReg="false" NextFile="orgnetbeanscore.xml"/>
     <ROW File="latin.conf" Component_="autohint.conf" FileName="45-lat~1.con|45-latin.conf" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\etc\fonts\conf.avail\45-latin.conf" SelfReg="false" NextFile="sansserif.conf"/>
@@ -3978,9 +3978,6 @@
     <ROW File="orcutils.h" Component_="opcodes.h" FileName="orcutils.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\orc-0.4\orc\orcutils.h" SelfReg="false" NextFile="orcx86.h"/>
     <ROW File="orcx86.h" Component_="opcodes.h" FileName="orcx86.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\orc-0.4\orc\orcx86.h" SelfReg="false" NextFile="orcarray.h"/>
     <ROW File="ordinals.h" Component_="all.h" FileName="ordinals.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\FLAC\ordinals.h" SelfReg="false" NextFile="stream_decoder.h"/>
-    <ROW File="orggnutrove.jar" Component_="orggnutrove.jar" FileName="org-gn~1.jar|org-gnu-trove.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\org-gnu-trove.jar" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.jar_1"/>
-    <ROW File="orggnutrove.xml" Component_="orggnutrove.xml" FileName="org-gn~1.xml|org-gnu-trove.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\config\Modules\org-gnu-trove.xml" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.xml"/>
-    <ROW File="orggnutrove.xml_1" Component_="orggnutrove.xml_1" FileName="org-gn~1.xml|org-gnu-trove.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\update_tracking\org-gnu-trove.xml" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.xml_1"/>
     <ROW File="orgjdesktopbeansbinding.jar" Component_="orgjdesktopbeansbinding.jar" FileName="org-jd~1.jar|org-jdesktop-beansbinding.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\java\modules\org-jdesktop-beansbinding.jar" SelfReg="false" NextFile="orgnetbeansmodulesjunitlib.jar"/>
     <ROW File="orgjdesktopbeansbinding.xml" Component_="orgjdesktopbeansbinding.xml" FileName="org-jd~1.xml|org-jdesktop-beansbinding.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\java\config\Modules\org-jdesktop-beansbinding.xml" SelfReg="false" NextFile="orgnetbeansmodulesjunitlib.xml"/>
     <ROW File="orgjdesktopbeansbinding.xml_1" Component_="orgjdesktopbeansbinding.xml_1" FileName="org-jd~1.xml|org-jdesktop-beansbinding.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\java\update_tracking\org-jdesktop-beansbinding.xml" SelfReg="false" NextFile="orgnetbeansmodulesjunitlib.xml_1"/>
@@ -4039,7 +4036,7 @@
     <ROW File="orgnetbeanscorewindows.jar" Component_="orgjdesktoplayout.jar" FileName="org-n~12.jar|org-netbeans-core-windows.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\modules\org-netbeans-core-windows.jar" SelfReg="false" NextFile="orgnetbeanscore.jar"/>
     <ROW File="orgnetbeanscorewindows.xml" Component_="orgjdesktoplayout.xml" FileName="org-n~12.xml|org-netbeans-core-windows.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\config\Modules\org-netbeans-core-windows.xml" SelfReg="false" NextFile="orgnetbeanscore.xml_1"/>
     <ROW File="orgnetbeanscorewindows.xml_1" Component_="orgjdesktoplayout.xml_1" FileName="org-n~14.xml|org-netbeans-core-windows.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\update_tracking\org-netbeans-core-windows.xml" SelfReg="false" NextFile="orgnetbeanscore.xml_4"/>
-    <ROW File="orgnetbeanscorewindows_autopsy.jar" Component_="orgnetbeanscorewindows_autopsy.jar" FileName="org-ne~1.jar|org-netbeans-core-windows_autopsy.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\locale\org-netbeans-core-windows_autopsy.jar" SelfReg="false" NextFile="orggnutrove.jar"/>
+    <ROW File="orgnetbeanscorewindows_autopsy.jar" Component_="orgnetbeanscorewindows_autopsy.jar" FileName="org-ne~1.jar|org-netbeans-core-windows_autopsy.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\locale\org-netbeans-core-windows_autopsy.jar" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.jar_1"/>
     <ROW File="orgnetbeanslibsfelix.jar" Component_="orgjdesktoplayout.jar" FileName="org-n~14.jar|org-netbeans-libs-felix.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\modules\org-netbeans-libs-felix.jar" SelfReg="false" NextFile="orgnetbeanslibsjna.jar"/>
     <ROW File="orgnetbeanslibsfelix.xml" Component_="orgjdesktoplayout.xml" FileName="org-n~14.xml|org-netbeans-libs-felix.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\config\Modules\org-netbeans-libs-felix.xml" SelfReg="false" NextFile="orgnetbeanslibsjna.xml"/>
     <ROW File="orgnetbeanslibsfelix.xml_1" Component_="orgjdesktoplayout.xml_1" FileName="org-n~16.xml|org-netbeans-libs-felix.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\update_tracking\org-netbeans-libs-felix.xml" SelfReg="false" NextFile="orgnetbeanslibsjna.xml_1"/>
@@ -4450,7 +4447,7 @@
     <ROW File="sndfile.hh" Component_="bzlib.h" FileName="sndfile.hh" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\sndfile.hh" SelfReg="false" NextFile="speex.h"/>
     <ROW File="sndfile.lib" Component_="atk1.0.lib" FileName="sndfile.lib" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\lib\sndfile.lib" SelfReg="false" NextFile="soup2.4.lib"/>
     <ROW File="snmp.acl.template" Component_="jmxremote.access" FileName="snmpac~1.tem|snmp.acl.template" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\management\snmp.acl.template" SelfReg="false" NextFile="managementagent.jar"/>
-    <ROW File="solr.war" Component_="solr.war" FileName="solr.war" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\webapps\solr.war" SelfReg="false" NextFile="orggnutrove.xml_1"/>
+    <ROW File="solr.war" Component_="solr.war" FileName="solr.war" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\webapps\solr.war" SelfReg="false" NextFile="orgsleuthkitautopsycasemodule.xml_1"/>
     <ROW File="solr.xml" Component_="solr.xml" FileName="solr.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\solr.xml" SelfReg="false" NextFile="start.jar"/>
     <ROW File="solrcell3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="solr-c~1.jar|solr-cell-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\solr-cell-3.5.0.jar" SelfReg="false" NextFile="solrcommonscsv3.5.0.jar"/>
     <ROW File="solrcommonscsv3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="solr-c~2.jar|solr-commons-csv-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\solr-commons-csv-3.5.0.jar" SelfReg="false" NextFile="solrcore3.5.0.jar"/>
@@ -4557,7 +4554,7 @@
     <ROW File="swscale.h" Component_="swscale.h" FileName="swscale.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libswscale\swscale.h" SelfReg="false" NextFile="libtasn1.h"/>
     <ROW File="swscalegpl0.dll" Component_="swscalegpl0.dll" FileName="swscal~1.dll|swscale-gpl-0.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\bin\swscale-gpl-0.dll" SelfReg="false" NextFile="xvidcore.dll"/>
     <ROW File="swscalelgpl.lib" Component_="atk1.0.lib" FileName="swscal~1.lib|swscale-lgpl.lib" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\lib\swscale-lgpl.lib" SelfReg="false" NextFile="tasn1.lib"/>
-    <ROW File="swt.jar" Component_="applejavaextensions.jar" FileName="swt.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\swt.jar" SelfReg="false" NextFile="trove3.0.2.jar"/>
+    <ROW File="swt.jar" Component_="applejavaextensions.jar" FileName="swt.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\swt.jar" SelfReg="false" NextFile="Tsk_DataModel.jar"/>
     <ROW File="synonyms.txt" Component_="adminextra.html" FileName="synonyms.txt" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\conf\synonyms.txt" SelfReg="false" NextFile="apachemime4jcore0.7.jar"/>
     <ROW File="synthetic.conf" Component_="autohint.conf" FileName="90-syn~1.con|90-synthetic.conf" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\etc\fonts\conf.avail\90-synthetic.conf" SelfReg="false" NextFile="fixglobaladvance.conf_1"/>
     <ROW File="synthetic.conf_1" Component_="fixglobaladvance.conf" FileName="90-syn~1.con|90-synthetic.conf" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\etc\fonts\conf.d\90-synthetic.conf" SelfReg="false" NextFile="README"/>
@@ -4593,7 +4590,6 @@
     <ROW File="tnameserv.exe" Component_="tnameserv.exe" FileName="tnames~1.exe|tnameserv.exe" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\tnameserv.exe" SelfReg="false" NextFile="unicows.dll"/>
     <ROW File="tree.h" Component_="c14n.h" FileName="tree.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libxml2\libxml\tree.h" SelfReg="false" NextFile="uri.h"/>
     <ROW File="trove1.0.2.jar" Component_="commonscli1.0.jar" FileName="trove-~1.jar|trove-1.0.2.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\pasco2\trove-1.0.2.jar" SelfReg="false" NextFile="trove3.0.2.jar_1"/>
-    <ROW File="trove3.0.2.jar" Component_="applejavaextensions.jar" FileName="trove-~1.jar|trove-3.0.2.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\trove-3.0.2.jar" SelfReg="false" NextFile="Tsk_DataModel.jar"/>
     <ROW File="trove3.0.2.jar_1" Component_="commonscli1.0.jar" FileName="trove-~2.jar|trove-3.0.2.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\pasco2\trove-3.0.2.jar" SelfReg="false" NextFile="p2x588.dll"/>
     <ROW File="trusted.libraries" Component_="blacklist" FileName="truste~1.lib|trusted.libraries" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\security\trusted.libraries" SelfReg="false" NextFile="US_export_policy.jar"/>
     <ROW File="ttnameid.h" Component_="freetype.h" FileName="ttnameid.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\freetype2\freetype\ttnameid.h" SelfReg="false" NextFile="tttables.h"/>