diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/ModelSetupService.java b/wizard-server/src/main/java/org/cobbzilla/wizard/model/ModelSetupService.java
similarity index 97%
rename from wizard-server/src/main/java/org/cobbzilla/wizard/ModelSetupService.java
rename to wizard-server/src/main/java/org/cobbzilla/wizard/model/ModelSetupService.java
index f2d2c8d..b484ac5 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/ModelSetupService.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/model/ModelSetupService.java
@@ -1,4 +1,4 @@
-package org.cobbzilla.wizard;
+package org.cobbzilla.wizard.model;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.AllArgsConstructor;
@@ -6,7 +6,6 @@ import lombok.Getter;
 import org.cobbzilla.util.collection.ExpirationMap;
 import org.cobbzilla.wizard.api.CrudOperation;
 import org.cobbzilla.wizard.client.ApiClientBase;
-import org.cobbzilla.wizard.model.Identifiable;
 import org.cobbzilla.wizard.model.entityconfig.EntityConfig;
 import org.cobbzilla.wizard.model.entityconfig.ManifestFileResolver;
 import org.cobbzilla.wizard.model.entityconfig.ModelSetup;
@@ -26,7 +25,7 @@ import static org.cobbzilla.util.io.FileUtil.extension;
 import static org.cobbzilla.util.io.FileUtil.toStringOrDie;
 import static org.cobbzilla.util.json.JsonUtil.json;
 import static org.cobbzilla.util.json.JsonUtil.newArrayNode;
-import static org.cobbzilla.wizard.Unroll.unrollOrInvalid;
+import static org.cobbzilla.wizard.util.Unroll.unrollOrInvalid;
 import static org.cobbzilla.wizard.resources.ResourceUtil.invalidEx;
 
 public abstract class ModelSetupService {
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/Unroll.java b/wizard-server/src/main/java/org/cobbzilla/wizard/util/Unroll.java
similarity index 91%
rename from wizard-server/src/main/java/org/cobbzilla/wizard/Unroll.java
rename to wizard-server/src/main/java/org/cobbzilla/wizard/util/Unroll.java
index f040c82..7d15494 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/Unroll.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/util/Unroll.java
@@ -1,4 +1,4 @@
-package org.cobbzilla.wizard;
+package org.cobbzilla.wizard.util;
 
 import org.cobbzilla.util.io.TempDir;