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 100%
rename from ZookeeperNodeMigration/.gitignore
rename to Tools/ZookeeperNodeMigration/.gitignore
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/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/dist/lib/curator-client-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar
rename to Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/guava-17.0.jar b/Tools/ZookeeperNodeMigration/release/guava-17.0.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/guava-17.0.jar
rename to Tools/ZookeeperNodeMigration/release/guava-17.0.jar
diff --git a/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar b/Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar
rename to Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar
diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar b/Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar
rename to Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar b/Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar
rename to Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
diff --git a/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar b/Tools/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar
similarity index 100%
rename from ZookeeperNodeMigration/dist/lib/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/ZookeeperNodeMigration/dist/README.TXT b/ZookeeperNodeMigration/dist/README.TXT
deleted file mode 100755
index 087be91dc3..0000000000
--- a/ZookeeperNodeMigration/dist/README.TXT
+++ /dev/null
@@ -1,32 +0,0 @@
-========================
-BUILD OUTPUT DESCRIPTION
-========================
-
-When you build an Java application project that has a main class, the IDE
-automatically copies all of the JAR
-files on the projects classpath to your projects dist/lib folder. The IDE
-also adds each of the JAR files to the Class-Path element in the application
-JAR files manifest file (MANIFEST.MF).
-
-To run the project from the command line, go to the dist folder and
-type the following:
-
-java -jar "ZookeeperNodeMigration.jar" 
-
-To distribute this project, zip up the dist folder (including the lib folder)
-and distribute the ZIP file.
-
-Notes:
-
-* If two JAR files on the project classpath have the same name, only the first
-JAR file is copied to the lib folder.
-* Only JAR files are copied to the lib folder.
-If the classpath contains other types of files or folders, these files (folders)
-are not copied.
-* If a library on the projects classpath also has a Class-Path element
-specified in the manifest,the content of the Class-Path element has to be on
-the projects runtime path.
-* To set a main class in a standard Java project, right-click the project node
-in the Projects window and choose Properties. Then click Run and enter the
-class name in the Main Class field. Alternatively, you can manually type the
-class name in the manifest Main-Class element.
diff --git a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar b/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar
deleted file mode 100755
index 92b11bc86a..0000000000
Binary files a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/curator-client-2.8.0.jar b/ZookeeperNodeMigration/release/curator-client-2.8.0.jar
deleted file mode 100755
index 4ccc265cc4..0000000000
Binary files a/ZookeeperNodeMigration/release/curator-client-2.8.0.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar b/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar
deleted file mode 100755
index 5e488892d1..0000000000
Binary files a/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar b/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar
deleted file mode 100755
index 34eb9c9677..0000000000
Binary files a/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/guava-17.0.jar b/ZookeeperNodeMigration/release/guava-17.0.jar
deleted file mode 100755
index 661fc7473f..0000000000
Binary files a/ZookeeperNodeMigration/release/guava-17.0.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/log4j-1.2.17.jar b/ZookeeperNodeMigration/release/log4j-1.2.17.jar
deleted file mode 100755
index 1d425cf7d7..0000000000
Binary files a/ZookeeperNodeMigration/release/log4j-1.2.17.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar b/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar
deleted file mode 100755
index 05941a12f0..0000000000
Binary files a/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar b/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar
deleted file mode 100755
index d1cc2456e4..0000000000
Binary files a/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar and /dev/null differ
diff --git a/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar b/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar
deleted file mode 100755
index 7c340be9f5..0000000000
Binary files a/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar and /dev/null differ
diff --git a/build.xml b/build.xml
index 7377d59c04..1cab40b475 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" />