diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index 8a253dffb2..139000f80e 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -6,6 +6,8 @@ file.reference.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4
 file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar
 file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar
 file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar
+file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
+file.reference.commons-collections4-4.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\commons-collections4-4.2.jar
 file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar
 file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
 file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar
@@ -69,6 +71,7 @@ file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
 file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
 file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
 file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
+file.reference.xmlbeans-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 53c964f4f0..3fb511741d 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -65,6 +65,24 @@
                 <package>com.google.gson</package>
                 <package>com.google.gson.annotations</package>
                 <package>com.google.gson.reflect</package>
+                <package>com.microsoft.schemas.compatibility</package>
+                <package>com.microsoft.schemas.compatibility.impl</package>
+                <package>com.microsoft.schemas.office.excel</package>
+                <package>com.microsoft.schemas.office.excel.impl</package>
+                <package>com.microsoft.schemas.office.office</package>
+                <package>com.microsoft.schemas.office.office.impl</package>
+                <package>com.microsoft.schemas.office.visio.x2012.main</package>
+                <package>com.microsoft.schemas.office.visio.x2012.main.impl</package>
+                <package>com.microsoft.schemas.office.x2006.digsig</package>
+                <package>com.microsoft.schemas.office.x2006.digsig.impl</package>
+                <package>com.microsoft.schemas.office.x2006.encryption</package>
+                <package>com.microsoft.schemas.office.x2006.encryption.impl</package>
+                <package>com.microsoft.schemas.office.x2006.keyEncryptor.certificate</package>
+                <package>com.microsoft.schemas.office.x2006.keyEncryptor.certificate.impl</package>
+                <package>com.microsoft.schemas.office.x2006.keyEncryptor.password</package>
+                <package>com.microsoft.schemas.office.x2006.keyEncryptor.password.impl</package>
+                <package>com.microsoft.schemas.vml</package>
+                <package>com.microsoft.schemas.vml.impl</package>
                 <package>com.sun.activation.registries</package>
                 <package>com.sun.activation.viewers</package>
                 <package>com.sun.jna</package>
@@ -225,6 +243,32 @@
                 <package>org.apache.avalon.framework.parameters</package>
                 <package>org.apache.avalon.framework.service</package>
                 <package>org.apache.avalon.framework.thread</package>
+                <package>org.apache.commons.codec</package>
+                <package>org.apache.commons.codec.binary</package>
+                <package>org.apache.commons.codec.cli</package>
+                <package>org.apache.commons.codec.digest</package>
+                <package>org.apache.commons.codec.language</package>
+                <package>org.apache.commons.codec.language.bm</package>
+                <package>org.apache.commons.codec.net</package>
+                <package>org.apache.commons.collections4</package>
+                <package>org.apache.commons.collections4.bag</package>
+                <package>org.apache.commons.collections4.bidimap</package>
+                <package>org.apache.commons.collections4.collection</package>
+                <package>org.apache.commons.collections4.comparators</package>
+                <package>org.apache.commons.collections4.functors</package>
+                <package>org.apache.commons.collections4.iterators</package>
+                <package>org.apache.commons.collections4.keyvalue</package>
+                <package>org.apache.commons.collections4.list</package>
+                <package>org.apache.commons.collections4.map</package>
+                <package>org.apache.commons.collections4.multimap</package>
+                <package>org.apache.commons.collections4.multiset</package>
+                <package>org.apache.commons.collections4.properties</package>
+                <package>org.apache.commons.collections4.queue</package>
+                <package>org.apache.commons.collections4.sequence</package>
+                <package>org.apache.commons.collections4.set</package>
+                <package>org.apache.commons.collections4.splitmap</package>
+                <package>org.apache.commons.collections4.trie</package>
+                <package>org.apache.commons.collections4.trie.analyzer</package>
                 <package>org.apache.commons.csv</package>
                 <package>org.apache.commons.io</package>
                 <package>org.apache.commons.io.comparator</package>
@@ -288,6 +332,165 @@
                 <package>org.apache.log4j.spi</package>
                 <package>org.apache.log4j.varia</package>
                 <package>org.apache.log4j.xml</package>
+                <package>org.apache.poi</package>
+                <package>org.apache.poi.common.usermodel</package>
+                <package>org.apache.poi.common.usermodel.fonts</package>
+                <package>org.apache.poi.ddf</package>
+                <package>org.apache.poi.extractor</package>
+                <package>org.apache.poi.extractor.ole2</package>
+                <package>org.apache.poi.hdgf</package>
+                <package>org.apache.poi.hdgf.chunks</package>
+                <package>org.apache.poi.hdgf.dev</package>
+                <package>org.apache.poi.hdgf.exceptions</package>
+                <package>org.apache.poi.hdgf.extractor</package>
+                <package>org.apache.poi.hdgf.pointers</package>
+                <package>org.apache.poi.hdgf.streams</package>
+                <package>org.apache.poi.hemf.extractor</package>
+                <package>org.apache.poi.hemf.hemfplus.record</package>
+                <package>org.apache.poi.hemf.record</package>
+                <package>org.apache.poi.hmef</package>
+                <package>org.apache.poi.hmef.attribute</package>
+                <package>org.apache.poi.hmef.dev</package>
+                <package>org.apache.poi.hmef.extractor</package>
+                <package>org.apache.poi.hpbf</package>
+                <package>org.apache.poi.hpbf.dev</package>
+                <package>org.apache.poi.hpbf.extractor</package>
+                <package>org.apache.poi.hpbf.model</package>
+                <package>org.apache.poi.hpbf.model.qcbits</package>
+                <package>org.apache.poi.hpsf</package>
+                <package>org.apache.poi.hpsf.extractor</package>
+                <package>org.apache.poi.hpsf.wellknown</package>
+                <package>org.apache.poi.hslf.blip</package>
+                <package>org.apache.poi.hslf.dev</package>
+                <package>org.apache.poi.hslf.exceptions</package>
+                <package>org.apache.poi.hslf.extractor</package>
+                <package>org.apache.poi.hslf.model</package>
+                <package>org.apache.poi.hslf.model.textproperties</package>
+                <package>org.apache.poi.hslf.record</package>
+                <package>org.apache.poi.hslf.usermodel</package>
+                <package>org.apache.poi.hslf.util</package>
+                <package>org.apache.poi.hsmf</package>
+                <package>org.apache.poi.hsmf.datatypes</package>
+                <package>org.apache.poi.hsmf.dev</package>
+                <package>org.apache.poi.hsmf.exceptions</package>
+                <package>org.apache.poi.hsmf.extractor</package>
+                <package>org.apache.poi.hsmf.parsers</package>
+                <package>org.apache.poi.hssf</package>
+                <package>org.apache.poi.hssf.converter</package>
+                <package>org.apache.poi.hssf.dev</package>
+                <package>org.apache.poi.hssf.eventmodel</package>
+                <package>org.apache.poi.hssf.eventusermodel</package>
+                <package>org.apache.poi.hssf.eventusermodel.dummyrecord</package>
+                <package>org.apache.poi.hssf.extractor</package>
+                <package>org.apache.poi.hssf.model</package>
+                <package>org.apache.poi.hssf.record</package>
+                <package>org.apache.poi.hssf.record.aggregates</package>
+                <package>org.apache.poi.hssf.record.cf</package>
+                <package>org.apache.poi.hssf.record.chart</package>
+                <package>org.apache.poi.hssf.record.common</package>
+                <package>org.apache.poi.hssf.record.cont</package>
+                <package>org.apache.poi.hssf.record.crypto</package>
+                <package>org.apache.poi.hssf.record.pivottable</package>
+                <package>org.apache.poi.hssf.usermodel</package>
+                <package>org.apache.poi.hssf.usermodel.helpers</package>
+                <package>org.apache.poi.hssf.util</package>
+                <package>org.apache.poi.hwmf.draw</package>
+                <package>org.apache.poi.hwmf.record</package>
+                <package>org.apache.poi.hwmf.usermodel</package>
+                <package>org.apache.poi.hwpf</package>
+                <package>org.apache.poi.hwpf.converter</package>
+                <package>org.apache.poi.hwpf.dev</package>
+                <package>org.apache.poi.hwpf.extractor</package>
+                <package>org.apache.poi.hwpf.model</package>
+                <package>org.apache.poi.hwpf.model.io</package>
+                <package>org.apache.poi.hwpf.model.types</package>
+                <package>org.apache.poi.hwpf.sprm</package>
+                <package>org.apache.poi.hwpf.usermodel</package>
+                <package>org.apache.poi.ooxml</package>
+                <package>org.apache.poi.ooxml.extractor</package>
+                <package>org.apache.poi.ooxml.util</package>
+                <package>org.apache.poi.openxml4j.exceptions</package>
+                <package>org.apache.poi.openxml4j.opc</package>
+                <package>org.apache.poi.openxml4j.opc.internal</package>
+                <package>org.apache.poi.openxml4j.opc.internal.marshallers</package>
+                <package>org.apache.poi.openxml4j.opc.internal.unmarshallers</package>
+                <package>org.apache.poi.openxml4j.util</package>
+                <package>org.apache.poi.poifs.common</package>
+                <package>org.apache.poi.poifs.crypt</package>
+                <package>org.apache.poi.poifs.crypt.agile</package>
+                <package>org.apache.poi.poifs.crypt.binaryrc4</package>
+                <package>org.apache.poi.poifs.crypt.cryptoapi</package>
+                <package>org.apache.poi.poifs.crypt.dsig</package>
+                <package>org.apache.poi.poifs.crypt.dsig.facets</package>
+                <package>org.apache.poi.poifs.crypt.dsig.services</package>
+                <package>org.apache.poi.poifs.crypt.standard</package>
+                <package>org.apache.poi.poifs.crypt.temp</package>
+                <package>org.apache.poi.poifs.crypt.xor</package>
+                <package>org.apache.poi.poifs.dev</package>
+                <package>org.apache.poi.poifs.eventfilesystem</package>
+                <package>org.apache.poi.poifs.filesystem</package>
+                <package>org.apache.poi.poifs.macros</package>
+                <package>org.apache.poi.poifs.nio</package>
+                <package>org.apache.poi.poifs.property</package>
+                <package>org.apache.poi.poifs.storage</package>
+                <package>org.apache.poi.sl.draw</package>
+                <package>org.apache.poi.sl.draw.binding</package>
+                <package>org.apache.poi.sl.draw.geom</package>
+                <package>org.apache.poi.sl.extractor</package>
+                <package>org.apache.poi.sl.image</package>
+                <package>org.apache.poi.sl.usermodel</package>
+                <package>org.apache.poi.ss</package>
+                <package>org.apache.poi.ss.excelant</package>
+                <package>org.apache.poi.ss.excelant.util</package>
+                <package>org.apache.poi.ss.extractor</package>
+                <package>org.apache.poi.ss.format</package>
+                <package>org.apache.poi.ss.formula</package>
+                <package>org.apache.poi.ss.formula.atp</package>
+                <package>org.apache.poi.ss.formula.constant</package>
+                <package>org.apache.poi.ss.formula.eval</package>
+                <package>org.apache.poi.ss.formula.eval.forked</package>
+                <package>org.apache.poi.ss.formula.function</package>
+                <package>org.apache.poi.ss.formula.functions</package>
+                <package>org.apache.poi.ss.formula.ptg</package>
+                <package>org.apache.poi.ss.formula.udf</package>
+                <package>org.apache.poi.ss.usermodel</package>
+                <package>org.apache.poi.ss.usermodel.charts</package>
+                <package>org.apache.poi.ss.usermodel.helpers</package>
+                <package>org.apache.poi.ss.util</package>
+                <package>org.apache.poi.ss.util.cellwalk</package>
+                <package>org.apache.poi.util</package>
+                <package>org.apache.poi.wp.usermodel</package>
+                <package>org.apache.poi.xddf.usermodel</package>
+                <package>org.apache.poi.xddf.usermodel.chart</package>
+                <package>org.apache.poi.xddf.usermodel.text</package>
+                <package>org.apache.poi.xdgf.exceptions</package>
+                <package>org.apache.poi.xdgf.extractor</package>
+                <package>org.apache.poi.xdgf.geom</package>
+                <package>org.apache.poi.xdgf.usermodel</package>
+                <package>org.apache.poi.xdgf.usermodel.section</package>
+                <package>org.apache.poi.xdgf.usermodel.section.geometry</package>
+                <package>org.apache.poi.xdgf.usermodel.shape</package>
+                <package>org.apache.poi.xdgf.usermodel.shape.exceptions</package>
+                <package>org.apache.poi.xdgf.util</package>
+                <package>org.apache.poi.xdgf.xml</package>
+                <package>org.apache.poi.xslf.extractor</package>
+                <package>org.apache.poi.xslf.model</package>
+                <package>org.apache.poi.xslf.usermodel</package>
+                <package>org.apache.poi.xslf.util</package>
+                <package>org.apache.poi.xssf</package>
+                <package>org.apache.poi.xssf.binary</package>
+                <package>org.apache.poi.xssf.eventusermodel</package>
+                <package>org.apache.poi.xssf.extractor</package>
+                <package>org.apache.poi.xssf.model</package>
+                <package>org.apache.poi.xssf.streaming</package>
+                <package>org.apache.poi.xssf.usermodel</package>
+                <package>org.apache.poi.xssf.usermodel.charts</package>
+                <package>org.apache.poi.xssf.usermodel.extensions</package>
+                <package>org.apache.poi.xssf.usermodel.helpers</package>
+                <package>org.apache.poi.xssf.util</package>
+                <package>org.apache.poi.xwpf.extractor</package>
+                <package>org.apache.poi.xwpf.model</package>
+                <package>org.apache.poi.xwpf.usermodel</package>
                 <package>org.apache.tools.ant</package>
                 <package>org.apache.tools.ant.dispatch</package>
                 <package>org.apache.tools.ant.filters</package>
