diff --git a/src/main/java/li/strolch/rest/inspector/Inspector.java b/src/main/java/li/strolch/rest/inspector/Inspector.java
index 1fcaf557e..2cea98050 100644
--- a/src/main/java/li/strolch/rest/inspector/Inspector.java
+++ b/src/main/java/li/strolch/rest/inspector/Inspector.java
@@ -35,19 +35,19 @@ import li.strolch.exception.StrolchException;
 import li.strolch.model.Order;
 import li.strolch.model.Resource;
 import li.strolch.persistence.api.StrolchTransaction;
-import li.strolch.rest.inspector.model.AgentOverview;
-import li.strolch.rest.inspector.model.ElementMapOverview;
-import li.strolch.rest.inspector.model.ElementMapType;
-import li.strolch.rest.inspector.model.ElementMapsOverview;
-import li.strolch.rest.inspector.model.OrderDetail;
-import li.strolch.rest.inspector.model.OrderOverview;
-import li.strolch.rest.inspector.model.RealmDetail;
-import li.strolch.rest.inspector.model.RealmOverview;
-import li.strolch.rest.inspector.model.ResourceDetail;
-import li.strolch.rest.inspector.model.ResourceOverview;
-import li.strolch.rest.inspector.model.StrolchElementOverview;
-import li.strolch.rest.inspector.model.TypeDetail;
-import li.strolch.rest.inspector.model.TypeOverview;
+import li.strolch.rest.model.AgentOverview;
+import li.strolch.rest.model.ElementMapOverview;
+import li.strolch.rest.model.ElementMapType;
+import li.strolch.rest.model.ElementMapsOverview;
+import li.strolch.rest.model.OrderDetail;
+import li.strolch.rest.model.OrderOverview;
+import li.strolch.rest.model.RealmDetail;
+import li.strolch.rest.model.RealmOverview;
+import li.strolch.rest.model.ResourceDetail;
+import li.strolch.rest.model.ResourceOverview;
+import li.strolch.rest.model.StrolchElementOverview;
+import li.strolch.rest.model.TypeDetail;
+import li.strolch.rest.model.TypeOverview;
 import ch.eitchnet.utils.dbc.DBC;
 
 /**
diff --git a/src/main/java/li/strolch/rest/inspector/model/AgentOverview.java b/src/main/java/li/strolch/rest/model/AgentOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/AgentOverview.java
rename to src/main/java/li/strolch/rest/model/AgentOverview.java
index 36eb52095..112dbbc68 100644
--- a/src/main/java/li/strolch/rest/inspector/model/AgentOverview.java
+++ b/src/main/java/li/strolch/rest/model/AgentOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.List;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/ElementMapOverview.java b/src/main/java/li/strolch/rest/model/ElementMapOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/ElementMapOverview.java
rename to src/main/java/li/strolch/rest/model/ElementMapOverview.java
index f295f89b0..4e8d9a817 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ElementMapOverview.java
+++ b/src/main/java/li/strolch/rest/model/ElementMapOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.List;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/ElementMapType.java b/src/main/java/li/strolch/rest/model/ElementMapType.java
similarity index 95%
rename from src/main/java/li/strolch/rest/inspector/model/ElementMapType.java
rename to src/main/java/li/strolch/rest/model/ElementMapType.java
index 979e08d61..129976e99 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ElementMapType.java
+++ b/src/main/java/li/strolch/rest/model/ElementMapType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 /**
  * @author Robert von Burg <eitch@eitchnet.ch>
diff --git a/src/main/java/li/strolch/rest/inspector/model/ElementMapsOverview.java b/src/main/java/li/strolch/rest/model/ElementMapsOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/ElementMapsOverview.java
rename to src/main/java/li/strolch/rest/model/ElementMapsOverview.java
index 854ab71ec..8ddd82a73 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ElementMapsOverview.java
+++ b/src/main/java/li/strolch/rest/model/ElementMapsOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.Set;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/GroupedParameterizedElementDetail.java b/src/main/java/li/strolch/rest/model/GroupedParameterizedElementDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/GroupedParameterizedElementDetail.java
rename to src/main/java/li/strolch/rest/model/GroupedParameterizedElementDetail.java
index 187ee1a83..125f7d45e 100644
--- a/src/main/java/li/strolch/rest/inspector/model/GroupedParameterizedElementDetail.java
+++ b/src/main/java/li/strolch/rest/model/GroupedParameterizedElementDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/li/strolch/rest/inspector/model/OrderDetail.java b/src/main/java/li/strolch/rest/model/OrderDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/OrderDetail.java
rename to src/main/java/li/strolch/rest/model/OrderDetail.java
index 998302994..a84590da2 100644
--- a/src/main/java/li/strolch/rest/inspector/model/OrderDetail.java
+++ b/src/main/java/li/strolch/rest/model/OrderDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.Date;
 import java.util.List;
diff --git a/src/main/java/li/strolch/rest/inspector/model/OrderOverview.java b/src/main/java/li/strolch/rest/model/OrderOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/OrderOverview.java
rename to src/main/java/li/strolch/rest/model/OrderOverview.java
index 869a99bd3..46b6581cf 100644
--- a/src/main/java/li/strolch/rest/inspector/model/OrderOverview.java
+++ b/src/main/java/li/strolch/rest/model/OrderOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.Date;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/ParameterDetail.java b/src/main/java/li/strolch/rest/model/ParameterDetail.java
similarity index 99%
rename from src/main/java/li/strolch/rest/inspector/model/ParameterDetail.java
rename to src/main/java/li/strolch/rest/model/ParameterDetail.java
index febc3e68e..460e013fd 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ParameterDetail.java
+++ b/src/main/java/li/strolch/rest/model/ParameterDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/li/strolch/rest/inspector/model/ParameterizedElementDetail.java b/src/main/java/li/strolch/rest/model/ParameterizedElementDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/ParameterizedElementDetail.java
rename to src/main/java/li/strolch/rest/model/ParameterizedElementDetail.java
index 36af9453b..6356cda82 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ParameterizedElementDetail.java
+++ b/src/main/java/li/strolch/rest/model/ParameterizedElementDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/li/strolch/rest/inspector/model/RealmDetail.java b/src/main/java/li/strolch/rest/model/RealmDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/RealmDetail.java
rename to src/main/java/li/strolch/rest/model/RealmDetail.java
index 8df977518..04adc549d 100644
--- a/src/main/java/li/strolch/rest/inspector/model/RealmDetail.java
+++ b/src/main/java/li/strolch/rest/model/RealmDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.List;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/RealmOverview.java b/src/main/java/li/strolch/rest/model/RealmOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/RealmOverview.java
rename to src/main/java/li/strolch/rest/model/RealmOverview.java
index 11744e9ef..d6b5d73b0 100644
--- a/src/main/java/li/strolch/rest/inspector/model/RealmOverview.java
+++ b/src/main/java/li/strolch/rest/model/RealmOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/li/strolch/rest/inspector/model/ResourceDetail.java b/src/main/java/li/strolch/rest/model/ResourceDetail.java
similarity index 97%
rename from src/main/java/li/strolch/rest/inspector/model/ResourceDetail.java
rename to src/main/java/li/strolch/rest/model/ResourceDetail.java
index cb80ef8f1..cc3303df6 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ResourceDetail.java
+++ b/src/main/java/li/strolch/rest/model/ResourceDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.List;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/ResourceOverview.java b/src/main/java/li/strolch/rest/model/ResourceOverview.java
similarity index 96%
rename from src/main/java/li/strolch/rest/inspector/model/ResourceOverview.java
rename to src/main/java/li/strolch/rest/model/ResourceOverview.java
index a3138a3b5..5516188c2 100644
--- a/src/main/java/li/strolch/rest/inspector/model/ResourceOverview.java
+++ b/src/main/java/li/strolch/rest/model/ResourceOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/li/strolch/rest/inspector/model/StrolchElementDetail.java b/src/main/java/li/strolch/rest/model/StrolchElementDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/StrolchElementDetail.java
rename to src/main/java/li/strolch/rest/model/StrolchElementDetail.java
index 545e2b9d8..18203a718 100644
--- a/src/main/java/li/strolch/rest/inspector/model/StrolchElementDetail.java
+++ b/src/main/java/li/strolch/rest/model/StrolchElementDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/li/strolch/rest/inspector/model/StrolchElementOverview.java b/src/main/java/li/strolch/rest/model/StrolchElementOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/StrolchElementOverview.java
rename to src/main/java/li/strolch/rest/model/StrolchElementOverview.java
index 51b458041..864b2bbaf 100644
--- a/src/main/java/li/strolch/rest/inspector/model/StrolchElementOverview.java
+++ b/src/main/java/li/strolch/rest/model/StrolchElementOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/li/strolch/rest/inspector/model/TypeDetail.java b/src/main/java/li/strolch/rest/model/TypeDetail.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/TypeDetail.java
rename to src/main/java/li/strolch/rest/model/TypeDetail.java
index 446d2dcb4..52ec0bcd5 100644
--- a/src/main/java/li/strolch/rest/inspector/model/TypeDetail.java
+++ b/src/main/java/li/strolch/rest/model/TypeDetail.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import java.util.List;
 
diff --git a/src/main/java/li/strolch/rest/inspector/model/TypeOverview.java b/src/main/java/li/strolch/rest/model/TypeOverview.java
similarity index 98%
rename from src/main/java/li/strolch/rest/inspector/model/TypeOverview.java
rename to src/main/java/li/strolch/rest/model/TypeOverview.java
index 95604955d..3d265b2f2 100644
--- a/src/main/java/li/strolch/rest/inspector/model/TypeOverview.java
+++ b/src/main/java/li/strolch/rest/model/TypeOverview.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package li.strolch.rest.inspector.model;
+package li.strolch.rest.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/test/java/li/strolch/rest/inspector/test/InspectorTest.java b/src/test/java/li/strolch/rest/inspector/test/InspectorTest.java
index d4328720d..515bf7147 100644
--- a/src/test/java/li/strolch/rest/inspector/test/InspectorTest.java
+++ b/src/test/java/li/strolch/rest/inspector/test/InspectorTest.java
@@ -23,15 +23,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import li.strolch.rest.inspector.model.AgentOverview;
-import li.strolch.rest.inspector.model.ElementMapOverview;
-import li.strolch.rest.inspector.model.ElementMapType;
-import li.strolch.rest.inspector.model.ElementMapsOverview;
-import li.strolch.rest.inspector.model.OrderDetail;
-import li.strolch.rest.inspector.model.RealmDetail;
-import li.strolch.rest.inspector.model.RealmOverview;
-import li.strolch.rest.inspector.model.ResourceDetail;
-import li.strolch.rest.inspector.model.TypeOverview;
+import li.strolch.rest.model.AgentOverview;
+import li.strolch.rest.model.ElementMapOverview;
+import li.strolch.rest.model.ElementMapType;
+import li.strolch.rest.model.ElementMapsOverview;
+import li.strolch.rest.model.OrderDetail;
+import li.strolch.rest.model.RealmDetail;
+import li.strolch.rest.model.RealmOverview;
+import li.strolch.rest.model.ResourceDetail;
+import li.strolch.rest.model.TypeOverview;
 
 import org.junit.Test;