diff --git a/build.gradle b/build.gradle
index 80463bcb8..d5d5cda24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,7 +192,7 @@ dependencies {
     providedCompile group: 'org.apache.tomcat', name: 'catalina', version: '6.0.53'
     providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
     providedCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-    providedCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
+    // providedCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
 
     implementation group: 'org.jdom', name: 'jdom', version: '1.1.3'
 
@@ -246,16 +246,16 @@ dependencies {
 
 
     // implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
-    implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.6'
-    implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
-    implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
+    //implementation group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '2.3.6'
+    //implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+    //implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
 
-    implementation group: 'org.jvnet.jaxb2_commons', name: 'jaxb2-basics-runtime', version: '0.11.0'
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-api', version: '2.3.1'
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0-b170127.1453'
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0-b170127.1453'
+    //implementation group: 'org.jvnet.jaxb2_commons', name: 'jaxb2-basics-runtime', version: '0.11.0'
+    //implementation group: 'com.sun.xml.bind', name: 'jaxb-api', version: '2.3.1'
+    //implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0-b170127.1453'
+    //implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0-b170127.1453'
 
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1'
+    //implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.5.1'
     implementation group: 'io.netty', name: 'netty-codec', version: '4.1.68.Final'
 
     implementation group: 'xerces', name: 'xercesImpl', version: '2.12.2'
diff --git a/build.xml b/build.xml
index 76ab60652..4aa6111a3 100644
--- a/build.xml
+++ b/build.xml
@@ -309,6 +309,7 @@
 
     <property name="joda-time.lib" value="joda-time-2.12.7.jar"/>
 
+    <!--
     <property name="jaxb-api.lib" value="jaxb-api-2.3.1.jar"/>
     <property name="jaxb-core.lib" value="jaxb-core-2.3.0-b170127.1453.jar"/>
     <property name="jaxb-impl.lib" value="jaxb-impl-2.3.0-b170127.1453.jar"/>
@@ -317,6 +318,7 @@
     <property name="javax.activation.lib" value="activation-1.1.1.jar"/>
 
     <property name="xlink.lib" value="xlink-v_1_0-1.4.0.jar"/>
+    -->
 
     <!-- Cloudwatch logback appender -->
     <property name="cloudwatch-logback-appender.lib" value="cloudwatch-logback-appender-3.11.jar"/>
@@ -358,10 +360,11 @@
         <include name="${aws-java-sdk-ec2.lib}"/>
         <include name="${aws-java-sdk-logs.lib}"/>
 
+        <!--
         <include name="${jackson-core.lib}"/>
         <include name="${jackson-databind.lib}"/>
         <include name="${jackson-annotations.lib}"/>
-
+        -->
         <include name="${java-jwt.lib}"/>
         <include name="${jwks-rsa.lib}"/>
 
@@ -369,6 +372,7 @@
 
         <include name="${urlRewrite.lib}"/>
 
+        <!--
         <include name="${jaxb-api.lib}"/>
         <include name="${jaxb-core.lib}"/>
         <include name="${jaxb-impl.lib}"/>
@@ -376,6 +380,7 @@
         <include name="${javax.annotation-api.lib}"/>
         <include name="${javax.activation.lib}"/>
         <include name="${xlink.lib}"/>
+        -->
     </fileset>
     <!--
         These are the library jars used by Hyrax.
diff --git a/dmrppJoinExisiting.xml b/dmrppJoinExisiting.xml
index fb431b03e..a0b73d9de 100644
--- a/dmrppJoinExisiting.xml
+++ b/dmrppJoinExisiting.xml
@@ -298,7 +298,7 @@ located identified in the arguments. Run this target with no arguments to see th
 Use -DARGS=&quot;...&quot; to specify command line options."
              depends="compile ">
 
-        <java classname="opendap.dap4.DmrppJoinExistingAggregator"
+        <java classname="opendap.dap4.dmrpp.DmrppJoinExistingAggregator"
               fork="true"
               maxmemory="4096m"
               dir="${build.run}" >
diff --git a/lib/activation-1.1.1.jar b/retired/libs/activation-1.1.1.jar
similarity index 100%
rename from lib/activation-1.1.1.jar
rename to retired/libs/activation-1.1.1.jar
diff --git a/lib/javax.annotation-api-1.3.2.jar b/retired/libs/javax.annotation-api-1.3.2.jar
similarity index 100%
rename from lib/javax.annotation-api-1.3.2.jar
rename to retired/libs/javax.annotation-api-1.3.2.jar
diff --git a/lib/jaxb-api-2.3.1.jar b/retired/libs/jaxb-api-2.3.1.jar
similarity index 100%
rename from lib/jaxb-api-2.3.1.jar
rename to retired/libs/jaxb-api-2.3.1.jar
diff --git a/lib/jaxb-core-2.3.0-b170127.1453.jar b/retired/libs/jaxb-core-2.3.0-b170127.1453.jar
similarity index 100%
rename from lib/jaxb-core-2.3.0-b170127.1453.jar
rename to retired/libs/jaxb-core-2.3.0-b170127.1453.jar
diff --git a/lib/jaxb-impl-2.3.0-b170127.1453.jar b/retired/libs/jaxb-impl-2.3.0-b170127.1453.jar
similarity index 100%
rename from lib/jaxb-impl-2.3.0-b170127.1453.jar
rename to retired/libs/jaxb-impl-2.3.0-b170127.1453.jar
diff --git a/lib/jaxb-runtime-2.3.6.jar b/retired/libs/jaxb-runtime-2.3.6.jar
similarity index 100%
rename from lib/jaxb-runtime-2.3.6.jar
rename to retired/libs/jaxb-runtime-2.3.6.jar
diff --git a/lib/jaxb2-basics-runtime-0.11.0.jar b/retired/libs/jaxb2-basics-runtime-0.11.0.jar
similarity index 100%
rename from lib/jaxb2-basics-runtime-0.11.0.jar
rename to retired/libs/jaxb2-basics-runtime-0.11.0.jar
diff --git a/lib/xlink-v_1_0-1.4.0.jar b/retired/libs/xlink-v_1_0-1.4.0.jar
similarity index 100%
rename from lib/xlink-v_1_0-1.4.0.jar
rename to retired/libs/xlink-v_1_0-1.4.0.jar
diff --git a/src/opendap/dap4/Attribute.java b/retired/src/opendap/dap4/Attribute.java
similarity index 100%
rename from src/opendap/dap4/Attribute.java
rename to retired/src/opendap/dap4/Attribute.java
diff --git a/src/opendap/dap4/Byte.java b/retired/src/opendap/dap4/Byte.java
similarity index 100%
rename from src/opendap/dap4/Byte.java
rename to retired/src/opendap/dap4/Byte.java
diff --git a/src/opendap/dap4/Char.java b/retired/src/opendap/dap4/Char.java
similarity index 100%
rename from src/opendap/dap4/Char.java
rename to retired/src/opendap/dap4/Char.java
diff --git a/src/opendap/dap4/ContainerAttribute.java b/retired/src/opendap/dap4/ContainerAttribute.java
similarity index 100%
rename from src/opendap/dap4/ContainerAttribute.java
rename to retired/src/opendap/dap4/ContainerAttribute.java
diff --git a/src/opendap/dap4/DapString.java b/retired/src/opendap/dap4/DapString.java
similarity index 100%
rename from src/opendap/dap4/DapString.java
rename to retired/src/opendap/dap4/DapString.java
diff --git a/src/opendap/dap4/Dataset.java b/retired/src/opendap/dap4/Dataset.java
similarity index 100%
rename from src/opendap/dap4/Dataset.java
rename to retired/src/opendap/dap4/Dataset.java
diff --git a/src/opendap/dap4/DatasetTest.java b/retired/src/opendap/dap4/DatasetTest.java
similarity index 100%
rename from src/opendap/dap4/DatasetTest.java
rename to retired/src/opendap/dap4/DatasetTest.java
diff --git a/src/opendap/dap4/DefaultNamespacePrefixMapper.java b/retired/src/opendap/dap4/DefaultNamespacePrefixMapper.java
similarity index 100%
rename from src/opendap/dap4/DefaultNamespacePrefixMapper.java
rename to retired/src/opendap/dap4/DefaultNamespacePrefixMapper.java
diff --git a/src/opendap/dap4/Dim.java b/retired/src/opendap/dap4/Dim.java
similarity index 100%
rename from src/opendap/dap4/Dim.java
rename to retired/src/opendap/dap4/Dim.java
diff --git a/src/opendap/dap4/Dimension.java b/retired/src/opendap/dap4/Dimension.java
similarity index 100%
rename from src/opendap/dap4/Dimension.java
rename to retired/src/opendap/dap4/Dimension.java
diff --git a/src/opendap/dap4/Float32.java b/retired/src/opendap/dap4/Float32.java
similarity index 100%
rename from src/opendap/dap4/Float32.java
rename to retired/src/opendap/dap4/Float32.java
diff --git a/src/opendap/dap4/Float64.java b/retired/src/opendap/dap4/Float64.java
similarity index 100%
rename from src/opendap/dap4/Float64.java
rename to retired/src/opendap/dap4/Float64.java
diff --git a/src/opendap/dap4/Int16.java b/retired/src/opendap/dap4/Int16.java
similarity index 100%
rename from src/opendap/dap4/Int16.java
rename to retired/src/opendap/dap4/Int16.java
diff --git a/src/opendap/dap4/Int32.java b/retired/src/opendap/dap4/Int32.java
similarity index 100%
rename from src/opendap/dap4/Int32.java
rename to retired/src/opendap/dap4/Int32.java
diff --git a/src/opendap/dap4/Int64.java b/retired/src/opendap/dap4/Int64.java
similarity index 100%
rename from src/opendap/dap4/Int64.java
rename to retired/src/opendap/dap4/Int64.java
diff --git a/src/opendap/dap4/Int8.java b/retired/src/opendap/dap4/Int8.java
similarity index 100%
rename from src/opendap/dap4/Int8.java
rename to retired/src/opendap/dap4/Int8.java
diff --git a/src/opendap/dap4/UInt16.java b/retired/src/opendap/dap4/UInt16.java
similarity index 100%
rename from src/opendap/dap4/UInt16.java
rename to retired/src/opendap/dap4/UInt16.java
diff --git a/src/opendap/dap4/UInt32.java b/retired/src/opendap/dap4/UInt32.java
similarity index 100%
rename from src/opendap/dap4/UInt32.java
rename to retired/src/opendap/dap4/UInt32.java
diff --git a/src/opendap/dap4/UInt64.java b/retired/src/opendap/dap4/UInt64.java
similarity index 100%
rename from src/opendap/dap4/UInt64.java
rename to retired/src/opendap/dap4/UInt64.java
diff --git a/src/opendap/dap4/UInt8.java b/retired/src/opendap/dap4/UInt8.java
similarity index 100%
rename from src/opendap/dap4/UInt8.java
rename to retired/src/opendap/dap4/UInt8.java
diff --git a/src/opendap/dap4/Variable.java b/retired/src/opendap/dap4/Variable.java
similarity index 100%
rename from src/opendap/dap4/Variable.java
rename to retired/src/opendap/dap4/Variable.java
diff --git a/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java b/retired/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java
similarity index 100%
rename from src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java
rename to retired/src/opendap/dap4/XMLReaderWithNamespaceInMyPackageDotInfo.java
diff --git a/src/opendap/dap4/package-info.java b/retired/src/opendap/dap4/package-info.java
similarity index 100%
rename from src/opendap/dap4/package-info.java
rename to retired/src/opendap/dap4/package-info.java
diff --git a/src/opendap/dap4/DmrppAggException.java b/src/opendap/dap4/dmrpp/DmrppAggException.java
similarity index 95%
rename from src/opendap/dap4/DmrppAggException.java
rename to src/opendap/dap4/dmrpp/DmrppAggException.java
index 1ffaeda54..87ba70b2d 100644
--- a/src/opendap/dap4/DmrppAggException.java
+++ b/src/opendap/dap4/dmrpp/DmrppAggException.java
@@ -1,4 +1,4 @@
-package opendap.dap4;
+package opendap.dap4.dmrpp;
 
 import java.lang.Exception;
 
diff --git a/src/opendap/dap4/DmrppJoinExistingAggregator.java b/src/opendap/dap4/dmrpp/DmrppJoinExistingAggregator.java
similarity index 99%
rename from src/opendap/dap4/DmrppJoinExistingAggregator.java
rename to src/opendap/dap4/dmrpp/DmrppJoinExistingAggregator.java
index d49b05dbf..26c3a274d 100644
--- a/src/opendap/dap4/DmrppJoinExistingAggregator.java
+++ b/src/opendap/dap4/dmrpp/DmrppJoinExistingAggregator.java
@@ -23,7 +23,7 @@
  * // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  * /////////////////////////////////////////////////////////////////////////////
  */
-package opendap.dap4;
+package opendap.dap4.dmrpp;
 
 import ch.qos.logback.classic.Level;
 import opendap.logging.LogUtil;
diff --git a/src/opendap/dap4/DmrppJoinNewAggregator.java b/src/opendap/dap4/dmrpp/DmrppJoinNewAggregator.java
similarity index 99%
rename from src/opendap/dap4/DmrppJoinNewAggregator.java
rename to src/opendap/dap4/dmrpp/DmrppJoinNewAggregator.java
index 889bf06e8..748ecdd57 100644
--- a/src/opendap/dap4/DmrppJoinNewAggregator.java
+++ b/src/opendap/dap4/dmrpp/DmrppJoinNewAggregator.java
@@ -23,7 +23,7 @@
  * // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  * /////////////////////////////////////////////////////////////////////////////
  */
-package opendap.dap4;
+package opendap.dap4.dmrpp;
 
 import ch.qos.logback.classic.Level;
 import opendap.bes.BadConfigurationException;