@@ -348,6 +551,50 @@
                 <package>org.apache.tools.mail</package>
                 <package>org.apache.tools.tar</package>
                 <package>org.apache.tools.zip</package>
+                <package>org.apache.xmlbeans</package>
+                <package>org.apache.xmlbeans.impl.common</package>
+                <package>org.apache.xmlbeans.impl.config</package>
+                <package>org.apache.xmlbeans.impl.inst2xsd</package>
+                <package>org.apache.xmlbeans.impl.inst2xsd.util</package>
+                <package>org.apache.xmlbeans.impl.jam</package>
+                <package>org.apache.xmlbeans.impl.jam.annotation</package>
+                <package>org.apache.xmlbeans.impl.jam.internal</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.classrefs</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.elements</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.javadoc</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.parser</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.reflect</package>
+                <package>org.apache.xmlbeans.impl.jam.mutable</package>
+                <package>org.apache.xmlbeans.impl.jam.provider</package>
+                <package>org.apache.xmlbeans.impl.jam.visitor</package>
+                <package>org.apache.xmlbeans.impl.jam.xml</package>
+                <package>org.apache.xmlbeans.impl.regex</package>
+                <package>org.apache.xmlbeans.impl.richParser</package>
+                <package>org.apache.xmlbeans.impl.schema</package>
+                <package>org.apache.xmlbeans.impl.soap</package>
+                <package>org.apache.xmlbeans.impl.store</package>
+                <package>org.apache.xmlbeans.impl.tool</package>
+                <package>org.apache.xmlbeans.impl.util</package>
+                <package>org.apache.xmlbeans.impl.validator</package>
+                <package>org.apache.xmlbeans.impl.values</package>
+                <package>org.apache.xmlbeans.impl.xb.ltgfmt</package>
+                <package>org.apache.xmlbeans.impl.xb.ltgfmt.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.substwsdl</package>
+                <package>org.apache.xmlbeans.impl.xb.substwsdl.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlconfig</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlconfig.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlschema</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlschema.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdownload</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdownload.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdschema</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdschema.impl</package>
+                <package>org.apache.xmlbeans.impl.xpathgen</package>
+                <package>org.apache.xmlbeans.impl.xsd2inst</package>
+                <package>org.apache.xmlbeans.soap</package>
+                <package>org.apache.xmlbeans.xml.stream</package>
+                <package>org.apache.xmlbeans.xml.stream.events</package>
+                <package>org.apache.xmlbeans.xml.stream.utils</package>
                 <package>org.apache.xmlcommons</package>
                 <package>org.controlsfx.control</package>
                 <package>org.controlsfx.control.action</package>
