diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 0af92464ed9d7e63a2bcf826f2ab663ae3f8f9e3..954207ceec7739aa3442fd823a2087865b785bc6
--- a/.gitignore
+++ b/.gitignore
@@ -1,91 +1,91 @@
-/dist/
-/build/
-/*/build/
-*/nbproject/private/*
-/nbproject/private/*
-
-/Core/release/
-/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties
-/Core/src/org/sleuthkit/autopsy/casemodule/docs/QuickStart.html
-/Core/src/org/sleuthkit/autopsy/casemodule/docs/screenshot.png
-/Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv
-/Core/build/
-/Core/dist/
-/Core/nbproject/*
-/Core/test/qa-functional/data/*
-!/Core/nbproject/project.xml
-!/Core/nbproject/project.properties
-
-/CoreLibs/release/
-/CoreLibs/build/
-/CoreLibs/dist/
-/CoreLibs/nbproject/*
-!/CoreLibs/nbproject/project.xml
-!/CoreLibs/nbproject/project.properties
-
-/Core/test/qa-functional/data/
-
-/KeywordSearch/release/
-/KeywordSearch/build/
-/KeywordSearch/dist/
-/KeywordSearch/nbproject/*
-!/KeywordSearch/nbproject/project.xml
-!/KeywordSearch/nbproject/project.properties
-
-*/genfiles.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
-/branding/build/
-/branding/dist/
-/branding/nbproject/*
-!/branding/nbproject/project.xml
-!/branding/nbproject/project.properties
-
-/test/input/*
-!/test/input/notablehashes.txt-md5.idx
-!/test/input/notablekeywords.xml
-!/test/input/NSRL.txt-md5.idx
-/test/output/*
-!/test/output/gold
-/test/script/output_dir_link.txt
-/test/output/gold/tmp
-/test/script/ScriptLog.txt
-/test/script/__pycache__/
-/test/script/*.pyc
-/test/script/DBDump-Diff.txt
-/test/script/DBDump.txt
-/test/script/SortedData-Diff.txt
-/test/script/SortedData.txt
-/test/script/myconfig.xml
-/test/script/*/*.xml
-/test/build/
-/test/dist/
-/test/nbproject/*
-
-!/Testing/nbproject/project.xml
-!/Testing/nbproject/project.properties
-*~
-/netbeans-plat
-/docs/doxygen-user/user-docs
-/jdiff-javadocs/*
-/jdiff-logs/*
-/gen_version.txt
-hs_err_pid*.log
-
-.DS_Store
-.*.swp
-/Experimental/release/
-/ImageGallery/release/
-/thunderbirdparser/release/
-/RecentActivity/release/
-/CentralRepository/release/
-/Tika/release
-
-.idea/
-*.iml
-
-*.img
-*.vhd
-*.E01
+/dist/
+/build/
+/*/build/
+*/nbproject/private/*
+/nbproject/private/*
+
+/Core/release/
+/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties
+/Core/src/org/sleuthkit/autopsy/casemodule/docs/QuickStart.html
+/Core/src/org/sleuthkit/autopsy/casemodule/docs/screenshot.png
+/Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv
+/Core/build/
+/Core/dist/
+/Core/nbproject/*
+/Core/test/qa-functional/data/*
+!/Core/nbproject/project.xml
+!/Core/nbproject/project.properties
+
+/CoreLibs/release/
+/CoreLibs/build/
+/CoreLibs/dist/
+/CoreLibs/nbproject/*
+!/CoreLibs/nbproject/project.xml
+!/CoreLibs/nbproject/project.properties
+
+/Core/test/qa-functional/data/
+
+/KeywordSearch/release/
+/KeywordSearch/build/
+/KeywordSearch/dist/
+/KeywordSearch/nbproject/*
+!/KeywordSearch/nbproject/project.xml
+!/KeywordSearch/nbproject/project.properties
+
+*/genfiles.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
+/branding/build/
+/branding/dist/
+/branding/nbproject/*
+!/branding/nbproject/project.xml
+!/branding/nbproject/project.properties
+
+/test/input/*
+!/test/input/notablehashes.txt-md5.idx
+!/test/input/notablekeywords.xml
+!/test/input/NSRL.txt-md5.idx
+/test/output/*
+!/test/output/gold
+/test/script/output_dir_link.txt
+/test/output/gold/tmp
+/test/script/ScriptLog.txt
+/test/script/__pycache__/
+/test/script/*.pyc
+/test/script/DBDump-Diff.txt
+/test/script/DBDump.txt
+/test/script/SortedData-Diff.txt
+/test/script/SortedData.txt
+/test/script/myconfig.xml
+/test/script/*/*.xml
+/test/build/
+/test/dist/
+/test/nbproject/*
+
+!/Testing/nbproject/project.xml
+!/Testing/nbproject/project.properties
+*~
+/netbeans-plat
+/docs/doxygen-user/user-docs
+/jdiff-javadocs/*
+/jdiff-logs/*
+/gen_version.txt
+hs_err_pid*.log
+
+.DS_Store
+.*.swp
+/Experimental/release/
+/ImageGallery/release/
+/thunderbirdparser/release/
+/RecentActivity/release/
+/CentralRepository/release/
+/Tika/release
+
+.idea/
+*.iml
+
+*.img
+*.vhd
+*.E01
diff --git a/ManifestTool/ManifestGenerationAlgorithms.au3 b/Tools/ManifestTool/ManifestGenerationAlgorithms.au3
similarity index 100%
rename from ManifestTool/ManifestGenerationAlgorithms.au3
rename to Tools/ManifestTool/ManifestGenerationAlgorithms.au3
diff --git a/ManifestTool/ManifestTool.au3 b/Tools/ManifestTool/ManifestTool.au3
similarity index 100%
rename from ManifestTool/ManifestTool.au3
rename to Tools/ManifestTool/ManifestTool.au3
diff --git a/ManifestTool/ManifestTool.exe b/Tools/ManifestTool/ManifestTool.exe
similarity index 100%
rename from ManifestTool/ManifestTool.exe
rename to Tools/ManifestTool/ManifestTool.exe
diff --git a/ZookeeperNodeMigration/.gitignore b/Tools/ZookeeperNodeMigration/.gitignore
similarity index 62%
rename from ZookeeperNodeMigration/.gitignore
rename to Tools/ZookeeperNodeMigration/.gitignore
index 0e56a449c757c3333320e858ada0ebab0df8aff1..46cba4a7dd698d3709a826334085e3365667fbad 100755
--- a/ZookeeperNodeMigration/.gitignore
+++ b/Tools/ZookeeperNodeMigration/.gitignore
@@ -1,3 +1,2 @@
/nbproject/private/
-/build/
-
+/build/
\ No newline at end of file
diff --git a/ZookeeperNodeMigration/build.xml b/Tools/ZookeeperNodeMigration/build.xml
similarity index 100%
rename from ZookeeperNodeMigration/build.xml
rename to Tools/ZookeeperNodeMigration/build.xml
diff --git a/ZookeeperNodeMigration/dist/README.TXT b/Tools/ZookeeperNodeMigration/dist/README.TXT
similarity index 100%
rename from ZookeeperNodeMigration/dist/README.TXT
rename to Tools/ZookeeperNodeMigration/dist/README.TXT
diff --git a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar b/Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar
similarity index 95%
rename from ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar
rename to Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar
index 92b11bc86ac07058ee7d31ad5a4a2028869611ca..b2bb4f8e60e391a085f784853532cb63e49d26f4 100755
Binary files a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar and b/Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar differ
diff --git a/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/guava-17.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/guava-17.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/guava-17.0.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/guava-17.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar b/Tools/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar
diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar b/Tools/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar
diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar b/Tools/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar
diff --git a/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar b/Tools/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar
rename to Tools/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar
diff --git a/ZookeeperNodeMigration/docs/README.TXT b/Tools/ZookeeperNodeMigration/docs/README.TXT
similarity index 100%
rename from ZookeeperNodeMigration/docs/README.TXT
rename to Tools/ZookeeperNodeMigration/docs/README.TXT
diff --git a/ZookeeperNodeMigration/manifest.mf b/Tools/ZookeeperNodeMigration/manifest.mf
similarity index 100%
rename from ZookeeperNodeMigration/manifest.mf
rename to Tools/ZookeeperNodeMigration/manifest.mf
diff --git a/ZookeeperNodeMigration/nbproject/build-impl.xml b/Tools/ZookeeperNodeMigration/nbproject/build-impl.xml
similarity index 100%
rename from ZookeeperNodeMigration/nbproject/build-impl.xml
rename to Tools/ZookeeperNodeMigration/nbproject/build-impl.xml
diff --git a/ZookeeperNodeMigration/nbproject/project.properties b/Tools/ZookeeperNodeMigration/nbproject/project.properties
similarity index 100%
rename from ZookeeperNodeMigration/nbproject/project.properties
rename to Tools/ZookeeperNodeMigration/nbproject/project.properties
diff --git a/ZookeeperNodeMigration/nbproject/project.xml b/Tools/ZookeeperNodeMigration/nbproject/project.xml
similarity index 100%
rename from ZookeeperNodeMigration/nbproject/project.xml
rename to Tools/ZookeeperNodeMigration/nbproject/project.xml
diff --git a/ZookeeperNodeMigration/release/curator-client-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/curator-client-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar
diff --git a/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
diff --git a/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
diff --git a/ZookeeperNodeMigration/release/guava-17.0.jar b/Tools/ZookeeperNodeMigration/release/guava-17.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/guava-17.0.jar
rename to Tools/ZookeeperNodeMigration/release/guava-17.0.jar
diff --git a/ZookeeperNodeMigration/release/log4j-1.2.17.jar b/Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/log4j-1.2.17.jar
rename to Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar
diff --git a/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar b/Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
rename to Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
diff --git a/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar b/Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
rename to Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
diff --git a/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar b/Tools/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/release/zookeeper-3.4.6.jar
rename to Tools/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar
diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java
similarity index 100%
rename from ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java
rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java
diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java
similarity index 100%
rename from ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java
rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java
diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java
similarity index 100%
rename from ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java
rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java
diff --git a/build.xml b/build.xml
index 7377d59c04f238240221b2ae1bb1b1fdf88f299c..1cab40b475aa3b9de225423530b2d0e8048a81dc 100644
--- a/build.xml
+++ b/build.xml
@@ -106,7 +106,7 @@
<copy file="${basedir}/NEWS.txt" tofile="${zip-tmp}/${app.name}/NEWS.txt"/>
<copy file="${basedir}/Running_Linux_OSX.txt" tofile="${zip-tmp}/${app.name}/Running_Linux_OSX.txt"/>
<copy file="${basedir}/unix_setup.sh" tofile="${zip-tmp}/${app.name}/unix_setup.sh"/>
- <copy file="${basedir}/ManifestTool/ManifestTool.exe" todir="${zip-tmp}/${app.name}/bin"/>
+ <copy file="${basedir}/Tools/ManifestTool/ManifestTool.exe" todir="${zip-tmp}/${app.name}/bin"/>
<copy file="${basedir}/icons/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
@@ -117,10 +117,10 @@
<!-- Copy the ZooKeeper migration tool, it's JAR files, and documentation -->
<copy flatten="false" todir="${zip-tmp}/${app.name}/autopsy/ZookeeperNodeMigration">
- <fileset dir="${basedir}/ZookeeperNodeMigration/dist"/>
+ <fileset dir="${basedir}/Tools/ZookeeperNodeMigration/dist"/>
</copy>
<copy flatten="false" todir="${zip-tmp}/${app.name}/autopsy/ZookeeperNodeMigration" overwrite="true">
- <fileset dir="${basedir}/ZookeeperNodeMigration/docs"/>
+ <fileset dir="${basedir}/Tools/ZookeeperNodeMigration/docs"/>
</copy>
<property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />