diff --git a/assemble/conf/templates/accumulo-metrics.xml b/assemble/conf/templates/accumulo-metrics.xml

index ec54994..04edb84 100644

--- a/assemble/conf/templates/accumulo-metrics.xml

+++ b/assemble/conf/templates/accumulo-metrics.xml

@@ -23,7 +23,8 @@

    Metrics log directory

 -->

   <logging>

-    <dir>${ACCUMULO_HOME}/metrics</dir>

+    

+    <dir>/var/log/accumulo/metrics</dir>

   </logging>

  Enable/Disable metrics accumulation on the different servers and their components

diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml

index 7fe3fe4..a9e29e1 100644

--- a/assemble/conf/templates/accumulo-site.xml

+++ b/assemble/conf/templates/accumulo-site.xml

@@ -22,18 +22,15 @@

     you are simply testing at your workstation, you will most definitely need to change the three entries below. -->

   <property>

-    <name>instance.zookeeper.host</name>

-    <value>localhost:2181</value>

-    <description>comma separated list of zookeeper servers</description>

+    <name>instance.volumes</name>

+    <value>file:///tmp/accumulo</value>

+    <description>comma separated list of dfs URIs</description>

   </property>

   <property>

-    <name>logger.dir.walog</name>

-    <value>walogs</value>

-    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local

-      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4

-      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.

-    </description>

+    <name>instance.zookeeper.host</name>

+    <value>localhost:2181</value>

+    <description>comma separated list of zookeeper servers</description>

   </property>

   <property>

@@ -89,49 +86,13 @@

 ${mvnProjBaseDir}

   <property>

     <name>general.classpaths</name>

-

-    <value>

-      

-      $ACCUMULO_HOME/lib/accumulo-server.jar,

-      $ACCUMULO_HOME/lib/accumulo-core.jar,

-      $ACCUMULO_HOME/lib/accumulo-start.jar,

-      $ACCUMULO_HOME/lib/accumulo-fate.jar,

-      $ACCUMULO_HOME/lib/accumulo-proxy.jar,

-      $ACCUMULO_HOME/lib/[^.].*.jar,

-      

-      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,

-      

-      $HADOOP_CONF_DIR,

-      

-      $HADOOP_PREFIX/share/hadoop/common/[^.].*.jar,

-      $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar,

-      $HADOOP_PREFIX/share/hadoop/hdfs/[^.].*.jar,

-      $HADOOP_PREFIX/share/hadoop/mapreduce/[^.].*.jar,

-      $HADOOP_PREFIX/share/hadoop/yarn/[^.].*.jar,

-      $HADOOP_PREFIX/share/hadoop/yarn/lib/jersey.*.jar,

-      

-      

-      /usr/lib/hadoop/[^.].*.jar,

-      /usr/lib/hadoop/lib/[^.].*.jar,

-      /usr/lib/hadoop-hdfs/[^.].*.jar,

-      /usr/lib/hadoop-mapreduce/[^.].*.jar,

-      /usr/lib/hadoop-yarn/[^.].*.jar,

-      /usr/lib/hadoop-yarn/lib/jersey.*.jar,

-      

-      

-      /usr/hdp/current/hadoop-client/[^.].*.jar,

-      /usr/hdp/current/hadoop-client/lib/(?!slf4j)[^.].*.jar,

-      /usr/hdp/current/hadoop-hdfs-client/[^.].*.jar,

-      /usr/hdp/current/hadoop-mapreduce-client/[^.].*.jar,

-      /usr/hdp/current/hadoop-yarn-client/[^.].*.jar,

-      /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar,

-      /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar

-      

-      

-      $HADOOP_PREFIX/[^.].*.jar,

-      $HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar,

-      

-    </value>

+    <value>/etc/accumulo/lib</value>

     <description>Classpaths that accumulo checks for updates and class files.</description>

   </property>

+

+  <property>

+    <name>general.dynamic.classpaths</name>

+    <value>/etc/accumulo/lib/ext</value>

+    <description>Classpaths that accumulo checks for updates and class files to dynamically load.</description>

+  </property>

 </configuration>