diff --git a/.gitignore b/.gitignore
index 85b9d2336b693ff45611f60f5e7cf407d27211f9..67936787d5feee9c94c6d80b2cc80972ff47ef2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,27 +3,21 @@
 /*/build/
 */nbproject/private/*
 /nbproject/private/*
-/DataModel/release/modules/lib/libewf.dll
-/DataModel/release/modules/ext/Tsk_DataModel.jar
-/DataModel/release/modules/ext/sqlite-jdbc-3.6.20.jar
-/DataModel/release/modules/lib/libewf.dll
-/DataModel/release/modules/lib/libtsk_jni.dll
-/DataModel/release/modules/lib/zlib1.dll
+/Core/release/modules/lib/
+/Core/release/modules/ext/
+/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties
 /KeywordSearch/release/modules/ext/
 /KeywordSearch/release/solr/lib/
 /KeywordSearch/release/solr/solr/lib/
 /KeywordSearch/release/solr/start.jar
 /KeywordSearch/release/solr/webapps/solr.war
 /Ingest/release/modules/ext/
-/DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar
-/DataModel/release/modules/lib/zlib.dll
 /branding_spear
 /installer_spear
 Bundle_*.properties
 genfiles.properties
 /branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
 /branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
-/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.properties
 /Testing/script/input/
 /Testing/script/output/
 /Testing/script/gold/
diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png b/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png
deleted file mode 100644
index e7a17e0815b6152db33f06a22ad3b03b374c264d..0000000000000000000000000000000000000000
Binary files a/Case/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png and /dev/null differ
diff --git a/Core/build.xml b/Core/build.xml
index 155dc323fc54daae2f5b8b1742dd9a35215335bb..94e49decb0bad23255842dc7727cae92fce4de81 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -2,7 +2,61 @@
 <!-- You may freely edit this file. See harness/README in the NetBeans platform -->
 <!-- for some information on what you could do (e.g. targets to override). -->
 <!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.core" default="netbeans" basedir=".">
+<project name="org.sleuthkit.autopsy.core" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.core.</description>
     <import file="nbproject/build-impl.xml"/>
+    
+    <!-- TODO move iby setup to global project build.xml and reuse the target in modules -->
+     
+    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+        <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ant" />
+    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+    <target name="download-ivy" unless="offline">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
+         dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
+    <target name="init-ivy" depends="download-ivy">
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+    <!-- Verify that the TSK_HOME env variable is set -->
+    <target name="findTSK">
+        <property environment="env"/>
+        <condition property="tskFound">
+            <isset property="env.TSK_HOME"/>
+        </condition>
+        <fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/>
+        <echo> TSK_HOME: ${env.TSK_HOME}</echo>
+    </target>  
+    
+    <target name="getTSKJars" depends="findTSK">
+        <property environment="env"/>
+        <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/release/modules/ext/Tsk_DataModel.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
+    </target>
+
+    <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
+        
+        <!-- clear & fetch all the dependencies from Ivy and stick them in the right places -->
+        <ivy:resolve/>
+        <ivy:retrieve conf="autopsy_core" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+        
+        <!-- get additional deps -->
+        <antcall target="getTSKJars" />
+        
+    </target>
+    
+ 
 </project>
diff --git a/Core/ivy.xml b/Core/ivy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cd3e27991b1d80cea16167ef7e6cda6e4476e14
--- /dev/null
+++ b/Core/ivy.xml
@@ -0,0 +1,30 @@
+
+<ivy-module version="2.0">
+    <info organisation="org.sleuthkit.autopsy" module="core"/>
+    <configurations >
+        <!-- module dependencies -->
+        <conf name="autopsy_core"/>
+        
+    </configurations>
+    <dependencies>
+        <!-- for ingest -->
+        <dependency conf="autopsy_core->*" org="org.reflections" name="reflections" rev="0.9.8"/>
+        
+        <!-- for viewers -->
+        <dependency conf="autopsy_core->*" org="com.googlecode.gstreamer-java" name="gstreamer-java" rev="1.5"/>
+        
+         <!-- for file search -->
+        <dependency conf="autopsy_core->*" org="org.jbundle.thin.base.screen" name="jcalendarbutton" rev="1.4.6"/>
+        
+        <!-- commmon -->
+        <dependency conf="autopsy_core->*" org="commons-lang" name="commons-lang" rev="2.4"/>
+        <dependency conf="autopsy_core->*" org="commons-logging" name="commons-logging" rev="1.1.1"/>
+        <dependency conf="autopsy_core->*" org="log4j" name="log4j" rev="1.2.17"/>
+        
+        <!-- reporting -->
+      <dependency conf="autopsy_core->*" org="dom4j" name="dom4j" rev="1.6.1"/>
+       <!-- <dependency conf="autopsy_core->*" org="org.jdom" name="jdom" rev="1.1.3"/> -->
+        <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-excelant" rev="3.8"/>
+        <dependency conf="autopsy_core->*" org="org.apache.poi" name="poi-scratchpad" rev="3.8"/>
+    </dependencies>
+</ivy-module>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ContentViewer_example.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ContentViewer_example.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ContentViewer_example.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ContentViewer_example.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Hex_Content_Viewer.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Hex_Content_Viewer.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Hex_Content_Viewer.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Hex_Content_Viewer.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Picture_Content_Viewer.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Picture_Content_Viewer.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Picture_Content_Viewer.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Picture_Content_Viewer.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ResultViewer_example.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ResultViewer_example.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ResultViewer_example.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/ResultViewer_example.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Result_Viewer.PNG b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Result_Viewer.PNG
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Result_Viewer.PNG
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Result_Viewer.PNG
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/String_Content_Viewer.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/String_Content_Viewer.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/String_Content_Viewer.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/String_Content_Viewer.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Table_Results_Viewer.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Table_Results_Viewer.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Table_Results_Viewer.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Table_Results_Viewer.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Thumbnail_Results_Viewer.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Thumbnail_Results_Viewer.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Thumbnail_Results_Viewer.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/Thumbnail_Results_Viewer.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html
similarity index 97%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html
index a6231ca999f7fc893e6d1bd18debc877f7ce8f0f..15461d42bdada1e48065ff2752c348389bead486 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-about.html
@@ -1,26 +1,26 @@
-<html>
-    <head>
-        <title>About CoreComponents</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>About CoreComponents</h2>
-        <p>
-            <!-- TODO describe your module, add more pages... -->
-            Contains data result and data content.
-        </p>
-    </body>
-</html>
-<!--
-Tip: to create a link which will open in an external web browser, try:
-<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
-    <param name="content" value="http://www.netbeans.org/">
-    <param name="text" value="<html><u>http://www.netbeans.org/</u></html>">
-    <param name="textFontSize" value="medium">
-    <param name="textColor" value="blue">
-</object>
-To create a link to a help set from another module, you need to know the code name base and path, e.g.:
-<a href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/configure/configure_options.html">Using the Options Window</a>
-(This link will behave sanely if that module is disabled or missing.)
--->
+<html>
+    <head>
+        <title>About CoreComponents</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>About CoreComponents</h2>
+        <p>
+            <!-- TODO describe your module, add more pages... -->
+            Contains data result and data content.
+        </p>
+    </body>
+</html>
+<!--
+Tip: to create a link which will open in an external web browser, try:
+<object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
+    <param name="content" value="http://www.netbeans.org/">
+    <param name="text" value="<html><u>http://www.netbeans.org/</u></html>">
+    <param name="textFontSize" value="medium">
+    <param name="textColor" value="blue">
+</object>
+To create a link to a help set from another module, you need to know the code name base and path, e.g.:
+<a href="nbdocs://org.netbeans.modules.usersguide/org/netbeans/modules/usersguide/configure/configure_options.html">Using the Options Window</a>
+(This link will behave sanely if that module is disabled or missing.)
+-->
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-hs.xml b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-hs.xml
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-hs.xml
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-hs.xml
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml
index c34284c398c84c75a4bbd8e297804f9ceebc3dd8..e428c40e7057c945df053d2717495985400e1e0a 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-idx.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 2.0//EN" "http://java.sun.com/products/javahelp/index_2_0.dtd">
-<index version="2.0">
-    <indexitem text="About CoreComponents" target="org.sleuthkit.autopsy.corecomponents.about"/>
-    <indexitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
-    <indexitem text="About Content Viewers" target="org.sleuthkit.autopsy.corecomponents.datacontent-about"/>
-    <indexitem text="About Data Explorers" target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about"/>
-
-    <indexitem text="About Directory Tree" target="org.sleuthkit.autopsy.directorytree.about"/>
-    <indexitem text="Image Details Window" target="org.sleuthkit.autopsy.directorytree.image-details"/>
-    <indexitem text="Volume Details Window" target="org.sleuthkit.autopsy.directorytree.volume-details"/>
-    <indexitem text="File System Details Window" target="org.sleuthkit.autopsy.directorytree.filesystem-details"/>
-
-    <indexitem text="About File Search" target="org.sleuthkit.autopsy.filesearch.about"/>
-    <indexitem text="How to Open File Search" target="org.sleuthkit.autopsy.filesearch.open-filesearch"/>
-    <indexitem text="How to Use File Search" target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch"/>
-
-    <indexitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
-    <indexitem text="Table Results Viewer" target="org.sleuthkit.autopsy.corecomponents.table-results-viewer"/>
-    <indexitem text="Thumbnail Result Viewer" target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer"/>
-
-    <indexitem text="Hex Content Viewer" target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer"/>
-    <indexitem text="String Content Viewer" target="org.sleuthkit.autopsy.corecomponents.string-content-viewer"/>
-	<indexitem text="Text Content Viewer" target="org.sleuthkit.autopsy.corecomponents.text-content-viewer"/>
-    <indexitem text="Media Content Viewer" target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer"/>
-</index>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 2.0//EN" "http://java.sun.com/products/javahelp/index_2_0.dtd">
+<index version="2.0">
+    <indexitem text="About CoreComponents" target="org.sleuthkit.autopsy.corecomponents.about"/>
+    <indexitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
+    <indexitem text="About Content Viewers" target="org.sleuthkit.autopsy.corecomponents.datacontent-about"/>
+    <indexitem text="About Data Explorers" target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about"/>
+
+    <indexitem text="About Directory Tree" target="org.sleuthkit.autopsy.directorytree.about"/>
+    <indexitem text="Image Details Window" target="org.sleuthkit.autopsy.directorytree.image-details"/>
+    <indexitem text="Volume Details Window" target="org.sleuthkit.autopsy.directorytree.volume-details"/>
+    <indexitem text="File System Details Window" target="org.sleuthkit.autopsy.directorytree.filesystem-details"/>
+
+    <indexitem text="About File Search" target="org.sleuthkit.autopsy.filesearch.about"/>
+    <indexitem text="How to Open File Search" target="org.sleuthkit.autopsy.filesearch.open-filesearch"/>
+    <indexitem text="How to Use File Search" target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch"/>
+
+    <indexitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
+    <indexitem text="Table Results Viewer" target="org.sleuthkit.autopsy.corecomponents.table-results-viewer"/>
+    <indexitem text="Thumbnail Result Viewer" target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer"/>
+
+    <indexitem text="Hex Content Viewer" target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer"/>
+    <indexitem text="String Content Viewer" target="org.sleuthkit.autopsy.corecomponents.string-content-viewer"/>
+	<indexitem text="Text Content Viewer" target="org.sleuthkit.autopsy.corecomponents.text-content-viewer"/>
+    <indexitem text="Media Content Viewer" target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer"/>
+</index>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml
index 1ac9eb1ae3b646be8b72525239feef8a0c2f34c9..deb30aa9e67339bdf2263bf75204466679545a85 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-map.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-To change this template, choose Tools | Templates
-and open the template in the editor.
--->
-<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 2.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd">
-<map version="2.0">
-    <mapID target="org.sleuthkit.autopsy.directorytree.about" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.directorytree.image-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/image-details.html"/>
-    <mapID target="org.sleuthkit.autopsy.directorytree.volume-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/volume-details.html"/>
-    <mapID target="org.sleuthkit.autopsy.directorytree.filesystem-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/filesystem-details.html"/>
-
-    <mapID target="org.sleuthkit.autopsy.filesearch.about" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.filesearch.open-filesearch" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html"/>
-    <mapID target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html"/>
-
-    <mapID target="org.sleuthkit.autopsy.corecomponents.about" url="corecomponents-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about" url="dataexplorer-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.dataresult-about" url="dataresult-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.datacontent-about" url="datacontent-about.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.table-results-viewer" url="table-results-viewer.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer" url="thumbnail-results-viewer.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer" url="hex-content-viewer.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.string-content-viewer" url="string-content-viewer.html"/>
-	<mapID target="org.sleuthkit.autopsy.corecomponents.text-content-viewer" url="text-content-viewer.html"/>
-    <mapID target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer" url="picture-content-viewer.html"/>
-</map>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 2.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd">
+<map version="2.0">
+    <mapID target="org.sleuthkit.autopsy.directorytree.about" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.directorytree.image-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/image-details.html"/>
+    <mapID target="org.sleuthkit.autopsy.directorytree.volume-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/volume-details.html"/>
+    <mapID target="org.sleuthkit.autopsy.directorytree.filesystem-details" url="nbdocs:/org/sleuthkit/autopsy/directorytree/docs/filesystem-details.html"/>
+
+    <mapID target="org.sleuthkit.autopsy.filesearch.about" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.filesearch.open-filesearch" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html"/>
+    <mapID target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch" url="nbdocs:/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html"/>
+
+    <mapID target="org.sleuthkit.autopsy.corecomponents.about" url="corecomponents-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about" url="dataexplorer-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.dataresult-about" url="dataresult-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.datacontent-about" url="datacontent-about.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.table-results-viewer" url="table-results-viewer.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer" url="thumbnail-results-viewer.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer" url="hex-content-viewer.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.string-content-viewer" url="string-content-viewer.html"/>
+	<mapID target="org.sleuthkit.autopsy.corecomponents.text-content-viewer" url="text-content-viewer.html"/>
+    <mapID target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer" url="picture-content-viewer.html"/>
+</map>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml
index 92f6485548ffa1aea925777317294535fe1cd3d5..6a9617473d3d9d42c5cf77b78d390497726eb0d1 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/corecomponents-toc.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd">
-<toc version="2.0">
-    <tocitem text="Data Explorers">
-        <tocitem text="About Data Explorers" target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about"/>
-        <tocitem text="Directory Tree">
-            <tocitem text="About Directory Tree" target="org.sleuthkit.autopsy.directorytree.about"/>
-            <tocitem text="Image Details Window" target="org.sleuthkit.autopsy.directorytree.image-details"/>
-            <tocitem text="Volume Details Window" target="org.sleuthkit.autopsy.directorytree.volume-details"/>
-            <tocitem text="File System Details Window" target="org.sleuthkit.autopsy.directorytree.filesystem-details"/>
-        </tocitem>
-        <tocitem text="File Search">
-            <tocitem text="About File Search" target="org.sleuthkit.autopsy.filesearch.about"/>
-            <tocitem text="How to Open File Search" target="org.sleuthkit.autopsy.filesearch.open-filesearch"/>
-            <tocitem text="How to Use File Search" target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch"/>
-        </tocitem>
-    </tocitem>
-    <tocitem text="Result Viewers">
-        <tocitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
-        <tocitem text="Table Results Viewer" target="org.sleuthkit.autopsy.corecomponents.table-results-viewer"/>
-        <tocitem text="Thumbnail Result Viewer" target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer"/>
-    </tocitem>
-    <tocitem text="Content Viewers">
-        <tocitem text="About Content Viewers" target="org.sleuthkit.autopsy.corecomponents.datacontent-about"/>
-        <tocitem text="Hex Content Viewer" target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer"/>
-        <tocitem text="String Content Viewer" target="org.sleuthkit.autopsy.corecomponents.string-content-viewer"/>
-	  <tocitem text="Text Content Viewer" target="org.sleuthkit.autopsy.corecomponents.text-content-viewer"/>
-        <tocitem text="Media Content Viewer" target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer"/>
-    </tocitem>
-</toc>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd">
+<toc version="2.0">
+    <tocitem text="Data Explorers">
+        <tocitem text="About Data Explorers" target="org.sleuthkit.autopsy.corecomponents.dataexplorer-about"/>
+        <tocitem text="Directory Tree">
+            <tocitem text="About Directory Tree" target="org.sleuthkit.autopsy.directorytree.about"/>
+            <tocitem text="Image Details Window" target="org.sleuthkit.autopsy.directorytree.image-details"/>
+            <tocitem text="Volume Details Window" target="org.sleuthkit.autopsy.directorytree.volume-details"/>
+            <tocitem text="File System Details Window" target="org.sleuthkit.autopsy.directorytree.filesystem-details"/>
+        </tocitem>
+        <tocitem text="File Search">
+            <tocitem text="About File Search" target="org.sleuthkit.autopsy.filesearch.about"/>
+            <tocitem text="How to Open File Search" target="org.sleuthkit.autopsy.filesearch.open-filesearch"/>
+            <tocitem text="How to Use File Search" target="org.sleuthkit.autopsy.filesearch.how-to-use-filesearch"/>
+        </tocitem>
+    </tocitem>
+    <tocitem text="Result Viewers">
+        <tocitem text="About Result Viewers" target="org.sleuthkit.autopsy.corecomponents.dataresult-about"/>
+        <tocitem text="Table Results Viewer" target="org.sleuthkit.autopsy.corecomponents.table-results-viewer"/>
+        <tocitem text="Thumbnail Result Viewer" target="org.sleuthkit.autopsy.corecomponents.thumbnail-results-viewer"/>
+    </tocitem>
+    <tocitem text="Content Viewers">
+        <tocitem text="About Content Viewers" target="org.sleuthkit.autopsy.corecomponents.datacontent-about"/>
+        <tocitem text="Hex Content Viewer" target="org.sleuthkit.autopsy.corecomponents.hex-content-viewer"/>
+        <tocitem text="String Content Viewer" target="org.sleuthkit.autopsy.corecomponents.string-content-viewer"/>
+	  <tocitem text="Text Content Viewer" target="org.sleuthkit.autopsy.corecomponents.text-content-viewer"/>
+        <tocitem text="Media Content Viewer" target="org.sleuthkit.autopsy.corecomponents.picture-content-viewer"/>
+    </tocitem>
+</toc>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html
index a48d3afec7cc8e8e7e203cc40d8a2f4a345a7062..60fe2225a4a904d57bbf3b96acddf793eb27abaf 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/datacontent-about.html
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>About Content Viewers</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Content Viewers</h2>
-        <p>
-            The Content Viewer area is in the lower right area of the interface.  This area is used to view a specific file in a variety of formats. There are different tabs for different viewers. Not all tabs support all file types, so only some of them will be enabled.  To display data in this area, a file must be selected from the <a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html">Result Viewer</a> window.
-        </p>
-	
-	<p>The Content Viewer area is part of a plug-in framework.  You can install modules that will add more viewer types.  This section describes the viewers that come by default with Autopsy.</p>
-
-	<p>Here's an example of a "Content Viewer" window:</p>
-            <br>
-            &nbsp;&nbsp;&nbsp;&nbsp; <img src="ContentViewer_example.png" alt="Example of Content Viewer Window" />
-	
-	<h2>Default Viewers</h2>
-        <p>
-            Currently, there are 5 main tabs on "Content Viewer" window:
-        <ul>
-			<li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html">Result Viewer</a></li>
-            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html">Hex Content Viewer</a></li>
-            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html">String Content Viewer</a></li>
-            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html">Media Viewer</a></li>
-		<li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html">Text Viewer</a></li>
-            </ul>
-        </p>
-    </body>
-</html>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>About Content Viewers</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Content Viewers</h2>
+        <p>
+            The Content Viewer area is in the lower right area of the interface.  This area is used to view a specific file in a variety of formats. There are different tabs for different viewers. Not all tabs support all file types, so only some of them will be enabled.  To display data in this area, a file must be selected from the <a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html">Result Viewer</a> window.
+        </p>
+	
+	<p>The Content Viewer area is part of a plug-in framework.  You can install modules that will add more viewer types.  This section describes the viewers that come by default with Autopsy.</p>
+
+	<p>Here's an example of a "Content Viewer" window:</p>
+            <br>
+            &nbsp;&nbsp;&nbsp;&nbsp; <img src="ContentViewer_example.png" alt="Example of Content Viewer Window" />
+	
+	<h2>Default Viewers</h2>
+        <p>
+            Currently, there are 5 main tabs on "Content Viewer" window:
+        <ul>
+			<li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html">Result Viewer</a></li>
+            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html">Hex Content Viewer</a></li>
+            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html">String Content Viewer</a></li>
+            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html">Media Viewer</a></li>
+		<li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html">Text Viewer</a></li>
+            </ul>
+        </p>
+    </body>
+</html>
+
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html
index f936783429f919f906fb9b0032785da216679e90..905c402d71f30646cb5a2cc61dc533c4cec70683 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/dataresult-about.html
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Result Viewers</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Result Viewers</h2>
-        <p>
-            The Result Viewer windows are in the upper right area of the interface and display the results from selecting something in the  <a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html">Explorer Tree</a> area.
-            You will have the option in this are to display the results in a variety of formats.
-            Currently, there are 2 main tabs on "Result Viewer" window:
-        <ul>
-            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html">Table Results Viewer</a></li>
-            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html">Thumbnail Results Viewer</a></li>
-        </ul>
-        </p>
-
-        <h2>Right Click Functions</h2>
-        <p>
-            Viewers in Result Viewers have some right click function that built in into them.  Here are some examples that you may see:
-		<ul>
-		
-            <li><strong>Open File in External Viewer</strong>: Opens the selected file in an "external" application as defined by the local OS.  For example, HTML files maybe opened by IE or Firefox, depending on what the local system is configured to use. </li>
-
-            <li><strong>View in New Window:</strong> Opens the content in a new internal Content Viewer (instead of in the default location in the lower right).</li>
-
-		    <li><strong>Extract:</strong> Make a local copy of the file or directory for further analysis.</li>
-
-            <li><strong>Search for files with the same MD5 Hash:</strong> Searches the entire filesystem for any files with the same MD5 Hash as the one selected.</li>
-		</ul>
-        </p>
-
-        <h2>Example</h2>
-        <p>
-            Here's one of the example of a "Result Viewer" window:
-            <br>
-            &nbsp;&nbsp;&nbsp;&nbsp; <img src="ResultViewer_example.png" alt="Example of Result Viewer Window" />
-        </p>
-    </body>
-</html>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Result Viewers</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Result Viewers</h2>
+        <p>
+            The Result Viewer windows are in the upper right area of the interface and display the results from selecting something in the  <a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/dataexplorer-about.html">Explorer Tree</a> area.
+            You will have the option in this are to display the results in a variety of formats.
+            Currently, there are 2 main tabs on "Result Viewer" window:
+        <ul>
+            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html">Table Results Viewer</a></li>
+            <li><a href="nbdocs:/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html">Thumbnail Results Viewer</a></li>
+        </ul>
+        </p>
+
+        <h2>Right Click Functions</h2>
+        <p>
+            Viewers in Result Viewers have some right click function that built in into them.  Here are some examples that you may see:
+		<ul>
+		
+            <li><strong>Open File in External Viewer</strong>: Opens the selected file in an "external" application as defined by the local OS.  For example, HTML files maybe opened by IE or Firefox, depending on what the local system is configured to use. </li>
+
+            <li><strong>View in New Window:</strong> Opens the content in a new internal Content Viewer (instead of in the default location in the lower right).</li>
+
+		    <li><strong>Extract:</strong> Make a local copy of the file or directory for further analysis.</li>
+
+            <li><strong>Search for files with the same MD5 Hash:</strong> Searches the entire filesystem for any files with the same MD5 Hash as the one selected.</li>
+		</ul>
+        </p>
+
+        <h2>Example</h2>
+        <p>
+            Here's one of the example of a "Result Viewer" window:
+            <br>
+            &nbsp;&nbsp;&nbsp;&nbsp; <img src="ResultViewer_example.png" alt="Example of Result Viewer Window" />
+        </p>
+    </body>
+</html>
+
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/hex-content-viewer.html
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html
similarity index 97%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html
index 95989041d7de7af7fa23dd62643846afc0f3db3b..8e4b9dae93d16799ca8fc4d224b6927ba28a0c64 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/picture-content-viewer.html
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Media Content Viewer</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Media Content Viewer</h2>
-        <p>
-		The Media Content Viewer will show a picture or video file.  Video files can be played and paused.  The size of the picture or video will be reduced to fit into the screen. If you want more complex analysis of the media, then you must export the file. </p>
-            <p>If you select an non-picture file or an unsupported picture format on the "Result Viewers", this tab will be disabled.</p>
-
-        </p>
-
-
-        <p>
-            Here's one of the example of the "Media Content Viewer":
-            <br>
-            &nbsp;&nbsp;&nbsp;&nbsp; <img src="Picture_Content_Viewer.png" alt="Example of Picture Content Viewer Tab" />
-        </p>
-    </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Media Content Viewer</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Media Content Viewer</h2>
+        <p>
+		The Media Content Viewer will show a picture or video file.  Video files can be played and paused.  The size of the picture or video will be reduced to fit into the screen. If you want more complex analysis of the media, then you must export the file. </p>
+            <p>If you select an non-picture file or an unsupported picture format on the "Result Viewers", this tab will be disabled.</p>
+
+        </p>
+
+
+        <p>
+            Here's one of the example of the "Media Content Viewer":
+            <br>
+            &nbsp;&nbsp;&nbsp;&nbsp; <img src="Picture_Content_Viewer.png" alt="Example of Picture Content Viewer Tab" />
+        </p>
+    </body>
+</html>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/result-viewer.html
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html
index ab746719ab53926f0338349ffb451c237e5f7ff6..034a1bd5b2d3e0d93d3dd42d7de99ea5f736a6dc 100644
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/string-content-viewer.html
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>String Content Viewer</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>String Content Viewer</h2>
-        <p>Strings Content Viewer scans the data of the file / folder and searches it for data that could be text. When appropriate data is found, the String Content Viewer shows data strings extracted from binary, decoded, and interpreted as UTF8/16 for the selected script/language. </p>
-	  <p>Note that this is different from the Text Content Viewer, which displays the text for a file that is stored in the keyword search index. The results may be the same or they could be different.</p>
-
-        <h2>Example</h2>
-        <p>
-            Here's one of the example of "String Content Viewer":
-            <br>
-            &nbsp;&nbsp;&nbsp;&nbsp; <img src="String_Content_Viewer.png" alt="Example of String Content Viewer Tab" />
-        </p>
-    </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>String Content Viewer</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>String Content Viewer</h2>
+        <p>Strings Content Viewer scans the data of the file / folder and searches it for data that could be text. When appropriate data is found, the String Content Viewer shows data strings extracted from binary, decoded, and interpreted as UTF8/16 for the selected script/language. </p>
+	  <p>Note that this is different from the Text Content Viewer, which displays the text for a file that is stored in the keyword search index. The results may be the same or they could be different.</p>
+
+        <h2>Example</h2>
+        <p>
+            Here's one of the example of "String Content Viewer":
+            <br>
+            &nbsp;&nbsp;&nbsp;&nbsp; <img src="String_Content_Viewer.png" alt="Example of String Content Viewer Tab" />
+        </p>
+    </body>
+</html>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/table-results-viewer.html
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html
old mode 100755
new mode 100644
similarity index 98%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html
index bf7f5e23388116e396a7354e8b397a979e4f93e1..b9eb69c032e0bba35e716e2242177669fb13acba
--- a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/text-content-viewer.html
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>String Content Viewer</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Text Content Viewer</h2>
-        <p>Text Content Viewer uses the keyword search index that may have been populated during <a href="nbdocs:/org/sleuthkit/autopsy/ingest/docs/ingest-about.html">Image Ingest</a>.  If a file has text stored in the index, then this tab will be enabled and it will be displayed to the user. </p>
-	
-	  <p>This tab may have more text on it than the "Strings Content Viewer", which relies on searching the file for text-looking data. Some files, like PDF, will not have text-looking data at the byte-level, but the keyword indexing process knows how to interpret a PDF file and produce text. </p>
-
-	<p>If this tab is not enabled, then either the file has no text or you did not enable Keyword Search as an ingest module.  Note that this viewer is also used to display keyword hits.</p>
-	<img src="textview.png" alt="Text View" />
-    </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>String Content Viewer</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Text Content Viewer</h2>
+        <p>Text Content Viewer uses the keyword search index that may have been populated during <a href="nbdocs:/org/sleuthkit/autopsy/ingest/docs/ingest-about.html">Image Ingest</a>.  If a file has text stored in the index, then this tab will be enabled and it will be displayed to the user. </p>
+	
+	  <p>This tab may have more text on it than the "Strings Content Viewer", which relies on searching the file for text-looking data. Some files, like PDF, will not have text-looking data at the byte-level, but the keyword indexing process knows how to interpret a PDF file and produce text. </p>
+
+	<p>If this tab is not enabled, then either the file has no text or you did not enable Keyword Search as an ingest module.  Note that this viewer is also used to display keyword hits.</p>
+	<img src="textview.png" alt="Text View" />
+    </body>
+</html>
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/textview.png b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/textview.png
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/textview.png
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/textview.png
diff --git a/CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html b/Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html
similarity index 100%
rename from CoreComponents/javahelp/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html
rename to Core/javahelp/org/sleuthkit/autopsy/corecomponents/docs/thumbnail-results-viewer.html
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/DirectoryTree_example.png b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/DirectoryTree_example.png
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/DirectoryTree_example.png
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/DirectoryTree_example.png
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/ImageDetailHelp.png b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/ImageDetailHelp.png
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/ImageDetailHelp.png
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/ImageDetailHelp.png
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/VolumeDetailHelp.png b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/VolumeDetailHelp.png
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/VolumeDetailHelp.png
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/VolumeDetailHelp.png
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html
old mode 100755
new mode 100644
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-about.html
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-hs.xml b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-hs.xml
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-hs.xml
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-hs.xml
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-idx.xml b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-idx.xml
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-idx.xml
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-idx.xml
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-map.xml b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-map.xml
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-map.xml
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-map.xml
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-toc.xml b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-toc.xml
old mode 100755
new mode 100644
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-toc.xml
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/directorytree-toc.xml
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html
old mode 100755
new mode 100644
similarity index 97%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html
index 3c39a5bfbe4bcecfdb8e0aba1f7a59da4d27f980..d617f0a15829e1106e8fde495b0f967c057af00e
--- a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/image-details.html
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Image Details Window</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Image Details Window</h2>
-        <p>
-            The Image Details window shows you basic information about a disk image. You can access it by right-clicking on an image in the tree and choosing "Image Details".
-        </p>
-        
-            <p><img src="rightClick_imageDetails.png" alt="Right click on directory tree to show Image Details" /></p>
-
-         <p>An example is shown here: <br />
-            &nbsp;&nbsp;&nbsp;&nbsp;<img src="ImageDetailHelp.png" alt="Example of Image Details Window" />
-        </p>
-    </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Image Details Window</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Image Details Window</h2>
+        <p>
+            The Image Details window shows you basic information about a disk image. You can access it by right-clicking on an image in the tree and choosing "Image Details".
+        </p>
+        
+            <p><img src="rightClick_imageDetails.png" alt="Right click on directory tree to show Image Details" /></p>
+
+         <p>An example is shown here: <br />
+            &nbsp;&nbsp;&nbsp;&nbsp;<img src="ImageDetailHelp.png" alt="Example of Image Details Window" />
+        </p>
+    </body>
+</html>
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_imageDetails.png b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_imageDetails.png
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_imageDetails.png
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_imageDetails.png
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_volumeDetails.png b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_volumeDetails.png
similarity index 100%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_volumeDetails.png
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/rightClick_volumeDetails.png
diff --git a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html
old mode 100755
new mode 100644
similarity index 97%
rename from DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html
rename to Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html
index daf66aa22e2fb042c1c7bca2017d75304de8b668..8dff6889306c328fc86cc3ba22d84642a5ccb741
--- a/DirectoryTree/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html
+++ b/Core/javahelp/org/sleuthkit/autopsy/directorytree/docs/volume-details.html
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-    <head>
-        <title>Volume Details Window</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-        <h2>Volume Details Window</h2>
-        <p>
-            The Volume Details window shows you information about a volume.  It shows information such as the starting sector, length, and description.  You can view the information by right clicking on a volume in the tree and choosing "Volume Details".
-        </p>
-        
-            <p><img src="rightClick_volumeDetails.png" alt="Right click on directory tree to show Volume Details" /></p>
-            
-        
-        <p>
-		An example is shown here:<br />
-            &nbsp;&nbsp;&nbsp;&nbsp;<img src="VolumeDetailHelp.png" alt="Example of Volume Details Window" />
-        </p>
-    </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+    <head>
+        <title>Volume Details Window</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+        <h2>Volume Details Window</h2>
+        <p>
+            The Volume Details window shows you information about a volume.  It shows information such as the starting sector, length, and description.  You can view the information by right clicking on a volume in the tree and choosing "Volume Details".
+        </p>
+        
+            <p><img src="rightClick_volumeDetails.png" alt="Right click on directory tree to show Volume Details" /></p>
+            
+        
+        <p>
+		An example is shown here:<br />
+            &nbsp;&nbsp;&nbsp;&nbsp;<img src="VolumeDetailHelp.png" alt="Example of Volume Details Window" />
+        </p>
+    </body>
+</html>
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_example.png b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_example.png
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_example.png
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_example.png
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_usage.png b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_usage.png
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_usage.png
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/FileSearch_usage.png
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-about.html
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-hs.xml b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-hs.xml
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-hs.xml
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-hs.xml
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-idx.xml b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-idx.xml
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-idx.xml
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-idx.xml
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-map.xml b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-map.xml
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-map.xml
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-map.xml
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-toc.xml b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-toc.xml
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-toc.xml
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/filesearch-toc.xml
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/how-to-use-filesearch.html
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open-filesearch.html
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch1.png b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch1.png
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch1.png
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch1.png
diff --git a/FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch2.png b/Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch2.png
similarity index 100%
rename from FileSearch/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch2.png
rename to Core/javahelp/org/sleuthkit/autopsy/filesearch/docs/open_fileSearch2.png
diff --git a/Core/manifest.mf b/Core/manifest.mf
index 52e09f6dc39a0d332260b55e03d818b201ebe9eb..f23bbeb97ff95748567a10c6b484d00e84670e8f 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -5,4 +5,5 @@ OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
 OpenIDE-Module-Implementation-Version: 1
 OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
 AutoUpdate-Show-In-Client: true
+OpenIDE-Module-Install: org/sleuthkit/autopsy/corecomponents/Installer.class
 
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index d1a76e987c283518d96f71fa29c29370bf860972..c7e816a6b0141bf7bdf17b9eb299ea0d3a9834b5 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,3 +1,15 @@
+file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
+file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
+file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
+file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
+file.reference.poi-3.8.jar=release/modules/ext/poi-3.8.jar
+file.reference.poi-excelant-3.8.jar=release/modules/ext/poi-excelant-3.8.jar
+file.reference.poi-ooxml-3.8.jar=release/modules/ext/poi-ooxml-3.8.jar
+file.reference.poi-ooxml-schemas-3.8.jar=release/modules/ext/poi-ooxml-schemas-3.8.jar
+file.reference.poi-scratchpad-3.8.jar=release/modules/ext/poi-scratchpad-3.8.jar
+file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
+file.reference.sqlite-jdbc-3.7.2.jar=release/modules/ext/sqlite-jdbc-3.7.2.jar
+file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
@@ -5,3 +17,4 @@ nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 spec.version.base=1.0
+javahelp.hs=casemodule-helpset.xml
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 4151ee9f981105e4361c3cb3bb8cdfdd38a873bb..cb022aa81c9535e88d183bc105e7ba7d905158ba 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -6,6 +6,42 @@
             <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.28.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.core</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <implementation-version/>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.core.startup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <implementation-version/>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.javahelp</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>2.27.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.settings</code-name-base>
                     <build-prerequisite/>
@@ -16,102 +52,115 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
+                    <code-name-base>org.netbeans.swing.outline</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.23.1</specification-version>
+                        <specification-version>1.20.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <code-name-base>org.netbeans.swing.plaf</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.15.1</specification-version>
+                        <specification-version>1.25.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <code-name-base>org.netbeans.swing.tabcontrol</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.47.1</specification-version>
+                        <specification-version>1.36.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
+                    <code-name-base>org.openide.actions</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.17.1</specification-version>
+                        <specification-version>6.26.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
+                    <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.16.1</specification-version>
+                        <specification-version>7.23.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.text</code-name-base>
+                    <code-name-base>org.openide.dialogs</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.30.1</specification-version>
+                        <specification-version>7.15.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
+                    <code-name-base>org.openide.explorer</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.6.1</specification-version>
+                        <specification-version>6.45.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.3.1</specification-version>
+                        <specification-version>7.47.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
+                    <code-name-base>org.openide.modules</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.33.1</specification-version>
+                        <specification-version>7.17.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
+                    <code-name-base>org.openide.nodes</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>7.16.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.text</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.30.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
+                    <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
+                        <specification-version>8.6.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>8.3.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.windows</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.33.1</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
@@ -126,7 +175,101 @@
             </test-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.casemodule</package>
+                <package>org.sleuthkit.autopsy.corecomponentinterfaces</package>
+                <package>org.sleuthkit.autopsy.corecomponents</package>
+                <package>org.sleuthkit.autopsy.coreutils</package>
+                <package>org.sleuthkit.autopsy.datamodel</package>
+                <package>org.sleuthkit.autopsy.directorytree</package>
+                <package>org.sleuthkit.autopsy.filesearch</package>
+                <package>org.sleuthkit.autopsy.ingest</package>
+                <package>org.sleuthkit.autopsy.menuactions</package>
+                <package>org.sleuthkit.autopsy.report</package>
+                <package>org.sleuthkit.datamodel</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang-2.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sqlite-jdbc-3.7.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sqlite-jdbc-3.7.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/BlackboardResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/BlackboardResultViewer.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/BlackboardResultViewer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/BlackboardResultViewer.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContent.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContent.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContent.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContent.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataContentViewer.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataExplorer.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResult.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResult.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResult.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResult.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResultViewer.java
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResultViewer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/DataResultViewer.java
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/package.dox b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/package.dox
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/package.dox
rename to Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/package.dox
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
old mode 100755
new mode 100644
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponent.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentSettings.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentSettings.xml
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentSettings.xml
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentSettings.xml
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentWstcref.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentWstcref.xml
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentWstcref.xml
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentTopComponentWstcref.xml
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerPicture.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/Installer.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java b/Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/NoTabsTabDisplayerUI.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java
similarity index 95%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java
index 47f4edd84871e50088131f600f3b6a41548cfbc9..95ed4c50251a0eb391adf546098fc004e7bdedf1 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/OptionsPanel.java
@@ -1,23 +1,23 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.sleuthkit.autopsy.corecomponents;
-
-/**
- *
- */
-public interface OptionsPanel {
-    
-    /**
-     * Store the current state of all options in this OptionsPanel.
-     */
-    public void store();
-    
-    /**
-     * Load the saved state of all options, and refresh this
-     * OptionsPanel accordingly.
-     */
-    public void load();
-    
-}
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.sleuthkit.autopsy.corecomponents;
+
+/**
+ *
+ */
+public interface OptionsPanel {
+    
+    /**
+     * Store the current state of all options in this OptionsPanel.
+     */
+    public void store();
+    
+    /**
+     * Load the saved state of all options, and refresh this
+     * OptionsPanel accordingly.
+     */
+    public void load();
+    
+}
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form
rename to Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.form
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterChildren.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
rename to Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/arrow_left.gif b/Core/src/org/sleuthkit/autopsy/corecomponents/arrow_left.gif
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/arrow_left.gif
rename to Core/src/org/sleuthkit/autopsy/corecomponents/arrow_left.gif
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/arrow_right.gif b/Core/src/org/sleuthkit/autopsy/corecomponents/arrow_right.gif
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/arrow_right.gif
rename to Core/src/org/sleuthkit/autopsy/corecomponents/arrow_right.gif
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_disabled.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_disabled.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_disabled.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_disabled.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_back_hover.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_disabled.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_disabled.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_disabled.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_disabled.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png b/Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png
rename to Core/src/org/sleuthkit/autopsy/corecomponents/btn_step_forward_hover.png
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml
rename to Core/src/org/sleuthkit/autopsy/corecomponents/corecomponents-helpset.xml
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/layer.xml b/Core/src/org/sleuthkit/autopsy/corecomponents/layer.xml
similarity index 98%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/layer.xml
rename to Core/src/org/sleuthkit/autopsy/corecomponents/layer.xml
index 46d643d77ecff1fa6c6c2a7c80ee043ec1df3ee5..69f813b15ef19591d088a9af47b70783c27ad753 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/layer.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Help">
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.CustomAboutAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_CustomAboutAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>
-        </folder>
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-corecomponents-DataContentAction.instance">
-                <attr name="component" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.findInstance"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_DataContentAction"/>
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Help">
-            <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance"/>
-                <attr name="position" intvalue="3000"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="corecomponents-helpset.xml" url="corecomponents-helpset.xml">
-                <attr name="position" intvalue="3801"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-corecomponents-DataContentTopComponent.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataContent"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.getDefault"/>
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-        </folder>
-        <folder name="Modes">
-            <folder name="editor">
-                </folder>
-            <folder name="output">
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Actions">
+        <folder name="Help">
+            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.CustomAboutAction"/>
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_CustomAboutAction"/>
+                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+                <attr name="noIconInMenu" boolvalue="false"/>
+            </file>
+        </folder>
+        <folder name="Window">
+            <file name="org-sleuthkit-autopsy-corecomponents-DataContentAction.instance">
+                <attr name="component" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.findInstance"/>
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_DataContentAction"/>
+                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
+            </file>
+        </folder>
+    </folder>
+    <folder name="Menu">
+        <folder name="Help">
+            <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
+            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance"/>
+                <attr name="position" intvalue="3000"/>
+            </file>
+        </folder>
+    </folder>
+    <folder name="Services">
+        <folder name="JavaHelp">
+            <file name="corecomponents-helpset.xml" url="corecomponents-helpset.xml">
+                <attr name="position" intvalue="3801"/>
+            </file>
+        </folder>
+        <file name="org-sleuthkit-autopsy-corecomponents-DataContentTopComponent.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataContent"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.corecomponents.DataContentTopComponent.getDefault"/>
+        </file>
+    </folder>
+    <folder name="Windows2">
+        <folder name="Components">
+        </folder>
+        <folder name="Modes">
+            <folder name="editor">
+                </folder>
+            <folder name="output">
+            </folder>
+        </folder>
+    </folder>
+</filesystem>
diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/package.dox b/Core/src/org/sleuthkit/autopsy/corecomponents/package.dox
similarity index 100%
rename from CoreComponents/src/org/sleuthkit/autopsy/corecomponents/package.dox
rename to Core/src/org/sleuthkit/autopsy/corecomponents/package.dox
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java b/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java.old
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java.old
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Bundle.properties b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/DecodeUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/DecodeUtil.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/DecodeUtil.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/DecodeUtil.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/FileUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/FileUtil.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Installer.java b/Core/src/org/sleuthkit/autopsy/coreutils/Installer.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/Installer.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/Installer.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/JLNK.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/JLNK.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/JLnkParser.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java b/Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/LnkEnums.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/LogIcon.png b/Core/src/org/sleuthkit/autopsy/coreutils/LogIcon.png
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/LogIcon.png
rename to Core/src/org/sleuthkit/autopsy/coreutils/LogIcon.png
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Logger.java b/Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/Logger.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/Logger.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java b/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/StopWatch.java b/Core/src/org/sleuthkit/autopsy/coreutils/StopWatch.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/StopWatch.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/StopWatch.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/StringExtract.java b/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/StringExtract.properties b/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.properties
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/StringExtract.properties
rename to Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.properties
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/TestLogger.java b/Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/TestLogger.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/TestLogger.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java b/Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/TimestampingFormatter.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.java b/Core/src/org/sleuthkit/autopsy/coreutils/Version.java
similarity index 100%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/Version.java
diff --git a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/layer.xml b/Core/src/org/sleuthkit/autopsy/coreutils/layer.xml
similarity index 97%
rename from CoreUtils/src/org/sleuthkit/autopsy/coreutils/layer.xml
rename to Core/src/org/sleuthkit/autopsy/coreutils/layer.xml
index 733111b739002ca11a110f32f56b56960c1195b3..83b7d8df3b5418f8130b6a36113303672be9fd8b 100644
--- a/CoreUtils/src/org/sleuthkit/autopsy/coreutils/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/layer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+</filesystem>
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/AutopsyVisitableItem.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Bookmarks.java b/Core/src/org/sleuthkit/autopsy/datamodel/Bookmarks.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Bookmarks.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/Bookmarks.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ContentChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ContentHierarchyVisitor.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ContentNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ContentNodeVisitor.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/DataConversion.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/FileNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/FileSearchFilterNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensions.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java b/Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/HighlightLookup.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ImageNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Images.java b/Core/src/org/sleuthkit/autopsy/datamodel/Images.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Images.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/Images.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ImagesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImagesNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ImagesNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ImagesNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Installer.java b/Core/src/org/sleuthkit/autopsy/datamodel/Installer.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Installer.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/Installer.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValue.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValue.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValue.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/KeyValue.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/LayoutDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutDirectoryNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/LayoutDirectoryNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/LayoutDirectoryNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java b/Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Results.java b/Core/src/org/sleuthkit/autopsy/datamodel/Results.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Results.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/Results.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFilters.java b/Core/src/org/sleuthkit/autopsy/datamodel/SearchFilters.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFilters.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/SearchFilters.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFiltersChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/SearchFiltersChildren.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFiltersChildren.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/SearchFiltersChildren.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFiltersNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/SearchFiltersNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/SearchFiltersNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/SearchFiltersNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/StringContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/StringContent.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/StringContent.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/StringContent.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/Views.java b/Core/src/org/sleuthkit/autopsy/datamodel/Views.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/Views.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/Views.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
rename to Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
diff --git a/DataModel/src/org/sleuthkit/autopsy/datamodel/package.dox b/Core/src/org/sleuthkit/autopsy/datamodel/package.dox
similarity index 100%
rename from DataModel/src/org/sleuthkit/autopsy/datamodel/package.dox
rename to Core/src/org/sleuthkit/autopsy/datamodel/package.dox
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/Bundle.properties b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/CollapseAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterChildren.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentSettings.xml b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentSettings.xml
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentSettings.xml
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentSettings.xml
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentWstcref.xml b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentWstcref.xml
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentWstcref.xml
rename to Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponentWstcref.xml
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileBookmarkAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileBookmarkAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileBookmarkAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/FileBookmarkAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSearchAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/FileSearchAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSearchProvider.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchProvider.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSearchProvider.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/FileSearchProvider.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form
rename to Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.form
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/FileSystemDetailsPanel.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java
similarity index 97%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java
index 439acf928f33122b06636fac339d0dc4e6f9abc9..32564efc6682a2ae109bc04c2caa14c104c26a79 100644
--- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java
@@ -1,45 +1,45 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2011 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.directorytree;
-
-import java.awt.event.ActionEvent;
-import javax.swing.AbstractAction;
-import org.openide.nodes.Node;
-import org.openide.util.Lookup;
-
-/**
- * Action to lookup the interface and call the real action in HashDatabase.
- * The real action, HashDbSearchAction, implements HashSearchProvider, and should
- * be the only instance of it.
- */
-public class HashSearchAction extends AbstractAction {
-    Node contentNode;
-    
-    public HashSearchAction(String title, Node contentNode) {
-        super(title);
-        this.contentNode = contentNode;
-    }
-    
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        HashSearchProvider searcher = Lookup.getDefault().lookup(HashSearchProvider.class);
-        searcher.search(contentNode);
-    }
-    
-}
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2011 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.directorytree;
+
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import org.openide.nodes.Node;
+import org.openide.util.Lookup;
+
+/**
+ * Action to lookup the interface and call the real action in HashDatabase.
+ * The real action, HashDbSearchAction, implements HashSearchProvider, and should
+ * be the only instance of it.
+ */
+public class HashSearchAction extends AbstractAction {
+    Node contentNode;
+    
+    public HashSearchAction(String title, Node contentNode) {
+        super(title);
+        this.contentNode = contentNode;
+    }
+    
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        HashSearchProvider searcher = Lookup.getDefault().lookup(HashSearchProvider.class);
+        searcher.search(contentNode);
+    }
+    
+}
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java
similarity index 97%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java
index 02159f2f4ee851ef04a694dd56f2d3dadea20116..a69451cc07083fd8dbf8c31638282126157a8c4a 100644
--- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/HashSearchProvider.java
@@ -1,28 +1,28 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2011 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.directorytree;
-
-import org.openide.nodes.Node;
-
-/**
- * Lookup interface for hash search (to deal with circular deps)
- */
-public interface HashSearchProvider {
-    public void search(Node contentNode);
-}
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2011 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.directorytree;
+
+import org.openide.nodes.Node;
+
+/**
+ * Lookup interface for hash search (to deal with circular deps)
+ */
+public interface HashSearchProvider {
+    public void search(Node contentNode);
+}
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
rename to Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.form
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ImageDetailsPanel.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java b/Core/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ShowDetailActionVisitor.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ViewAssociatedContentAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form
rename to Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.form
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
rename to Core/src/org/sleuthkit/autopsy/directorytree/VolumeDetailsPanel.java
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/arrow_left.gif b/Core/src/org/sleuthkit/autopsy/directorytree/arrow_left.gif
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/arrow_left.gif
rename to Core/src/org/sleuthkit/autopsy/directorytree/arrow_left.gif
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/arrow_right.gif b/Core/src/org/sleuthkit/autopsy/directorytree/arrow_right.gif
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/arrow_right.gif
rename to Core/src/org/sleuthkit/autopsy/directorytree/arrow_right.gif
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/back-button.png b/Core/src/org/sleuthkit/autopsy/directorytree/back-button.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/back-button.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/back-button.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png b/Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml b/Core/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml
rename to Core/src/org/sleuthkit/autopsy/directorytree/directorytree-helpset.xml
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/explorerWsmode.xml b/Core/src/org/sleuthkit/autopsy/directorytree/explorerWsmode.xml
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/explorerWsmode.xml
rename to Core/src/org/sleuthkit/autopsy/directorytree/explorerWsmode.xml
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/forward-button.png b/Core/src/org/sleuthkit/autopsy/directorytree/forward-button.png
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/forward-button.png
rename to Core/src/org/sleuthkit/autopsy/directorytree/forward-button.png
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/layer.xml b/Core/src/org/sleuthkit/autopsy/directorytree/layer.xml
similarity index 98%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/layer.xml
rename to Core/src/org/sleuthkit/autopsy/directorytree/layer.xml
index 369a67120217ead27bad98ea32324c60f934da31..bbd9430fb87ba518bbf1664af01339ccc6b96bb3 100644
--- a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/layer.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="directorytree-helpset.xml" url="directorytree-helpset.xml">
-                <attr name="position" intvalue="3086"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
-            <attr name="position" intvalue="125"/>
-        </file>
-         <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent2.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
-            <attr name="position" intvalue="150"/>
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="DirectoryTreeTopComponent.settings" url="DirectoryTreeTopComponentSettings.xml"/>
-        </folder>
-    </folder>
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Services">
+        <folder name="JavaHelp">
+            <file name="directorytree-helpset.xml" url="directorytree-helpset.xml">
+                <attr name="position" intvalue="3086"/>
+            </file>
+        </folder>
+        <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
+            <attr name="position" intvalue="125"/>
+        </file>
+         <file name="org-sleuthkit-autopsy-directorytree-DirectoryTreeTopComponent2.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.corecomponentinterfaces.BlackboardResultViewer"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent.getDefault"/>
+            <attr name="position" intvalue="150"/>
+        </file>
+    </folder>
+    <folder name="Windows2">
+        <folder name="Components">
+            <file name="DirectoryTreeTopComponent.settings" url="DirectoryTreeTopComponentSettings.xml"/>
+        </folder>
+    </folder>
+</filesystem>
diff --git a/DirectoryTree/src/org/sleuthkit/autopsy/directorytree/package.dox b/Core/src/org/sleuthkit/autopsy/directorytree/package.dox
similarity index 100%
rename from DirectoryTree/src/org/sleuthkit/autopsy/directorytree/package.dox
rename to Core/src/org/sleuthkit/autopsy/directorytree/package.dox
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/AbstractFileSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/AbstractFileSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/AbstractFileSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/AbstractFileSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentSettings.xml b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentSettings.xml
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentSettings.xml
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentSettings.xml
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentWstcref.xml b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentWstcref.xml
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentWstcref.xml
rename to Core/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponentWstcref.xml
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FilterArea.java b/Core/src/org/sleuthkit/autopsy/filesearch/FilterArea.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/FilterArea.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/FilterArea.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchPanel.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/NameSearchPanel.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchChildren.java b/Core/src/org/sleuthkit/autopsy/filesearch/SearchChildren.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchChildren.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/SearchChildren.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java b/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
rename to Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
rename to Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/arrow_down.gif b/Core/src/org/sleuthkit/autopsy/filesearch/arrow_down.gif
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/arrow_down.gif
rename to Core/src/org/sleuthkit/autopsy/filesearch/arrow_down.gif
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/arrow_right.gif b/Core/src/org/sleuthkit/autopsy/filesearch/arrow_right.gif
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/arrow_right.gif
rename to Core/src/org/sleuthkit/autopsy/filesearch/arrow_right.gif
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/filesearch-helpset.xml b/Core/src/org/sleuthkit/autopsy/filesearch/filesearch-helpset.xml
similarity index 100%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/filesearch-helpset.xml
rename to Core/src/org/sleuthkit/autopsy/filesearch/filesearch-helpset.xml
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/layer.xml b/Core/src/org/sleuthkit/autopsy/filesearch/layer.xml
similarity index 97%
rename from FileSearch/src/org/sleuthkit/autopsy/filesearch/layer.xml
rename to Core/src/org/sleuthkit/autopsy/filesearch/layer.xml
index c75b11a20cfa92a77c43c922857071a63ecb238d..2e61805b34474f6e364cf6f353b744d41264f735 100644
--- a/FileSearch/src/org/sleuthkit/autopsy/filesearch/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/layer.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
-            </file>
-        </folder>    
-    </folder>
-    <folder name="Services">
-        <folder name="JavaHelp">
-            <file name="filesearch-helpset.xml" url="filesearch-helpset.xml">
-                <attr name="position" intvalue="3662"/>
-            </file>
-        </folder>
-        <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
-            <attr name="position" intvalue="250"/>
-        </file>
-    </folder>
-    <folder name="Menu">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-filesearch-FileSearchAction.instance"/>
-                <attr name="position" intvalue="200"/>
-            </file>
-        </folder>
-    </folder>
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Actions">
+        <folder name="Tools">
+            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
+            </file>
+        </folder>    
+    </folder>
+    <folder name="Services">
+        <folder name="JavaHelp">
+            <file name="filesearch-helpset.xml" url="filesearch-helpset.xml">
+                <attr name="position" intvalue="3662"/>
+            </file>
+        </folder>
+        <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.directorytree.FileSearchProvider"/>
+            <attr name="position" intvalue="250"/>
+        </file>
+    </folder>
+    <folder name="Menu">
+        <folder name="Tools">
+            <file name="org-sleuthkit-autopsy-filesearch-FileSearchAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-filesearch-FileSearchAction.instance"/>
+                <attr name="position" intvalue="200"/>
+            </file>
+        </folder>
+    </folder>
+</filesystem>
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/Folder-icon.png b/Core/src/org/sleuthkit/autopsy/images/Folder-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/Folder-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/Folder-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/account-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/account-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/account-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/account-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/addImage-icon.png b/Core/src/org/sleuthkit/autopsy/images/addImage-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/addImage-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/addImage-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/artifact-icon.png b/Core/src/org/sleuthkit/autopsy/images/artifact-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/artifact-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/artifact-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/audio-file.png b/Core/src/org/sleuthkit/autopsy/images/audio-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/audio-file.png
rename to Core/src/org/sleuthkit/autopsy/images/audio-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/blue-tag-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/blue-tag-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/blue-tag-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/blue-tag-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/bookmarks.png b/Core/src/org/sleuthkit/autopsy/images/bookmarks.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/bookmarks.png
rename to Core/src/org/sleuthkit/autopsy/images/bookmarks.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/camera-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/camera-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/camera-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/close-icon.png b/Core/src/org/sleuthkit/autopsy/images/close-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/close-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/close-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/cookies.png b/Core/src/org/sleuthkit/autopsy/images/cookies.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/cookies.png
rename to Core/src/org/sleuthkit/autopsy/images/cookies.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/doc-file.png b/Core/src/org/sleuthkit/autopsy/images/doc-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/doc-file.png
rename to Core/src/org/sleuthkit/autopsy/images/doc-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/downloads.png b/Core/src/org/sleuthkit/autopsy/images/downloads.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/downloads.png
rename to Core/src/org/sleuthkit/autopsy/images/downloads.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/exe-file.png b/Core/src/org/sleuthkit/autopsy/images/exe-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/exe-file.png
rename to Core/src/org/sleuthkit/autopsy/images/exe-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/extracted_content.png b/Core/src/org/sleuthkit/autopsy/images/extracted_content.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/extracted_content.png
rename to Core/src/org/sleuthkit/autopsy/images/extracted_content.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-filter-icon.png b/Core/src/org/sleuthkit/autopsy/images/file-filter-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-filter-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/file-filter-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-icon-deleted.png b/Core/src/org/sleuthkit/autopsy/images/file-icon-deleted.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-icon-deleted.png
rename to Core/src/org/sleuthkit/autopsy/images/file-icon-deleted.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-icon.png b/Core/src/org/sleuthkit/autopsy/images/file-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/file-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file_types.png b/Core/src/org/sleuthkit/autopsy/images/file_types.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/file_types.png
rename to Core/src/org/sleuthkit/autopsy/images/file_types.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/folder-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/folder-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/folder-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/folder-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/folder-icon-deleted.png b/Core/src/org/sleuthkit/autopsy/images/folder-icon-deleted.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/folder-icon-deleted.png
rename to Core/src/org/sleuthkit/autopsy/images/folder-icon-deleted.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/green-tag-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/green-tag-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/green-tag-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/green-tag-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/hard-drive-icon.jpg b/Core/src/org/sleuthkit/autopsy/images/hard-drive-icon.jpg
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/hard-drive-icon.jpg
rename to Core/src/org/sleuthkit/autopsy/images/hard-drive-icon.jpg
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/hashset_hits.png b/Core/src/org/sleuthkit/autopsy/images/hashset_hits.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/hashset_hits.png
rename to Core/src/org/sleuthkit/autopsy/images/hashset_hits.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/history.png b/Core/src/org/sleuthkit/autopsy/images/history.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/history.png
rename to Core/src/org/sleuthkit/autopsy/images/history.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/image-file.png b/Core/src/org/sleuthkit/autopsy/images/image-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/image-file.png
rename to Core/src/org/sleuthkit/autopsy/images/image-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/image.png b/Core/src/org/sleuthkit/autopsy/images/image.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/image.png
rename to Core/src/org/sleuthkit/autopsy/images/image.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/keyword_hits.png b/Core/src/org/sleuthkit/autopsy/images/keyword_hits.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/keyword_hits.png
rename to Core/src/org/sleuthkit/autopsy/images/keyword_hits.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/mail-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/mail-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/mail-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/mail-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/new-icon.png b/Core/src/org/sleuthkit/autopsy/images/new-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/new-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/new-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/open-icon.png b/Core/src/org/sleuthkit/autopsy/images/open-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/open-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/open-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/pdf-file.png b/Core/src/org/sleuthkit/autopsy/images/pdf-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/pdf-file.png
rename to Core/src/org/sleuthkit/autopsy/images/pdf-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/programs.png b/Core/src/org/sleuthkit/autopsy/images/programs.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/programs.png
rename to Core/src/org/sleuthkit/autopsy/images/programs.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/recent_docs.png b/Core/src/org/sleuthkit/autopsy/images/recent_docs.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/recent_docs.png
rename to Core/src/org/sleuthkit/autopsy/images/recent_docs.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/recent_files.png b/Core/src/org/sleuthkit/autopsy/images/recent_files.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/recent_files.png
rename to Core/src/org/sleuthkit/autopsy/images/recent_files.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/results.png b/Core/src/org/sleuthkit/autopsy/images/results.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/results.png
rename to Core/src/org/sleuthkit/autopsy/images/results.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/save-icon.png b/Core/src/org/sleuthkit/autopsy/images/save-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/save-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/save-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/searchquery.png b/Core/src/org/sleuthkit/autopsy/images/searchquery.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/searchquery.png
rename to Core/src/org/sleuthkit/autopsy/images/searchquery.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/star-bookmark-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/star-bookmark-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/star-bookmark-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/star-bookmark-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png b/Core/src/org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png
rename to Core/src/org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/text-file.png b/Core/src/org/sleuthkit/autopsy/images/text-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/text-file.png
rename to Core/src/org/sleuthkit/autopsy/images/text-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/usb_devices.png b/Core/src/org/sleuthkit/autopsy/images/usb_devices.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/usb_devices.png
rename to Core/src/org/sleuthkit/autopsy/images/usb_devices.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/video-file.png b/Core/src/org/sleuthkit/autopsy/images/video-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/video-file.png
rename to Core/src/org/sleuthkit/autopsy/images/video-file.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/views.png b/Core/src/org/sleuthkit/autopsy/images/views.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/views.png
rename to Core/src/org/sleuthkit/autopsy/images/views.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/vol-icon.png b/Core/src/org/sleuthkit/autopsy/images/vol-icon.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/vol-icon.png
rename to Core/src/org/sleuthkit/autopsy/images/vol-icon.png
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/web-file.png b/Core/src/org/sleuthkit/autopsy/images/web-file.png
similarity index 100%
rename from CoreComponentInterfaces/src/org/sleuthkit/autopsy/images/web-file.png
rename to Core/src/org/sleuthkit/autopsy/images/web-file.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/GetAllFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetAllFilesContentVisitor.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/GetAllFilesContentVisitor.java
rename to Core/src/org/sleuthkit/autopsy/ingest/GetAllFilesContentVisitor.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java b/Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java
rename to Core/src/org/sleuthkit/autopsy/ingest/GetFilesContentVisitor.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialog.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.form
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageWorkerController.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestImageWorkerController.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestImageWorkerController.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestImageWorkerController.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.form
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageDetailsPanel.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageMainPanel.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.form
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.form
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.form
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentSettings.xml b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentSettings.xml
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentSettings.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentSettings.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentWstcref.xml b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentWstcref.xml
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentWstcref.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponentWstcref.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesAction.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.form
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstract.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleInit.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleInit.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleInit.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleInit.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestServices.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestUI.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/IngestUI.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestUI.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/Installer.java b/Core/src/org/sleuthkit/autopsy/ingest/Installer.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/Installer.java
rename to Core/src/org/sleuthkit/autopsy/ingest/Installer.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java b/Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java
rename to Core/src/org/sleuthkit/autopsy/ingest/ModuleDataEvent.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/btn_step_back.png b/Core/src/org/sleuthkit/autopsy/ingest/btn_step_back.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/btn_step_back.png
rename to Core/src/org/sleuthkit/autopsy/ingest/btn_step_back.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png b/Core/src/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png
rename to Core/src/org/sleuthkit/autopsy/ingest/btn_step_back_hover.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/dockedBottomWsmode.xml b/Core/src/org/sleuthkit/autopsy/ingest/dockedBottomWsmode.xml
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/dockedBottomWsmode.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/dockedBottomWsmode.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-button.png b/Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-button.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-button.png
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-button.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-details.PNG b/Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-details.PNG
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-details.PNG
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-details.PNG
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-main.PNG b/Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-main.PNG
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/inbox-main.PNG
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/inbox-main.PNG
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html
old mode 100755
new mode 100644
similarity index 98%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html
index b34f5e454460bf4fdd1035eb3aab1d5cdd54fee0..d741cf99ff4b67b4293a857d66153ace84eaab6c
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html
+++ b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-about.html
@@ -1,36 +1,36 @@
-<html>
-    <head>
-        <title>Image Ingest</title>
-        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    </head>
-    <body>
-	<h2>Image Ingest</h2>
-	   <p>Autopsy tries to automate as many things as possible for you. There are many tasks that will always be performed in a digital investigation and the ingest manager is responsible for making sure that they happen. </p>
-	   
-	<p>The ingest process begins after the basic file system information has been added to the database. The ingest process is similar to triage.  A series of ingest modules (described in a following section) run automatically behind the scenes and make their results available as soon as possible. </p>
-	   
-	<p>You can start image ingest in two ways.  When you add an image with the <a href="nbdocs:/org/sleuthkit/autopsy/casemodule/docs/addImage.html">Add Image wizard</a>, you will be shown the list of ingest modules and you can choose which you want to run and you can do some basic configuration of the modules.  You can also launch the Ingest Manager run ingest by right clicking on an image in the explorer tree and choosing "Restart Image Ingest".  </p>
-	    <p>The results from the ingest module can typically be found in the Results area of the explorer tree.  However, some modules may choose to write results to a local file or to some other location and not make them available in the UI. </p>
-	
-	<h2>Ingest Modules</h2>
-        <p>
-		An ingest module is responsible for extracting data from and searching images. Different modules will do different things.  Examples include:
-	<ul>
-	<li>Calculate MD5 hash of each file</li>
-	<li>Lookup MD5 hash in database</li>
-	<li>Detect file type of each file</li>
-	<li>Keyword search each file</li>
-	<li>Extract web artifacts (downloads, history, etc.)</li>
-	</ul>
-	<p>
-
-	<p>Ingest modules can be created by third-party-developers and can be added independently of Autopsy. </p> 
-
-	<h2>Configuring Ingest Modules</h2>
-	There are two places to configure ingest modules. When the Ingest Manager is launched, there may be a small set of options the module allows you to edit directly in the Ingest Manager. Additionally, the Ingest Manager may display an "Advanced" button, which will open up a larger configuration menu with more available settings. This advanced configuration menu can often be found in the "Tools" > "Options" menu, along with the advanced settings for numerous other ingest modules.
-
-	<h2>Adding Ingest Modules</h2>
-	Ingest modules can be added through Autopsy's plugin manager. This is accessible through the "Tools" > "Plugins" menu. Currently, the best way to add an ingest module is by navigating to the module's NBM file after choosing "Add Plugin..." in the "Downloaded" tab of the plugin manager. Autopsy will require a restart after any modules are installed in order to properly load and display them.
-</body>
+<html>
+    <head>
+        <title>Image Ingest</title>
+        <link rel="stylesheet" href="nbdocs:/org/netbeans/modules/usersguide/ide.css" type="text/css">
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    </head>
+    <body>
+	<h2>Image Ingest</h2>
+	   <p>Autopsy tries to automate as many things as possible for you. There are many tasks that will always be performed in a digital investigation and the ingest manager is responsible for making sure that they happen. </p>
+	   
+	<p>The ingest process begins after the basic file system information has been added to the database. The ingest process is similar to triage.  A series of ingest modules (described in a following section) run automatically behind the scenes and make their results available as soon as possible. </p>
+	   
+	<p>You can start image ingest in two ways.  When you add an image with the <a href="nbdocs:/org/sleuthkit/autopsy/casemodule/docs/addImage.html">Add Image wizard</a>, you will be shown the list of ingest modules and you can choose which you want to run and you can do some basic configuration of the modules.  You can also launch the Ingest Manager run ingest by right clicking on an image in the explorer tree and choosing "Restart Image Ingest".  </p>
+	    <p>The results from the ingest module can typically be found in the Results area of the explorer tree.  However, some modules may choose to write results to a local file or to some other location and not make them available in the UI. </p>
+	
+	<h2>Ingest Modules</h2>
+        <p>
+		An ingest module is responsible for extracting data from and searching images. Different modules will do different things.  Examples include:
+	<ul>
+	<li>Calculate MD5 hash of each file</li>
+	<li>Lookup MD5 hash in database</li>
+	<li>Detect file type of each file</li>
+	<li>Keyword search each file</li>
+	<li>Extract web artifacts (downloads, history, etc.)</li>
+	</ul>
+	<p>
+
+	<p>Ingest modules can be created by third-party-developers and can be added independently of Autopsy. </p> 
+
+	<h2>Configuring Ingest Modules</h2>
+	There are two places to configure ingest modules. When the Ingest Manager is launched, there may be a small set of options the module allows you to edit directly in the Ingest Manager. Additionally, the Ingest Manager may display an "Advanced" button, which will open up a larger configuration menu with more available settings. This advanced configuration menu can often be found in the "Tools" > "Options" menu, along with the advanced settings for numerous other ingest modules.
+
+	<h2>Adding Ingest Modules</h2>
+	Ingest modules can be added through Autopsy's plugin manager. This is accessible through the "Tools" > "Plugins" menu. Currently, the best way to add an ingest module is by navigating to the module's NBM file after choosing "Add Plugin..." in the "Downloaded" tab of the plugin manager. Autopsy will require a restart after any modules are installed in order to properly load and display them.
+</body>
 </html>