@@ -378,6 +625,8 @@
                 <package>org.dom4j.util</package>
                 <package>org.dom4j.xpath</package>
                 <package>org.dom4j.xpp</package>
+                <package>org.etsi.uri.x01903.v13</package>
+                <package>org.etsi.uri.x01903.v13.impl</package>
                 <package>org.gstreamer</package>
                 <package>org.gstreamer.controller</package>
                 <package>org.gstreamer.elements</package>
@@ -427,6 +676,32 @@
                 <package>org.opencv.photo</package>
                 <package>org.opencv.utils</package>
                 <package>org.opencv.video</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships.impl</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.xpackage.x2006.digitalSignature</package>
+                <package>org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl</package>
                 <package>org.reflections</package>
                 <package>org.reflections.adapters</package>
                 <package>org.reflections.scanners</package>
@@ -438,6 +713,8 @@
                 <package>org.slf4j.helpers</package>
                 <package>org.slf4j.impl</package>
                 <package>org.slf4j.spi</package>
+                <package>org.w3.x2000.x09.xmldsig</package>
+                <package>org.w3.x2000.x09.xmldsig.impl</package>
                 <package>org.w3c.dom</package>
                 <package>org.w3c.dom.css</package>
                 <package>org.w3c.dom.events</package>
@@ -449,6 +726,13 @@
                 <package>org.xml.sax</package>
                 <package>org.xml.sax.ext</package>
                 <package>org.xml.sax.helpers</package>
