diff --git a/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy b/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy
index 6d3355e4..350f6717 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/cli/CarnivalLocalDirInit.groovy
@@ -2,7 +2,7 @@ package carnival.core.cli
 
 
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 
diff --git a/app/carnival-util/src/main/groovy/carnival/util/Defaults.groovy b/app/carnival-core/src/main/groovy/carnival/core/config/Defaults.groovy
similarity index 99%
rename from app/carnival-util/src/main/groovy/carnival/util/Defaults.groovy
rename to app/carnival-core/src/main/groovy/carnival/core/config/Defaults.groovy
index 11414652..b40e0d75 100644
--- a/app/carnival-util/src/main/groovy/carnival/util/Defaults.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/config/Defaults.groovy
@@ -1,4 +1,4 @@
-package carnival.util
+package carnival.core.config
 
 
 
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
index 1142d81b..22a7aa03 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
@@ -22,7 +22,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 import org.apache.tinkerpop.gremlin.structure.Graph.Features.GraphFeatures
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait
 import carnival.graph.VertexDefTrait
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
index 9a793266..faaa5d87 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
@@ -25,7 +25,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
 import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
index abef2a9f..0cc60fe7 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
@@ -21,7 +21,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait
 import carnival.graph.VertexDefTrait
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
index 288ed36e..4cbbeb28 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
@@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy
index c5a98cfd..38922e20 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/GraphSchema.groovy
@@ -22,7 +22,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 import carnival.graph.EdgeDefTrait
 import carnival.graph.PropertyDefTrait
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy
index 9cbcfb76..73ff9945 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/Identifier.groovy
@@ -23,7 +23,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex
 import org.apache.tinkerpop.gremlin.structure.Edge
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.graph.Base
 
 
diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy
index 6962d358..02fcb7f5 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/vine/DataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable
diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy
index a01714ec..90a614c2 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/vine/GenericDataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable
diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy
index 3a2a1cb5..289d4156 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/vine/JsonVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 
 
diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy
index 2e78aeca..18e0c77a 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/vine/MappedDataTableVineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 import carnival.util.GenericDataTable
 import carnival.util.MappedDataTable
diff --git a/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy b/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy
index b0c53642..73d6ab8c 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/vine/VineMethod.groovy
@@ -5,7 +5,7 @@ package carnival.core.vine
 import groovy.util.logging.Slf4j
 import org.apache.commons.codec.digest.DigestUtils
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import carnival.core.util.CoreUtil
 
 
diff --git a/app/carnival-util/src/test/groovy/carnival/util/DefaultsSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/config/DefaultsSpec.groovy
similarity index 88%
rename from app/carnival-util/src/test/groovy/carnival/util/DefaultsSpec.groovy
rename to app/carnival-core/src/test/groovy/carnival/core/config/DefaultsSpec.groovy
index f64a395c..fb2ddd04 100644
--- a/app/carnival-util/src/test/groovy/carnival/util/DefaultsSpec.groovy
+++ b/app/carnival-core/src/test/groovy/carnival/core/config/DefaultsSpec.groovy
@@ -1,4 +1,4 @@
-package carnival.util
+package carnival.core.config
 
 
 import groovy.sql.*
@@ -97,6 +97,18 @@ class DefaultsSpec extends Specification {
         then:
         Defaults.getDataDirectoryPath() == "${existingDataDir}_"
         Defaults.getTargetDirectoryPath() == existingTargetDir
+
+        cleanup:
+        m = [
+            carnival: [
+                directories: [
+                    data: [
+                        root: "${existingDataDir}".toString()
+                    ]
+                ]
+            ]
+        ]
+        Defaults.setConfigData(m)
     }
 
 
diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy
index 398511da..f41075b0 100644
--- a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy
+++ b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphNeo4jSpec.groovy
@@ -18,7 +18,7 @@ import org.neo4j.configuration.connectors.BoltConnector
 import org.neo4j.configuration.helpers.SocketAddress*/
 
 import carnival.graph.*
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 
 
 
diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy
index 65bb3dc6..48462bc3 100644
--- a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy
+++ b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphSpecification.groovy
@@ -7,7 +7,7 @@ import spock.lang.Shared
 
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource
 
-import carnival.util.Defaults
+import carnival.core.config.Defaults
 import static carnival.util.AppUtil.sysPropFalse