1 files changed, 17 insertions, 16 deletions

diff --git a/ddl/templates/data.java.ede b/ddl/templates/data.java.ede
index c85a521..2aec628 100644
--- a/ddl/templates/data.java.ede
+++ b/ddl/templates/data.java.ede
@@ -1,26 +1,27 @@
 // generated file, do not modify!
 // {{ dateTime }}
 
+package {{ moduleName }};
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
 {% for m in imports %}
-import {{ m.value }};
+import {{ m.value }}.*;
 {% endfor %}
 
-public class {{ moduleName }} {
-{% for t in dataAndType %}
-{% case t.value | constType %}
+{% case def | constType %}
 {% when "DataDef" %}
-  public class {{ t.value.dataName }} {
-    public enum Tag { {% for c in t.value.constructors %}
-      {{ c.value.name }}{% if !c.last %},{% endif %}{% endfor %}
-    }
-    public Tag tag;
-{% for c in t.value.constructors %}{% if !(c.value.fields | empty) %}
-    public class {{ c.value.name }}_ extends {{ t.value.dataName }} { {% for f in c.value.fields %}{% if c.value.fields | hasFieldNames %}
-      public {{ f.value.fieldType | javaType }} {{ f.value.fieldName }};{% else %}
-      public {{ f.value.fieldType | javaType }} _{{ f.index0 }};{% endif %}{% endfor %}
-    }{% endif %}{% endfor %}
+public class {{ def.dataName }} {
+  public enum Tag { {% for c in def.constructors %}
+    {{ c.value.name }}{% if !c.last %},{% endif %}{% endfor %}
   }
+  public Tag tag;
+{% for c in def.constructors %}{% if !(c.value.fields | empty) %}
+  public class {{ c.value.name }}_ extends {{ def.dataName }} { {% for f in c.value.fields %}{% if c.value.fields | hasFieldNames %}
+    public {{ f.value.fieldType | javaType }} {{ f.value.fieldName }};{% else %}
+    public {{ f.value.fieldType | javaType }} _{{ f.index0 }};{% endif %}{% endfor %}
+  }{% endif %}{% endfor %}
+}
 
 {% endcase %}
-{% endfor %}
-}
\ No newline at end of file