+                <package>repackage</package>
+                <package>schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078</package>
+                <package>schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLCONFIG</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLLANG</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLSCHEMA</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLTOOLS</package>
             </public-packages>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-logging-1.1.2-sources.jar</runtime-relative-path>
@@ -526,6 +810,10 @@
                 <runtime-relative-path>ext/common-io-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/common-io-3.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-3.0.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-lang3-3.0-sources.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-lang3-3.0-sources.jar</binary-origin>
@@ -570,6 +858,10 @@
                 <runtime-relative-path>ext/poi-ooxml-4.0.1.jar</runtime-relative-path>
                 <binary-origin>C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-4.0.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-pcx-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-pcx-3.2.jar</binary-origin>
@@ -638,6 +930,10 @@
                 <runtime-relative-path>ext/commons-io-2.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-io-2.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-collections4-4.2.jar</runtime-relative-path>
+                <binary-origin>C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\commons-collections4-4.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-bmp-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-bmp-3.2.jar</binary-origin>
diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf
index 15ed8c19f7..96c1cf6d49 100644
--- a/Experimental/manifest.mf
+++ b/Experimental/manifest.mf
@@ -4,4 +4,3 @@ OpenIDE-Module: org.sleuthkit.autopsy.experimental
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/experimental/autoingest/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.0
\ No newline at end of file
diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties
index 831a57d051..b50b12bc00 100644
--- a/Experimental/nbproject/project.properties
+++ b/Experimental/nbproject/project.properties
@@ -1,5 +1,4 @@
 file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar
-file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar
 file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar
 file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
 file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar
diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml
index e62cfa5a98..ad8a97e347 100644
--- a/Experimental/nbproject/project.xml
+++ b/Experimental/nbproject/project.xml
@@ -161,10 +161,6 @@
                 <package>org.sleuthkit.autopsy.experimental.autoingest</package>
                 <package>org.sleuthkit.autopsy.experimental.configuration</package>
             </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-codec-1.11.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-codec-1.11.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-core-1.20.jar</runtime-relative-path>
                 <binary-origin>C:\cygwin64\home\dsmyda\autopsy\Experimental\release\modules\ext\tika-core-1.20.jar</binary-origin>
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index a6db4dfc07..891728973e 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -134,6 +134,7 @@
             </module-dependencies>
             <public-packages>
                 <package>org.apache.commons.logging.impl</package>
+                <package>org.apache.tika.parser.txt</package>
                 <package>org.sleuthkit.autopsy.keywordsearch</package>
             </public-packages>
             <class-path-extension>