\ No newline at end of file
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-hs.xml b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-hs.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-hs.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-hs.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-idx.xml b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-idx.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-idx.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-idx.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-inbox.html b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-inbox.html
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-inbox.html
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-inbox.html
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-map.xml b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-map.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-map.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-map.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-toc.xml b/Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-toc.xml
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/ingest-toc.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/ingest-toc.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/docs/package-info.java b/Core/src/org/sleuthkit/autopsy/ingest/docs/package-info.java
old mode 100755
new mode 100644
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/docs/package-info.java
rename to Core/src/org/sleuthkit/autopsy/ingest/docs/package-info.java
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleAbstractFileIngestModule.java.example b/Core/src/org/sleuthkit/autopsy/ingest/example/ExampleAbstractFileIngestModule.java.example
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleAbstractFileIngestModule.java.example
rename to Core/src/org/sleuthkit/autopsy/ingest/example/ExampleAbstractFileIngestModule.java.example
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestModule.java.example b/Core/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestModule.java.example
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestModule.java.example
rename to Core/src/org/sleuthkit/autopsy/ingest/example/ExampleImageIngestModule.java.example
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/eye-bw-25-rollover.png b/Core/src/org/sleuthkit/autopsy/ingest/eye-bw-25-rollover.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/eye-bw-25-rollover.png
rename to Core/src/org/sleuthkit/autopsy/ingest/eye-bw-25-rollover.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/eye-bw-25.png b/Core/src/org/sleuthkit/autopsy/ingest/eye-bw-25.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/eye-bw-25.png
rename to Core/src/org/sleuthkit/autopsy/ingest/eye-bw-25.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/floatingLeftBottomWsmode.xml b/Core/src/org/sleuthkit/autopsy/ingest/floatingLeftBottomWsmode.xml
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/floatingLeftBottomWsmode.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/floatingLeftBottomWsmode.xml
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/goto_dir.png b/Core/src/org/sleuthkit/autopsy/ingest/goto_dir.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/goto_dir.png
rename to Core/src/org/sleuthkit/autopsy/ingest/goto_dir.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/goto_res.png b/Core/src/org/sleuthkit/autopsy/ingest/goto_res.png
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/goto_res.png
rename to Core/src/org/sleuthkit/autopsy/ingest/goto_res.png
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/layer.xml b/Core/src/org/sleuthkit/autopsy/ingest/layer.xml
similarity index 97%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/layer.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/layer.xml
index bec857b97b2f9d8d696adb10395a35e2609ba9bf..8c3dd76810237ba5b566a688bf3f7e1dc3d68d4c 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/ingest/layer.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Services">
-        <file name="org-sleuthkit-autopsy-ingest-IngestDialogPanel.instance">
-        <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.casemodule.IngestConfigurator"/>
-        <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.ingest.IngestDialogPanel.getDefault"/>
-        <attr name="position" intvalue="50"/> 
-        </file>
-    </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="IngestMessageTopComponent.settings" url="IngestMessageTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="floatingLeftBottom">
-            </folder>
-            <file name="floatingLeftBottom.wsmode" url="floatingLeftBottomWsmode.xml"/>
-        </folder>
-    </folder>
-     <folder name="Actions">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.ingest.IngestMessagesAction"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="Ingest">
-            <attr intvalue="103" name="position"/>
-            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance"/>
-            </file>
-        </folder>
-    </folder>
-
-    
-
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Services">
+        <file name="org-sleuthkit-autopsy-ingest-IngestDialogPanel.instance">
+        <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.casemodule.IngestConfigurator"/>
+        <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.ingest.IngestDialogPanel.getDefault"/>
+        <attr name="position" intvalue="50"/> 
+        </file>
+    </folder>
+    <folder name="Windows2">
+        <folder name="Components">
+            <file name="IngestMessageTopComponent.settings" url="IngestMessageTopComponentSettings.xml"/>
+        </folder>
+        <folder name="Modes">
+            <folder name="floatingLeftBottom">
+            </folder>
+            <file name="floatingLeftBottom.wsmode" url="floatingLeftBottomWsmode.xml"/>
+        </folder>
+    </folder>
+     <folder name="Actions">
+        <folder name="Tools">
+            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.ingest.IngestMessagesAction"/>
+            </file>
+        </folder>
+    </folder>
+    <folder name="Toolbars">
+        <folder name="Ingest">
+            <attr intvalue="103" name="position"/>
+            <file name="org-sleuthkit-autopsy-ingest-IngestMessagesAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-ingest-IngestMessagesAction.instance"/>
+            </file>
+        </folder>
+    </folder>
+
+    
+
+</filesystem>
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/package.dox b/Core/src/org/sleuthkit/autopsy/ingest/package.dox
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/package.dox
rename to Core/src/org/sleuthkit/autopsy/ingest/package.dox
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml b/Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
similarity index 100%
rename from Ingest/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
rename to Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
similarity index 97%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
index a5b05c4f9e13dbf2d66925560c36e16fefc3b43d..e84d83f597aeebf20139b262998dc6ffacb80852 100644
--- a/MenuActions/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
@@ -1,2 +1,2 @@
-#CTL_FileBrowserAction=File Browser
-OpenIDE-Module-Name=MenuActions
+#CTL_FileBrowserAction=File Browser
+OpenIDE-Module-Name=MenuActions
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerDynamicMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java b/Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/OpenTopComponentAction.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java b/Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java
similarity index 100%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java
rename to Core/src/org/sleuthkit/autopsy/menuactions/SpacerPanel.java
diff --git a/MenuActions/src/org/sleuthkit/autopsy/menuactions/layer.xml b/Core/src/org/sleuthkit/autopsy/menuactions/layer.xml
similarity index 98%
rename from MenuActions/src/org/sleuthkit/autopsy/menuactions/layer.xml
rename to Core/src/org/sleuthkit/autopsy/menuactions/layer.xml
index 2845dd15bb5a2d536ed0573cc464494ff364ac51..b0f16143346dcd3deba3dd631b40e14d351d08b7 100644
--- a/MenuActions/src/org/sleuthkit/autopsy/menuactions/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/layer.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Actions">
-        <folder name="Tools">
-            <!--<file name="org-sleuthkit-autopsy-menuactions-FileBrowserAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.FileBrowserAction"/>
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.menuactions.Bundle#CTL_FileBrowserAction"/>
-                <attr name="noIconInMenu" boolvalue="false"/>
-            </file>-->
-            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.instance">
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.SpacerAction"/>
-            </file>
-        </folder>
-        <folder name="Window">
-        </folder>
-    </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoBefore.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="75"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu.instance">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataResultMenu.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="125"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu.instance">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataContentMenu.instance"/>
-                <attr name="position" intvalue="150"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="175"/>
-            </file>
-       </folder>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-SpacerAction.instance"/>
-                <attr name="position" intvalue="10000"/>
-            </file>
-        </folder>
-    </folder>
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Actions">
+        <folder name="Tools">
+            <!--<file name="org-sleuthkit-autopsy-menuactions-FileBrowserAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.FileBrowserAction"/>
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.menuactions.Bundle#CTL_FileBrowserAction"/>
+                <attr name="noIconInMenu" boolvalue="false"/>
+            </file>-->
+            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.menuactions.SpacerAction"/>
+            </file>
+        </folder>
+        <folder name="Window">
+        </folder>
+    </folder>
+    <folder name="Menu">
+        <folder name="Window">
+            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoBefore.instance">
+                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                <attr name="position" intvalue="75"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu.instance">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataResultMenu.instance"/>
+                <attr name="position" intvalue="100"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-menuactions-DataResultMenu-separatoAfter.instance">
+                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                <attr name="position" intvalue="125"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu.instance">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-DataContentMenu.instance"/>
+                <attr name="position" intvalue="150"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-menuactions-DataContentMenu-separatorAfter.instance">
+                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                <attr name="position" intvalue="175"/>
+            </file>
+       </folder>
+    </folder>
+    <folder name="Toolbars">
+        <folder name="File">
+            <file name="org-sleuthkit-autopsy-menuactions-SpacerAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-menuactions-SpacerAction.instance"/>
+                <attr name="position" intvalue="10000"/>
+            </file>
+        </folder>
+    </folder>
+</filesystem>
diff --git a/Report/src/org/sleuthkit/autopsy/report/BrowserControl.java b/Core/src/org/sleuthkit/autopsy/report/BrowserControl.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/BrowserControl.java
rename to Core/src/org/sleuthkit/autopsy/report/BrowserControl.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/Bundle.properties
rename to Core/src/org/sleuthkit/autopsy/report/Bundle.properties
diff --git a/Report/src/org/sleuthkit/autopsy/report/Report.java b/Core/src/org/sleuthkit/autopsy/report/Report.java
similarity index 97%
rename from Report/src/org/sleuthkit/autopsy/report/Report.java
rename to Core/src/org/sleuthkit/autopsy/report/Report.java
index 1b2d47cbb176a6e6be64d6f6adabeb6590a37f42..f9ca57b0668fd0f2f4e7f0e20d40d723cd08f268 100644
--- a/Report/src/org/sleuthkit/autopsy/report/Report.java
+++ b/Core/src/org/sleuthkit/autopsy/report/Report.java
@@ -34,7 +34,6 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.sleuthkit.autopsy.recentactivity.dbconnect;
 
 public class Report {
 
@@ -55,7 +54,7 @@ public String getGroupedKeywordHit() {
         SleuthkitCase tempDb = currentCase.getSleuthkitCase();
         try {
             tempDb.copyCaseDB(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_keyword;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_preview;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_exp;");
@@ -121,7 +120,7 @@ public String getGroupedHashsetHit() {
         SleuthkitCase tempDb = currentCase.getSleuthkitCase();
         try {
             tempDb.copyCaseDB(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_hashset;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_hashname;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_hash;");
@@ -174,7 +173,7 @@ public String getGroupedEmailHit() {
         SleuthkitCase tempDb = currentCase.getSleuthkitCase();
         try {
             tempDb.copyCaseDB(currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + currentCase.getTempDirectory() + File.separator + "autopsy-copy.db");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_path;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_from;");
             tempdbconnect.executeStmt("DROP TABLE IF EXISTS report_bcc;");
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportAction.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportAction.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportAction.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportConfiguration.java b/Core/src/org/sleuthkit/autopsy/report/ReportConfiguration.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportConfiguration.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportConfiguration.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportFilter.form b/Core/src/org/sleuthkit/autopsy/report/ReportFilter.form
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportFilter.form
rename to Core/src/org/sleuthkit/autopsy/report/ReportFilter.form
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportFilter.java b/Core/src/org/sleuthkit/autopsy/report/ReportFilter.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportFilter.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportFilter.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportFilterAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportFilterAction.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportFilterAction.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportFilterAction.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportGen.java b/Core/src/org/sleuthkit/autopsy/report/ReportGen.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportGen.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportGen.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportHTML.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportModule.java b/Core/src/org/sleuthkit/autopsy/report/ReportModule.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportModule.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportModule.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportModuleException.java b/Core/src/org/sleuthkit/autopsy/report/ReportModuleException.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportModuleException.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportModuleException.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportPanel.form
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportPanel.form
rename to Core/src/org/sleuthkit/autopsy/report/ReportPanel.form
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportPanel.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportPanel.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportPanel.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportPanelAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportPanelAction.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportPanelAction.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportPanelAction.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportUtils.java b/Core/src/org/sleuthkit/autopsy/report/ReportUtils.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportUtils.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportUtils.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportXLS.java b/Core/src/org/sleuthkit/autopsy/report/ReportXLS.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportXLS.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportXLS.java
diff --git a/Report/src/org/sleuthkit/autopsy/report/ReportXML.java b/Core/src/org/sleuthkit/autopsy/report/ReportXML.java
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/ReportXML.java
rename to Core/src/org/sleuthkit/autopsy/report/ReportXML.java
diff --git a/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java
new file mode 100644
index 0000000000000000000000000000000000000000..8444374d0c04419d85ecb5f02d5ac4400faae52d
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/report/SQLiteDBConnect.java
@@ -0,0 +1,109 @@
+ /*
+ *
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2012 42six Solutions.
+ * Contact: aebadirad <at> 42six <dot> com
+ * Project Contact/Architect: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.report;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * Database connection class & utilities *
+ */
+public class SQLiteDBConnect {
+
+    public String sDriver = "";
+    public String sUrl = null;
+    public int iTimeout = 30;
+    public Connection conn = null;
+    public Statement statement = null;
+
+    /* Stub constructor for quick instantiation o/t fly for using some of the ancillary stuff */
+    public SQLiteDBConnect() {
+    }
+
+    /* quick and dirty constructor to test the database passing the DriverManager name and the fully loaded url to handle */
+    /* NB this will typically be available if you make this class concrete and not abstract */
+    public SQLiteDBConnect(String sDriverToLoad, String sUrlToLoad) throws Exception {
+        init(sDriverToLoad, sUrlToLoad);
+    }
+
+    public final void init(String sDriverVar, String sUrlVar) throws Exception {
+        setDriver(sDriverVar);
+        setUrl(sUrlVar);
+        setConnection();
+        setStatement();
+    }
+
+    private void setDriver(String sDriverVar) {
+        sDriver = sDriverVar;
+    }
+
+    private void setUrl(String sUrlVar) {
+        sUrl = sUrlVar;
+    }
+
+    public void setConnection() throws Exception {
+        Class.forName(sDriver);
+        conn = DriverManager.getConnection(sUrl);
+    }
+
+    public Connection getConnection() {
+        return conn;
+    }
+
+    public void setStatement() throws Exception {
+        if (conn == null) {
+            setConnection();
+        }
+        statement = conn.createStatement();
+        statement.setQueryTimeout(iTimeout);  // set timeout to 30 sec.
+    }
+
+    public Statement getStatement() {
+        return statement;
+    }
+
+    public void executeStmt(String instruction) throws SQLException {
+        statement.executeUpdate(instruction);
+    }
+
+// processes an array of instructions e.g. a set of SQL command strings passed from a file
+//NB you should ensure you either handle empty lines in files by either removing them or parsing them out 
+// since they will generate spurious SQLExceptions when they are encountered during the iteration....
+    public void executeStmt(String[] instructionSet) throws SQLException {
+        for (int i = 0; i < instructionSet.length; i++) {
+            executeStmt(instructionSet[i]);
+        }
+    }
+
+    public ResultSet executeQry(String instruction) throws SQLException {
+        return statement.executeQuery(instruction);
+    }
+
+    public void closeConnection() {
+        try {
+            conn.close();
+        } catch (Exception ignore) {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Report/src/org/sleuthkit/autopsy/report/btn_icon_generate_report.png b/Core/src/org/sleuthkit/autopsy/report/btn_icon_generate_report.png
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/btn_icon_generate_report.png
rename to Core/src/org/sleuthkit/autopsy/report/btn_icon_generate_report.png
diff --git a/Report/src/org/sleuthkit/autopsy/report/layer.xml b/Core/src/org/sleuthkit/autopsy/report/layer.xml
similarity index 98%
rename from Report/src/org/sleuthkit/autopsy/report/layer.xml
rename to Core/src/org/sleuthkit/autopsy/report/layer.xml
index d05ae22670b4845b0fb3621bab7d749af5767e54..3efbb751a0de3c642e7fbf57e501a0a708990265 100644
--- a/Report/src/org/sleuthkit/autopsy/report/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/report/layer.xml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
-<filesystem>
-    <folder name="Menu">
-        <folder name="Tools">
-            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
-                <attr name="position" intvalue="100"/>
-            </file>
-            <file name="org-sleuthkit-autopsy-report-ReportAction-separatorAfter.instance">
-                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
-                <attr name="position" intvalue="101"/>
-            </file>
-        </folder>
-    </folder>
-    <folder name="Services">
-        <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>
-            <attr name="position" intvalue="900"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportXML.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXML.getDefault"/>
-            <attr name="position" intvalue="901"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportXLS.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXLS.getDefault"/>
-            <attr name="position" intvalue="902"/>
-        </file>
-        <file name="org-sleuthkit-autopsy-report-ReportBodyFile.instance">
-            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
-            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportBodyFile.getDefault"/>
-            <attr name="position" intvalue="903"/>
-        </file>
-    </folder>
-    <folder name="Toolbars">
-        <folder name="File">
-            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
-                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportAction.shadow"/>
-                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
-                <attr name="position" intvalue="102"/>
-            </file>
-        </folder>
-    </folder>
-   
-</filesystem>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
+<filesystem>
+    <folder name="Menu">
+        <folder name="Tools">
+            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
+                <attr name="position" intvalue="100"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-report-ReportAction-separatorAfter.instance">
+                <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+                <attr name="position" intvalue="101"/>
+            </file>
+        </folder>
+    </folder>
+    <folder name="Services">
+        <file name="org-sleuthkit-autopsy-report-ReportHTML.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportHTML.getDefault"/>
+            <attr name="position" intvalue="900"/>
+        </file>
+        <file name="org-sleuthkit-autopsy-report-ReportXML.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXML.getDefault"/>
+            <attr name="position" intvalue="901"/>
+        </file>
+        <file name="org-sleuthkit-autopsy-report-ReportXLS.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportXLS.getDefault"/>
+            <attr name="position" intvalue="902"/>
+        </file>
+        <file name="org-sleuthkit-autopsy-report-ReportBodyFile.instance">
+            <attr name="instanceOf" stringvalue="org.sleuthkit.autopsy.report.ReportModule"/>
+            <attr name="instanceCreate" methodvalue="org.sleuthkit.autopsy.report.ReportBodyFile.getDefault"/>
+            <attr name="position" intvalue="903"/>
+        </file>
+    </folder>
+    <folder name="Toolbars">
+        <folder name="File">
+            <file name="org-sleuthkit-autopsy-report-ReportAction.shadow">
+                <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.report.Bundle#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportAction.shadow"/>
+                <attr name="originalFile" stringvalue="Actions/Tools/org-sleuthkit-autopsy-report-ReportAction.instance"/>
+                <attr name="position" intvalue="102"/>
+            </file>
+        </folder>
+    </folder>
+   
+</filesystem>
diff --git a/Report/src/org/sleuthkit/autopsy/report/package.dox b/Core/src/org/sleuthkit/autopsy/report/package.dox
similarity index 100%
rename from Report/src/org/sleuthkit/autopsy/report/package.dox
rename to Core/src/org/sleuthkit/autopsy/report/package.dox
diff --git a/CoreComponentInterfaces/build.xml b/CoreComponentInterfaces/build.xml
deleted file mode 100644
index 34bf86be8d423bbbe0bc99202b128d4cfb511285..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.corecomponentinterfaces" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.corecomponentinterfaces.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/CoreComponentInterfaces/manifest.mf b/CoreComponentInterfaces/manifest.mf
deleted file mode 100644
index a1988b3db9184c5784024b1f4cfc23753e1b1aae..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/manifest.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.corecomponentinterfaces/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponentinterfaces/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-
diff --git a/CoreComponentInterfaces/nbproject/build-impl.xml b/CoreComponentInterfaces/nbproject/build-impl.xml
deleted file mode 100644
index dc08b8cc9c4ad151d5f1ddb80e7a68a42de2d6db..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.corecomponentinterfaces-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/CoreComponentInterfaces/nbproject/genfiles.properties b/CoreComponentInterfaces/nbproject/genfiles.properties
deleted file mode 100644
index 614b3b3cd2dfee552d921a5145af27c19beec70d..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=70bb94aa
-build.xml.script.CRC32=c5094f8f
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=70bb94aa
-nbproject/build-impl.xml.script.CRC32=23300e1b
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2
diff --git a/CoreComponentInterfaces/nbproject/project.properties b/CoreComponentInterfaces/nbproject/project.properties
deleted file mode 100644
index e84197de1268e2799510b0b1e16cb86e0af7f6b1..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/nbproject/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0
diff --git a/CoreComponentInterfaces/nbproject/project.xml b/CoreComponentInterfaces/nbproject/project.xml
deleted file mode 100644
index 54e5d03db93eff8f03298958dcfd7b527d05c64a..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/nbproject/project.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.26.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.28.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.16.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.33.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.corecomponentinterfaces</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git a/CoreComponentInterfaces/nbproject/suite.properties b/CoreComponentInterfaces/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java b/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java
deleted file mode 100644
index e0cc4c545aef8ca097fdd6ffbe091275434e6b7b..0000000000000000000000000000000000000000
--- a/CoreComponentInterfaces/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.corecomponentinterfaces;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.logging.Level;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.openide.util.Lookup;
-import org.openide.windows.Mode;
-import org.openide.windows.TopComponent;
-import org.openide.windows.WindowManager;
-
-/**
- * Responsible for opening and closing the core windows when a case is opened and closed.
- *
- * @author jantonius
- */
-public class CoreComponentControl {
-
-    private static final Logger logger = Logger.getLogger(CoreComponentControl.class.getName());
-
-    /**
-     * Opens all TopComponent windows that are needed ({@link DataExplorer}, {@link DataResult}, and
-     * {@link DataContent})
-     */
-    public static void openCoreWindows() {
-        // TODO: there has to be a better way to do this.
-
-        // find the data explorer top components
-        Collection<? extends DataExplorer> dataExplorers = Lookup.getDefault().lookupAll(DataExplorer.class);
-        for (DataExplorer de : dataExplorers) {
-            TopComponent explorerWin = de.getTopComponent();
-            Mode m = WindowManager.getDefault().findMode("explorer");
-            if (m != null) {
-                m.dockInto(explorerWin); // redock into the explorer mode
-            } else {
-                logger.log(Level.WARNING, "Could not find explorer mode and dock explorer window");
-            }
-            explorerWin.open(); // open that top component
-        }
-
-        // find the data content top component
-        DataContent dc = Lookup.getDefault().lookup(DataContent.class);
-        TopComponent contentWin = dc.getTopComponent();
-        Mode m = WindowManager.getDefault().findMode("output");
-        if (m != null) {
-            m.dockInto(contentWin); // redock into the output mode
-        } else {
-            logger.log(Level.WARNING, "Could not find output mode and dock content window");
-        }
-
-        contentWin.open(); // open that top component
-    }
-
-    /**
-     * Closes all TopComponent windows that needed ({@link DataExplorer}, {@link DataResult}, and
-     * {@link DataContent})
-     */
-    public static void closeCoreWindows() {
-        WindowManager wm = WindowManager.getDefault();
-        Iterator<? extends Mode> iter = wm.getModes().iterator();
-
-        while (iter.hasNext()) {
-            Mode mode = iter.next();
-            for (TopComponent tc : mode.getTopComponents()) {
-                tc.close();
-            }
-        }
-    }
-}
diff --git a/CoreComponents/build.xml b/CoreComponents/build.xml
deleted file mode 100644
index da573e27291ab1e598f045a8cd97d9b6e00423e0..0000000000000000000000000000000000000000
--- a/CoreComponents/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.corecomponents" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.corecomponents.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/CoreComponents/manifest.mf b/CoreComponents/manifest.mf
deleted file mode 100644
index 5b2cf51b0447f40fc4037e61579dc0eac794187a..0000000000000000000000000000000000000000
--- a/CoreComponents/manifest.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.corecomponents/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/corecomponents/Installer.class
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/corecomponents/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corecomponents/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
diff --git a/CoreComponents/nbproject/build-impl.xml b/CoreComponents/nbproject/build-impl.xml
deleted file mode 100644
index 6824a818f52a8e940af7f37ff0d4c757db8bcde3..0000000000000000000000000000000000000000
--- a/CoreComponents/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.corecomponents-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/CoreComponents/nbproject/genfiles.properties b/CoreComponents/nbproject/genfiles.properties
deleted file mode 100644
index 8ae512bd79a908dd3ed1616536e0fe8fac0e7fda..0000000000000000000000000000000000000000
--- a/CoreComponents/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=29b5838d
-build.xml.script.CRC32=d7506201
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=29b5838d
-nbproject/build-impl.xml.script.CRC32=c3845be2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1
diff --git a/CoreComponents/nbproject/project.properties b/CoreComponents/nbproject/project.properties
deleted file mode 100644
index 500b932e769c10277f36556aa3d1998afd1e5fc9..0000000000000000000000000000000000000000
--- a/CoreComponents/nbproject/project.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-file.reference.applejavaextensions.jar=release/modules/ext/applejavaextensions.jar
-file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
-file.reference.jna.jar=release/modules/ext/jna.jar
-file.reference.platform.jar=release/modules/ext/platform.jar
-file.reference.swt.jar=release/modules/ext/swt.jar
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-javahelp.hs=corecomponents-hs.xml
-spec.version.base=1.0
diff --git a/CoreComponents/nbproject/project.xml b/CoreComponents/nbproject/project.xml
deleted file mode 100644
index 936046ebf0a674594002454aeb62a7b10aeafb69..0000000000000000000000000000000000000000
--- a/CoreComponents/nbproject/project.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.24.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <implementation-version/>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.core.startup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <implementation-version/>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.26.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.swing.outline</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.9.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.swing.plaf</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.20.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.swing.tabcontrol</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.25.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.28.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.17.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.16.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.33.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.corecomponents</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/applejavaextensions.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/applejavaextensions.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/swt.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/swt.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jna.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/platform.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/platform.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/CoreComponents/nbproject/suite.properties b/CoreComponents/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/CoreComponents/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/CoreComponents/release/modules/ext/applejavaextensions.jar b/CoreComponents/release/modules/ext/applejavaextensions.jar
deleted file mode 100644
index d1aa7851db46760b274f0bbe99ed4773e4315750..0000000000000000000000000000000000000000
Binary files a/CoreComponents/release/modules/ext/applejavaextensions.jar and /dev/null differ
diff --git a/CoreComponents/release/modules/ext/gstreamer-java-1.5.jar b/CoreComponents/release/modules/ext/gstreamer-java-1.5.jar
deleted file mode 100644
index 2608b97043571419fc9897807ac03b595edd93b0..0000000000000000000000000000000000000000
Binary files a/CoreComponents/release/modules/ext/gstreamer-java-1.5.jar and /dev/null differ
diff --git a/CoreComponents/release/modules/ext/jna.jar b/CoreComponents/release/modules/ext/jna.jar
deleted file mode 100644
index 55ca1eb4e308338763b7170743a7f7d1179a2c47..0000000000000000000000000000000000000000
Binary files a/CoreComponents/release/modules/ext/jna.jar and /dev/null differ
diff --git a/CoreComponents/release/modules/ext/platform.jar b/CoreComponents/release/modules/ext/platform.jar
deleted file mode 100644
index 4b5db9c2802fb5e8328f6600aefea44d01da3e9e..0000000000000000000000000000000000000000
Binary files a/CoreComponents/release/modules/ext/platform.jar and /dev/null differ
diff --git a/CoreComponents/release/modules/ext/swt.jar b/CoreComponents/release/modules/ext/swt.jar
deleted file mode 100644
index df312676ae4475cdb4ea3cba29f724446d700bb1..0000000000000000000000000000000000000000
Binary files a/CoreComponents/release/modules/ext/swt.jar and /dev/null differ
diff --git a/CoreUtils/build.xml b/CoreUtils/build.xml
deleted file mode 100644
index fbf810a3a41d8b9a9b8d25b35235dbb9ee1ae64b..0000000000000000000000000000000000000000
--- a/CoreUtils/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.coreutils" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.coreutils.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/CoreUtils/manifest.mf b/CoreUtils/manifest.mf
deleted file mode 100644
index 2aa3cf55949f33b0e082b76af9ea03a5bdd04c8a..0000000000000000000000000000000000000000
--- a/CoreUtils/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.coreutils/0
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/coreutils/Installer.class
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/coreutils/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/coreutils/Bundle.properties
diff --git a/CoreUtils/nbproject/build-impl.xml b/CoreUtils/nbproject/build-impl.xml
deleted file mode 100644
index 09e05dfb7f56a5ab948442b3015ffbc27f0dcdea..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.coreutils-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/CoreUtils/nbproject/genfiles.properties b/CoreUtils/nbproject/genfiles.properties
deleted file mode 100644
index a97765af1c60e211d17467998e91b275a8a7e002..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=53a3cee0
-build.xml.script.CRC32=b3e56256
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=53a3cee0
-nbproject/build-impl.xml.script.CRC32=849ea2ba
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
diff --git a/CoreUtils/nbproject/platform.properties b/CoreUtils/nbproject/platform.properties
deleted file mode 100644
index 38ecd5a92ebea2c14710d0595bdd2d6df0bafcf4..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/platform.properties
+++ /dev/null
@@ -1,99 +0,0 @@
-cluster.path=\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.jsr223,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.j2ee.toplinklib,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.processor,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.jellytools,\
-    org.netbeans.modules.jellytools.java,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.swingapp,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.openide.compat,\
-    org.openide.util.enumerations
-nbplatform.active=default
diff --git a/CoreUtils/nbproject/project.properties b/CoreUtils/nbproject/project.properties
deleted file mode 100644
index c51692cafc19134f77f8ba341594b3e9ff4df820..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=0.0
diff --git a/CoreUtils/nbproject/project.xml b/CoreUtils/nbproject/project.xml
deleted file mode 100644
index 14c4c58258aac2e8e701bcecf60bf641155d6385..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/project.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <implementation-version/>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.31.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.20.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.8.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.coreutils</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git a/CoreUtils/nbproject/suite.properties b/CoreUtils/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/CoreUtils/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/DataModel/build.xml b/DataModel/build.xml
deleted file mode 100644
index 1c5480c65a95218e010913239a2ea2fefb906954..0000000000000000000000000000000000000000
--- a/DataModel/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.datamodel" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.datamodel.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/DataModel/manifest.mf b/DataModel/manifest.mf
deleted file mode 100644
index 96d427757f5bcde881b28bbc55f20ebe1c33eb5c..0000000000000000000000000000000000000000
--- a/DataModel/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.datamodel/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Install: org/sleuthkit/autopsy/datamodel/Installer.class
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/datamodel/Bundle.properties
-
diff --git a/DataModel/nbproject/build-impl.xml b/DataModel/nbproject/build-impl.xml
deleted file mode 100644
index 93e8e0c4d47d1dd2f93229f84ab05980a16e5970..0000000000000000000000000000000000000000
--- a/DataModel/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.datamodel-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/DataModel/nbproject/genfiles.properties b/DataModel/nbproject/genfiles.properties
deleted file mode 100644
index 80fe34e47bb67c19086fab933ca86c6da82deb4b..0000000000000000000000000000000000000000
--- a/DataModel/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=3fc9375e
-build.xml.script.CRC32=3bd58878
-build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d5d42932
-nbproject/build-impl.xml.script.CRC32=b0a13adb
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1
diff --git a/DataModel/nbproject/project.properties b/DataModel/nbproject/project.properties
deleted file mode 100644
index 61347460e80111aca85d8b431a81464fa52680f5..0000000000000000000000000000000000000000
--- a/DataModel/nbproject/project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-file.reference.sqlite-jdbc-3.7.2.jar=release/modules/ext/sqlite-jdbc-3.7.2.jar
-file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0
diff --git a/DataModel/nbproject/project.xml b/DataModel/nbproject/project.xml
deleted file mode 100644
index c57866e1848b74dad75c11c5c74e8ecb581ef225..0000000000000000000000000000000000000000
--- a/DataModel/nbproject/project.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.17.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.16.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.datamodel</package>
-                <package>org.sleuthkit.datamodel</package>
-                <package>org.sqlite</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sqlite-jdbc-3.7.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sqlite-jdbc-3.7.2.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/DataModel/nbproject/suite.properties b/DataModel/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/DataModel/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/DirectoryTree/build.xml b/DirectoryTree/build.xml
deleted file mode 100644
index 72c3163bdff9f337757666d3885239fd7f9453fb..0000000000000000000000000000000000000000
--- a/DirectoryTree/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.directorytree" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.directorytree.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/DirectoryTree/manifest.mf b/DirectoryTree/manifest.mf
deleted file mode 100644
index e4bff5d5869acc836d956914ee711655aff23427..0000000000000000000000000000000000000000
--- a/DirectoryTree/manifest.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.directorytree/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/directorytree/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/directorytree/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
diff --git a/DirectoryTree/nbproject/build-impl.xml b/DirectoryTree/nbproject/build-impl.xml
deleted file mode 100644
index 3892441abf1983e48f7f8147fce7c1dd3dc6702a..0000000000000000000000000000000000000000
--- a/DirectoryTree/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.directorytree-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/DirectoryTree/nbproject/genfiles.properties b/DirectoryTree/nbproject/genfiles.properties
deleted file mode 100644
index 8daff11fc7749e26d4400f4dccb005a2cb555b3c..0000000000000000000000000000000000000000
--- a/DirectoryTree/nbproject/genfiles.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-build.xml.data.CRC32=bbbdb9c3
-build.xml.script.CRC32=6ec7becb
-<<<<<<< HEAD
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.1
-=======
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
->>>>>>> 027e7f978acdcc92eac7e7aa9d717f77c3f6241d
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=bbbdb9c3
-nbproject/build-impl.xml.script.CRC32=8c5007a7
-<<<<<<< HEAD
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.1
-=======
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
->>>>>>> 027e7f978acdcc92eac7e7aa9d717f77c3f6241d
diff --git a/DirectoryTree/nbproject/project.properties b/DirectoryTree/nbproject/project.properties
deleted file mode 100644
index dfb8984e1ef97ec9de6dded23617f2446f6ceb0d..0000000000000000000000000000000000000000
--- a/DirectoryTree/nbproject/project.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-javahelp.hs=directorytree-hs.xml
-spec.version.base=1.0
diff --git a/DirectoryTree/nbproject/project.xml b/DirectoryTree/nbproject/project.xml
deleted file mode 100644
index ccf47cacd57fe5a05cef6eac586b05569bcd8e58..0000000000000000000000000000000000000000
--- a/DirectoryTree/nbproject/project.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.26.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.28.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.17.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.16.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.33.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.directorytree</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git a/DirectoryTree/nbproject/suite.properties b/DirectoryTree/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/DirectoryTree/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/ExifParser/nbproject/project.xml b/ExifParser/nbproject/project.xml
index 34872f6afc7e09324b34819354d25ba70e7a1ead..a467e17c204279c9bbc0fad0e9af6f7a3f3b8edf 100644
--- a/ExifParser/nbproject/project.xml
+++ b/ExifParser/nbproject/project.xml
@@ -7,29 +7,11 @@
             <suite-component/>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
+                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
+                        <release-version>3</release-version>
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
diff --git a/FileSearch/build.xml b/FileSearch/build.xml
deleted file mode 100644
index 78e6fe7c494bc8efede68d924934fc9bd53a6314..0000000000000000000000000000000000000000
--- a/FileSearch/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.filesearch" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.filesearch.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/FileSearch/manifest.mf b/FileSearch/manifest.mf
deleted file mode 100644
index 01896c1fafd3a3282bfbb14ef2da7995bd1028e5..0000000000000000000000000000000000000000
--- a/FileSearch/manifest.mf
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.filesearch/1
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/filesearch/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/filesearch/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
-
diff --git a/FileSearch/nbproject/build-impl.xml b/FileSearch/nbproject/build-impl.xml
deleted file mode 100644
index 84890932f969652f5918ec409e655d57d9f20d28..0000000000000000000000000000000000000000
--- a/FileSearch/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.filesearch-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/FileSearch/nbproject/genfiles.properties b/FileSearch/nbproject/genfiles.properties
deleted file mode 100644
index 0f6adbd481fa86dcaa0a4a0a7868f81a4e80a461..0000000000000000000000000000000000000000
--- a/FileSearch/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=ad8ce357
-build.xml.script.CRC32=c0009852
-build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ad8ce357
-nbproject/build-impl.xml.script.CRC32=2e520747
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1
diff --git a/FileSearch/nbproject/project.properties b/FileSearch/nbproject/project.properties
deleted file mode 100644
index 71455996f2d31407083b23f7992e0b9340b04ef2..0000000000000000000000000000000000000000
--- a/FileSearch/nbproject/project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-file.reference.jcalendarbutton-1.4.5.jar=release/modules/ext/jcalendarbutton-1.4.5.jar
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-javahelp.hs=filesearch-hs.xml
-spec.version.base=1.0
diff --git a/FileSearch/nbproject/project.xml b/FileSearch/nbproject/project.xml
deleted file mode 100644
index 6973f76a3c87806935c3021ba858e5dc7e3be2e4..0000000000000000000000000000000000000000
--- a/FileSearch/nbproject/project.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.filesearch</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.26.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.28.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.16.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.33.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.filesearch</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/jcalendarbutton-1.4.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcalendarbutton-1.4.5.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/FileSearch/nbproject/suite.properties b/FileSearch/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/FileSearch/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/FileSearch/release/modules/ext/jcalendarbutton-1.4.5.jar b/FileSearch/release/modules/ext/jcalendarbutton-1.4.5.jar
deleted file mode 100644
index 4128ca1e05a3e57d1b1a98cf56643daca8e102f2..0000000000000000000000000000000000000000
Binary files a/FileSearch/release/modules/ext/jcalendarbutton-1.4.5.jar and /dev/null differ
diff --git a/HashDatabase/nbproject/genfiles.properties b/HashDatabase/nbproject/genfiles.properties
index f53f934917663634355f31825ce04e5ac4d70fa0..faa3e5de44d6ca8e5f556d774c358c3223767af0 100644
--- a/HashDatabase/nbproject/genfiles.properties
+++ b/HashDatabase/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=656aafec
+build.xml.data.CRC32=b063abc7
 build.xml.script.CRC32=1308cb72
-build.xml.stylesheet.CRC32=a56c6a5b@2.47.2
+build.xml.stylesheet.CRC32=a56c6a5b@2.50.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=656aafec
+nbproject/build-impl.xml.data.CRC32=b063abc7
 nbproject/build-impl.xml.script.CRC32=a7a0d07a
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
diff --git a/HashDatabase/nbproject/project.xml b/HashDatabase/nbproject/project.xml
index 46be1b008f41014ad6d1fb87cd8e2954b2a5331c..ebf730a62bacb4c67924b4ea14c24b489a3dfe8a 100644
--- a/HashDatabase/nbproject/project.xml
+++ b/HashDatabase/nbproject/project.xml
@@ -81,51 +81,6 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.hashdatabase</package>
diff --git a/Ingest/build.xml b/Ingest/build.xml
deleted file mode 100644
index 94f6839400ce159812dfa7bbad58e5a22e925e65..0000000000000000000000000000000000000000
--- a/Ingest/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.ingest" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.ingest.</description>
-    <import file="nbproject/build-impl.xml"/>
-    
-    <!-- TODO move iby setup to global project build.xml and reuse the target in modules -->
-     
-    <property name="ivy.install.version" value="2.1.0-rc2" />
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-        <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${user.home}/.ant" />
-    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
-    <target name="download-ivy" unless="offline">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
-         dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-
-    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
-    <target name="init-ivy" depends="download-ivy">
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
- 
-
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
-        
-        <!-- fetch all the dependencies from Ivy and stick them in the right places -->
-        <ivy:resolve/>
-        <ivy:retrieve conf="autopsy_ingest" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
-    </target>
-    
- 
-</project>
diff --git a/Ingest/ivy.xml b/Ingest/ivy.xml
deleted file mode 100644
index 021e59e848a87d48fa6eaa8ab46e1901420c74f5..0000000000000000000000000000000000000000
--- a/Ingest/ivy.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<ivy-module version="2.0">
-    <info organisation="org.sleuthkit.autopsy" module="ingest"/>
-    <configurations >
-        <!-- module dependencies -->
-        <conf name="autopsy_ingest"/>
-        
-    </configurations>
-    <dependencies>
-        <dependency conf="autopsy_ingest->*" org="org.reflections" name="reflections" rev="0.9.8"/>
-    </dependencies>
-</ivy-module>
diff --git a/Ingest/manifest.mf b/Ingest/manifest.mf
deleted file mode 100644
index 1d03b58a286f9a28019d6f53ff9a99131880a91e..0000000000000000000000000000000000000000
--- a/Ingest/manifest.mf
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.ingest/0
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/ingest/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/ingest/Bundle.properties
-OpenIDE-Module-Implementation-Version: 1
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Install: org/sleuthkit/autopsy/ingest/Installer.class
-
diff --git a/Ingest/nbproject/build-impl.xml b/Ingest/nbproject/build-impl.xml
deleted file mode 100644
index 3362f1bf2764a96cbd6da6f5443b48a47c6c446f..0000000000000000000000000000000000000000
--- a/Ingest/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.ingest-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/Ingest/nbproject/genfiles.properties b/Ingest/nbproject/genfiles.properties
deleted file mode 100644
index 19e255d2d6fad2fc1f402964c82c04c185fda0c7..0000000000000000000000000000000000000000
--- a/Ingest/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=66f8017d
-build.xml.script.CRC32=7d5a04db
-build.xml.stylesheet.CRC32=a56c6a5b@2.50.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a7211e8a
-nbproject/build-impl.xml.script.CRC32=8b2da6d1
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
diff --git a/Ingest/nbproject/project.properties b/Ingest/nbproject/project.properties
deleted file mode 100644
index 9845ba9bceeab49a0a63a88e5a171c6cc96f25f0..0000000000000000000000000000000000000000
--- a/Ingest/nbproject/project.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0
diff --git a/Ingest/nbproject/project.xml b/Ingest/nbproject/project.xml
deleted file mode 100644
index 56daaa6b428413da19af7652ce6e74fd3bae4f7f..0000000000000000000000000000000000000000
--- a/Ingest/nbproject/project.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.24.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.osgi</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.javahelp</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.22.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.settings</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.31.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.20.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.62.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.21.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.8.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.40.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.ingest</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/Ingest/nbproject/suite.properties b/Ingest/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/Ingest/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/KeywordSearch/nbproject/genfiles.properties b/KeywordSearch/nbproject/genfiles.properties
index dd5d6063937a7ac635304c6722379e8bdbcab0a8..b2d8509e8242d34579fb14313ab2127ab43a74c1 100644
--- a/KeywordSearch/nbproject/genfiles.properties
+++ b/KeywordSearch/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=87b97b04
 build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ab518119
+nbproject/build-impl.xml.data.CRC32=1cff292d
 nbproject/build-impl.xml.script.CRC32=fe1f48d2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 5814391266a3e8770978fec34dfea31d0582a114..a97e9c2a64354eb2f3c7b38cd8b907f4df2212fe 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -99,60 +99,6 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.keywordsearch</package>
diff --git a/MenuActions/build.xml b/MenuActions/build.xml
deleted file mode 100644
index 7f26f62e4a33bceb714ef0e0104b1ddcb68460f4..0000000000000000000000000000000000000000
--- a/MenuActions/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.menuactions" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.menuactions.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/MenuActions/manifest.mf b/MenuActions/manifest.mf
deleted file mode 100644
index f3b9849580e852cc9d4432a59517b7054f302834..0000000000000000000000000000000000000000
--- a/MenuActions/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.menuactions/0
-OpenIDE-Module-Implementation-Version: 2
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/menuactions/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/menuactions/Bundle.properties
-
diff --git a/MenuActions/nbproject/build-impl.xml b/MenuActions/nbproject/build-impl.xml
deleted file mode 100644
index 2502efc722f978087e7cd3d081fa84c301aa94a3..0000000000000000000000000000000000000000
--- a/MenuActions/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.menuactions-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/MenuActions/nbproject/genfiles.properties b/MenuActions/nbproject/genfiles.properties
deleted file mode 100644
index e7f943c626d23b0394e9340755c4cc9fc83118e6..0000000000000000000000000000000000000000
--- a/MenuActions/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=540a1acf
-build.xml.script.CRC32=46209f11
-build.xml.stylesheet.CRC32=a56c6a5b@2.47.1
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=540a1acf
-nbproject/build-impl.xml.script.CRC32=cb422238
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.47.1
diff --git a/MenuActions/nbproject/project.properties b/MenuActions/nbproject/project.properties
deleted file mode 100644
index c51692cafc19134f77f8ba341594b3e9ff4df820..0000000000000000000000000000000000000000
--- a/MenuActions/nbproject/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=0.0
diff --git a/MenuActions/nbproject/project.xml b/MenuActions/nbproject/project.xml
deleted file mode 100644
index 4b59859ff13c6cf9c7186a424876af9fdc4096f1..0000000000000000000000000000000000000000
--- a/MenuActions/nbproject/project.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.menuactions</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.23.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.28.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.17.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.6.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.3.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.33.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.filesearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.menuactions</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>
diff --git a/MenuActions/nbproject/suite.properties b/MenuActions/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/MenuActions/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/RecentActivity/nbproject/genfiles.properties b/RecentActivity/nbproject/genfiles.properties
index 4c0e27f2a100a99c34c2898818c332df958d63d2..d4ac7bfc015177952ae3977c05cd9993f0007339 100644
--- a/RecentActivity/nbproject/genfiles.properties
+++ b/RecentActivity/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f8013a8e
+build.xml.data.CRC32=34206c83
 build.xml.script.CRC32=d323407a
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
+build.xml.stylesheet.CRC32=a56c6a5b@2.50.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=f8013a8e
+nbproject/build-impl.xml.data.CRC32=34206c83
 nbproject/build-impl.xml.script.CRC32=aef16a21
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 0fbbfa2608c880a3834487e6c3e6734c8a58d06e..86c21f0eb364c2bd139e47924b7aa86dd492ec19 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -31,78 +31,6 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.filesearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.keywordsearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.recentactivity</package>
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index ac44fc9a617a4fb1abeed877d55c5ea677fbf6f8..ca9f2764d81d2447d513f2fbd3345c414219291c 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -29,6 +29,7 @@
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.IngestModuleImage;
+import org.sleuthkit.autopsy.report.SQLiteDBConnect;
 import org.sleuthkit.datamodel.*;
 
 abstract public class Extract implements IngestModuleImage{
@@ -122,7 +123,7 @@ public List<HashMap<String,Object>> dbConnect(String path, String query) {
         List<HashMap<String,Object>> list = new ArrayList<HashMap<String,Object>>();
         String connectionString = "jdbc:sqlite:" + path;
         try {
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", connectionString);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", connectionString);
             temprs = tempdbconnect.executeQry(query);
             list = this.resultSetToArrayList(temprs);
             tempdbconnect.closeConnection();
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
index 8b59cddf6c3ec0232e557d7e4754b67822a69aed..83af2c509cb574038b91874519b609a6158cac5f 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
@@ -43,6 +43,7 @@
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.FsContent;
 import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.autopsy.report.SQLiteDBConnect;
 
 /**
  *
@@ -244,7 +245,7 @@ public static boolean checkColumn(String column, String tablename, String connec
         boolean found = false;
         ResultSet temprs;
         try {
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
             temprs = tempdbconnect.executeQry(query);
             while (temprs.next()) {
                 if (temprs.getString("name") == null ? column == null : temprs.getString("name").equals(column)) {
@@ -260,7 +261,7 @@ public static boolean checkColumn(String column, String tablename, String connec
     public static ResultSet runQuery(String query, String connection) {
         ResultSet results = null;
         try {
-            dbconnect tempdbconnect = new dbconnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
             results = tempdbconnect.executeQry(query);
             tempdbconnect.closeConnection();
         } catch (Exception ex) {
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/dbconnect.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/dbconnect.java
deleted file mode 100644
index 06e27939ee0d02091ee7f6da55c12b150ba13c0d..0000000000000000000000000000000000000000
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/dbconnect.java
+++ /dev/null
@@ -1,35 +0,0 @@
- /*
- *
- * Autopsy Forensic Browser
- * 
- * Copyright 2012 42six Solutions.
- * Contact: aebadirad <at> 42six <dot> com
- * Project Contact/Architect: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.recentactivity;
-
-import java.sql.*;
-
- public class dbconnect extends sqlitedbconnect{
-        
-        private String sDriverForclass = "org.sqlite.JDBC";
-        public dbconnect(String sDriverForClass, String sUrlKey) throws Exception
-        { 
-            init(sDriverForClass, sUrlKey); 
-           
-        }
-        
-        
-    }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/sqlitedbconnect.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/sqlitedbconnect.java
deleted file mode 100644
index ff1f83726da549cac7a021d5d1f14ce70db55883..0000000000000000000000000000000000000000
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/sqlitedbconnect.java
+++ /dev/null
@@ -1,116 +0,0 @@
- /*
- *
- * Autopsy Forensic Browser
- * 
- * Copyright 2012 42six Solutions.
- * Contact: aebadirad <at> 42six <dot> com
- * Project Contact/Architect: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.recentactivity;
-
-
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
- 
- 
-/** Database connection class & utilities **/
- 
-abstract class sqlitedbconnect {
- 
-public  String sDriver = ""; 
-public  String sUrl = null;
-public  int iTimeout = 30;
-public  Connection conn = null;
-public  Statement statement = null;
- 
- 
-/* Stub constructor for quick instantiation o/t fly for using some of the ancillary stuff */
- 
-public  sqlitedbconnect()
-{}
- 
-/* quick and dirty constructor to test the database passing the DriverManager name and the fully loaded url to handle */
-/* NB this will typically be available if you make this class concrete and not abstract */
-public sqlitedbconnect(String sDriverToLoad, String sUrlToLoad) throws Exception
-{
-init(sDriverToLoad, sUrlToLoad);
-}
- 
-public void init(String sDriverVar, String sUrlVar) throws Exception
-{
-setDriver(sDriverVar);
-setUrl(sUrlVar);
-setConnection();
-setStatement();
-}
- 
-private void setDriver(String sDriverVar)
-{
-sDriver = sDriverVar;
-}
- 
-private void setUrl(String sUrlVar)
-{
-sUrl = sUrlVar;
-}
- 
-public  void setConnection() throws Exception {
-Class.forName(sDriver);
-conn = DriverManager.getConnection(sUrl);
-}
- 
- 
-public  Connection getConnection() {
-return conn;
-}
- 
-public  void setStatement() throws Exception {
-if (conn == null) {
-setConnection();
-}
-statement = conn.createStatement();
-statement.setQueryTimeout(iTimeout);  // set timeout to 30 sec.
-}
- 
-public  Statement getStatement() {
-return statement;
-}
- 
-public  void executeStmt(String instruction) throws SQLException {
-statement.executeUpdate(instruction);
-}
- 
-// processes an array of instructions e.g. a set of SQL command strings passed from a file
-//NB you should ensure you either handle empty lines in files by either removing them or parsing them out 
-// since they will generate spurious SQLExceptions when they are encountered during the iteration....
-public void executeStmt(String[] instructionSet) throws SQLException {
-for (int i = 0; i < instructionSet.length; i++) {
-executeStmt(instructionSet[i]);
-}
-}
- 
-public ResultSet executeQry(String instruction) throws SQLException {
-return statement.executeQuery(instruction);
-} 
- 
-public void closeConnection() {
-try { conn.close(); } catch (Exception ignore) {}
-}
- 
-}
\ No newline at end of file
diff --git a/Report/build.xml b/Report/build.xml
deleted file mode 100644
index 0f748b1a4facf9b238eca1f84865a169af927c85..0000000000000000000000000000000000000000
--- a/Report/build.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.report" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.report.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>
diff --git a/Report/manifest.mf b/Report/manifest.mf
deleted file mode 100644
index fba45279dfb0a12740a976cbde90e0e8dce330f4..0000000000000000000000000000000000000000
--- a/Report/manifest.mf
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: false
-OpenIDE-Module: org.sleuthkit.autopsy.report
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/report/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/report/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-
diff --git a/Report/nbproject/build-impl.xml b/Report/nbproject/build-impl.xml
deleted file mode 100644
index 47cde351062eeeabc3d82d2ee126bf72e8b971f6..0000000000000000000000000000000000000000
--- a/Report/nbproject/build-impl.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.report-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>
diff --git a/Report/nbproject/genfiles.properties b/Report/nbproject/genfiles.properties
deleted file mode 100644
index b3954a5498f8018df78c7c106acc1d74e5aa8227..0000000000000000000000000000000000000000
--- a/Report/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=d1b02431
-build.xml.script.CRC32=bbb1c310
-build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=d1b02431
-nbproject/build-impl.xml.script.CRC32=1562aec2
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
diff --git a/Report/nbproject/platform.properties b/Report/nbproject/platform.properties
deleted file mode 100644
index 38ecd5a92ebea2c14710d0595bdd2d6df0bafcf4..0000000000000000000000000000000000000000
--- a/Report/nbproject/platform.properties
+++ /dev/null
@@ -1,99 +0,0 @@
-cluster.path=\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.jsr223,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.j2ee.toplinklib,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.processor,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.jellytools,\
-    org.netbeans.modules.jellytools.java,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.swingapp,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.openide.compat,\
-    org.openide.util.enumerations
-nbplatform.active=default
diff --git a/Report/nbproject/project.properties b/Report/nbproject/project.properties
deleted file mode 100644
index 7e9bd4ee5424d6a211a40d2a977835712169f9e5..0000000000000000000000000000000000000000
--- a/Report/nbproject/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
-file.reference.jdom-1.1.2.jar=release/modules/ext/jdom-1.1.2.jar
-file.reference.junit-3.8.1.jar=release/modules/ext/junit-3.8.1.jar
-file.reference.log4j-1.2.13.jar=release/modules/ext/log4j-1.2.13.jar
-file.reference.poi-3.8-20120326.jar=release/modules/ext/poi-3.8-20120326.jar
-file.reference.poi-excelant-3.8-20120326.jar=release/modules/ext/poi-excelant-3.8-20120326.jar
-file.reference.poi-ooxml-3.8-20120326.jar=release/modules/ext/poi-ooxml-3.8-20120326.jar
-file.reference.poi-ooxml-schemas-3.8-20120326.jar=release/modules/ext/poi-ooxml-schemas-3.8-20120326.jar
-file.reference.poi-scratchpad-3.8-20120326.jar=release/modules/ext/poi-scratchpad-3.8-20120326.jar
-file.reference.stax-api-1.0.1.jar=release/modules/ext/stax-api-1.0.1.jar
-file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/Report/nbproject/project.xml b/Report/nbproject/project.xml
deleted file mode 100644
index bb8ccdb2a255a4c0b81465780c4cda8fa9470786..0000000000000000000000000000000000000000
--- a/Report/nbproject/project.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.report</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.31.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.21.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.15.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.8.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponentinterfaces</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corecomponents</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.directorytree</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.filesearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.keywordsearch</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.recentactivity</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-excelant-3.8-20120326.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-excelant-3.8-20120326.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/junit-3.8.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/junit-3.8.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang-2.4.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-3.8-20120326.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8-20120326.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jdom-1.1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-1.1.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-3.8-20120326.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-3.8-20120326.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-3.8-20120326.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-3.8-20120326.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-3.8-20120326.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-3.8-20120326.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/stax-api-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/stax-api-1.0.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/log4j-1.2.13.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/log4j-1.2.13.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>
diff --git a/Report/nbproject/suite.properties b/Report/nbproject/suite.properties
deleted file mode 100644
index 29d7cc9bd6fdd81453543cdf1bcf1dab301e3a92..0000000000000000000000000000000000000000
--- a/Report/nbproject/suite.properties
+++ /dev/null
@@ -1 +0,0 @@
-suite.dir=${basedir}/..
diff --git a/Report/release/modules/ext/commons-lang-2.4.jar b/Report/release/modules/ext/commons-lang-2.4.jar
deleted file mode 100644
index 532939ecab6b77ccb77af3635c55ff9752b70ab7..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/commons-lang-2.4.jar and /dev/null differ
diff --git a/Report/release/modules/ext/commons-logging-1.1.1.jar b/Report/release/modules/ext/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144cb17ed2c11c6cdcdcb2d9530fa8d0b47..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/Report/release/modules/ext/dom4j-1.6.1.jar b/Report/release/modules/ext/dom4j-1.6.1.jar
deleted file mode 100644
index c8c4dbb92d6c23a7fbb2813eb721eb4cce91750c..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/dom4j-1.6.1.jar and /dev/null differ
diff --git a/Report/release/modules/ext/jdom-1.1.2.jar b/Report/release/modules/ext/jdom-1.1.2.jar
deleted file mode 100644
index b8091efa2fde464c073cc269ff7fcc8beee6121a..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/jdom-1.1.2.jar and /dev/null differ
diff --git a/Report/release/modules/ext/junit-3.8.1.jar b/Report/release/modules/ext/junit-3.8.1.jar
deleted file mode 100644
index 674d71e89ea154dbe2e3cd032821c22b39e8fd68..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/junit-3.8.1.jar and /dev/null differ
diff --git a/Report/release/modules/ext/log4j-1.2.13.jar b/Report/release/modules/ext/log4j-1.2.13.jar
deleted file mode 100644
index dde9972109dd25f14f732052984b0d3719b17795..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/log4j-1.2.13.jar and /dev/null differ
diff --git a/Report/release/modules/ext/poi-3.8-20120326.jar b/Report/release/modules/ext/poi-3.8-20120326.jar
deleted file mode 100644
index edc0ee59b8b2621a420f6255d37f9d9a97eedc95..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/poi-3.8-20120326.jar and /dev/null differ
diff --git a/Report/release/modules/ext/poi-excelant-3.8-20120326.jar b/Report/release/modules/ext/poi-excelant-3.8-20120326.jar
deleted file mode 100644
index ad39033cfe4acf6ca4a62de137cabf7595d13551..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/poi-excelant-3.8-20120326.jar and /dev/null differ
diff --git a/Report/release/modules/ext/poi-ooxml-3.8-20120326.jar b/Report/release/modules/ext/poi-ooxml-3.8-20120326.jar
deleted file mode 100644
index 9175c16d95b8caa9f3d7c01e808ce882794715b4..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/poi-ooxml-3.8-20120326.jar and /dev/null differ
diff --git a/Report/release/modules/ext/poi-ooxml-schemas-3.8-20120326.jar b/Report/release/modules/ext/poi-ooxml-schemas-3.8-20120326.jar
deleted file mode 100644
index 2372d1edfb8b19e4b9160b7b7e78eecd83a3b434..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/poi-ooxml-schemas-3.8-20120326.jar and /dev/null differ
diff --git a/Report/release/modules/ext/poi-scratchpad-3.8-20120326.jar b/Report/release/modules/ext/poi-scratchpad-3.8-20120326.jar
deleted file mode 100644
index 02e52e848ddd682775ca0024c800abe201d4ff3b..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/poi-scratchpad-3.8-20120326.jar and /dev/null differ
diff --git a/Report/release/modules/ext/stax-api-1.0.1.jar b/Report/release/modules/ext/stax-api-1.0.1.jar
deleted file mode 100644
index d9a1665151cf5ba827d15f9bccc35dc77b57cf98..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/stax-api-1.0.1.jar and /dev/null differ
diff --git a/Report/release/modules/ext/xmlbeans-2.3.0.jar b/Report/release/modules/ext/xmlbeans-2.3.0.jar
deleted file mode 100644
index ccd8163421ba8d0361315fb947f2432f1e6d7a83..0000000000000000000000000000000000000000
Binary files a/Report/release/modules/ext/xmlbeans-2.3.0.jar and /dev/null differ
diff --git a/Testing/nbproject/genfiles.properties b/Testing/nbproject/genfiles.properties
index b4f5cac4ea5575ffa0bf365cff7e8b644f18b712..338c1946af8e6a243f9d62b27125a43041de0575 100644
--- a/Testing/nbproject/genfiles.properties
+++ b/Testing/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=323ed73c
 build.xml.stylesheet.CRC32=a56c6a5b@1.46.2
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=64fc7023
+nbproject/build-impl.xml.data.CRC32=9e7b1a5d
 nbproject/build-impl.xml.script.CRC32=d8a1ea41
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.46.2
+nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.50.1
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index 8511bfbed8d7c35420fd622402161464aa13892e..fc139d51d3b2eacc973184c4a7010d3f7e81f361 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -7,11 +7,11 @@
             <suite-component/>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
+                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>0-1</release-version>
+                        <release-version>3</release-version>
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
diff --git a/build-unix.xml b/build-unix.xml
index 256817c6817964d8e64f33807140345840962513..2bafbec69d9e02cf0f1d9fa1aff52ef1a3283062 100644
--- a/build-unix.xml
+++ b/build-unix.xml
@@ -8,13 +8,13 @@
     <!-- OS X -->
     <target name="copyTskLibs_dylib" depends="testTSKLibs" if="tsk_dylib.present">
         <property environment="env"/>
-        <copy file="${env.TSK_HOME}/bindings/java/jni/.libs/libtsk_jni.dylib" tofile="${basedir}/DataModel/release/modules/lib/libtsk_jni.jnilib"/>
+        <copy file="${env.TSK_HOME}/bindings/java/jni/.libs/libtsk_jni.dylib" tofile="${basedir}/Core/release/modules/lib/libtsk_jni.jnilib"/>
     </target>
     
     <!-- Non-OS X -->
     <target name="copyTskLibs_so" depends="testTSKLibs" if="tsk_so.present">
         <property environment="env"/>
-        <copy file="${env.TSK_HOME}/bindings/java/jni/.libs/libtsk_jni.so" tofile="${basedir}/DataModel/release/modules/lib/libtsk_jni.so"/>
+        <copy file="${env.TSK_HOME}/bindings/java/jni/.libs/libtsk_jni.so" tofile="${basedir}/Core/release/modules/lib/libtsk_jni.so"/>
     </target>
     
     <target name="copyTSKLibsToRelease" depends="copyTskLibs_so,copyTskLibs_dylib">
diff --git a/build-windows.xml b/build-windows.xml
index 03e2a09e4ced654b87af4ec5a80ac2cc55206301..cd874edb5dc2a4de18e4c7c11a3dcbd674768faf 100755
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -10,9 +10,9 @@
         </condition>
         <fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/>
 
-        <copy file="${env.TSK_HOME}/win32/${TSK_BUILD_TYPE}/libtsk_jni.dll" tofile="${basedir}/DataModel/release/modules/lib/libtsk_jni.dll"/>
-        <copy file="${env.LIBEWF_HOME}/msvscpp/Release/libewf.dll" tofile="${basedir}/DataModel/release/modules/lib/libewf.dll"/> 
-        <copy file="${env.LIBEWF_HOME}/msvscpp/Release/zlib.dll" tofile="${basedir}/DataModel/release/modules/lib/zlib.dll"/>
+        <copy file="${env.TSK_HOME}/win32/${TSK_BUILD_TYPE}/libtsk_jni.dll" tofile="${basedir}/Core/release/modules/lib/libtsk_jni.dll"/>
+        <copy file="${env.LIBEWF_HOME}/msvscpp/Release/libewf.dll" tofile="${basedir}/Core/release/modules/lib/libewf.dll"/> 
+        <copy file="${env.LIBEWF_HOME}/msvscpp/Release/zlib.dll" tofile="${basedir}/Core/release/modules/lib/zlib.dll"/>
     </target>
     
     <target name="copyExternalLibsToZip">
diff --git a/build.xml b/build.xml
index add9afcf4f47b5efee8ffbe863d7cbb3ceeb5a28..798819a6633be12608ef9eb07e08f9b3ad7dbf53 100644
--- a/build.xml
+++ b/build.xml
@@ -57,8 +57,10 @@
 
     <target name="getExternals" depends="findTSK,copyTSKLibsToRelease">
         <property environment="env"/>
-        <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/DataModel/release/modules/ext/Tsk_DataModel.jar"/>
-        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/DataModel/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
+       <!-- Done in core module 
+        <copy file="${env.TSK_HOME}/bindings/java/dist/Tsk_DataModel.jar" tofile="${basedir}/Core/release/modules/ext/Tsk_DataModel.jar"/>
+        <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/Core/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
+        -->
     </target>
     
      <target name="getJunit">
@@ -162,7 +164,7 @@
         
         <echo>${app.name} branding</echo>
         
-        <copy file="${basedir}/branding_${app.name}/welcome_logo.png" tofile="${basedir}/Coresrc/org/sleuthkit/autopsy/casemodule/welcome_logo.png" overwrite="true"/>
+        <copy file="${basedir}/branding_${app.name}/welcome_logo.png" tofile="${basedir}/Core/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png" overwrite="true"/>
         
         <propertyfile
         file="${branding.dir}/core/core.jar/org/netbeans/core/startup/Bundle.properties" 
@@ -178,7 +180,7 @@
         </propertyfile>
         
         <propertyfile
-        file="${basedir}/CoreUtils/src/org/sleuthkit/autopsy/coreutils/Version.properties"
+        file="${basedir}/Core/src/org/sleuthkit/autopsy/CoreUtils/Version.properties"
         comment="Updated by build script">
             <entry key="app.name" value="${app.title}" />
             <entry key="app.version" value="${app.version}" />
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 6027b64394ac59b0aa6264018fedc560c5b1a8fe..edc7235fde6919f97d3d3158572add2d0001b620 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -660,17 +660,9 @@ INPUT                  = main.dox workflow.dox \
                          modResult.dox platformConcepts.dox \
                          regressionTesting.dox \
                          ../../Core/src \
-                         ../../CoreComponentInterfaces/src \
-                         ../../CoreComponents/src \
-                         ../../DataModel/src \
-                         ../../DirectoryTree/src \
-                         ../../FileSearch/src \
                          ../../HashDatabase/src \
-                         ../../Ingest/src \
                          ../../KeywordSearch/src \
-                         ../../MenuActions/src \
                          ../../RecentActivity/src \
-                         ../../Report/src \
                          ../../Testing/src \
                          ../../thunderbirdparser/src
 
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 9aecbbffb29434a7a362d3a42dd55be4f8ae4ade..f6d07c758c64acddc37f3dacdc3659554eb37fa7 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -16,35 +16,17 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
 auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
 branding.token=${app.name}
 modules=\
-    ${project.org.sleuthkit.autopsy.directorytree}:\
-    ${project.org.sleuthkit.autopsy.menuactions}:\
-    ${project.org.sleuthkit.autopsy.corecomponentinterfaces}:\
-    ${project.org.sleuthkit.autopsy.corecomponents}:\
-    ${project.org.sleuthkit.autopsy.filesearch}:\
-    ${project.org.sleuthkit.autopsy.datamodel}:\
     ${project.org.sleuthkit.autopsy.keywordsearch}:\
-    ${project.org.sleuthkit.autopsy.coreutils}:\
-    ${project.org.sleuthkit.autopsy.ingest}:\
     ${project.org.sleuthkit.autopsy.hashdatabase}:\
     ${project.org.sleuthkit.autopsy.recentactivity}:\
-    ${project.org.sleuthkit.autopsy.report}:\
     ${project.org.sleuthkit.autopsy.testing}:\
     ${project.org.sleuthkit.autopsy.thunderbirdparser}:\
     ${project.org.sleuthkit.autopsy.exifparser}:\
     ${project.org.sleuthkit.autopsy.core}
 project.org.sleuthkit.autopsy.core=Core
-project.org.sleuthkit.autopsy.corecomponentinterfaces=CoreComponentInterfaces
-project.org.sleuthkit.autopsy.corecomponents=CoreComponents
-project.org.sleuthkit.autopsy.coreutils=CoreUtils
-project.org.sleuthkit.autopsy.directorytree=DirectoryTree
-project.org.sleuthkit.autopsy.filesearch=FileSearch
 project.org.sleuthkit.autopsy.hashdatabase=HashDatabase
-project.org.sleuthkit.autopsy.ingest=Ingest
 project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
-project.org.sleuthkit.autopsy.menuactions=MenuActions
-project.org.sleuthkit.autopsy.datamodel=DataModel
 project.org.sleuthkit.autopsy.recentactivity=RecentActivity
-project.org.sleuthkit.autopsy.report=Report
 project.org.sleuthkit.autopsy.testing=Testing
 project.org.sleuthkit.autopsy.thunderbirdparser=thunderbirdparser
 project.org.sleuthkit.autopsy.exifparser=exifparser
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index ee4749305e693dc760b4316c9ff627159390d4bf..1c2ce5feb2d3023fa975da2a9712faafdd46c6c3 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -15,41 +15,6 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.coreutils</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.datamodel</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.ingest</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.recentactivity</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages/>
             <class-path-extension>