diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
index 7e0b717ce..12cbde45e 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
@@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.MovieDbListStatus;
+import com.omertron.themoviedbapi.model2.list.ListStatusCode;
 import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model2.list.ListItem;
 import com.omertron.themoviedbapi.model2.list.ListItemStatus;
@@ -123,7 +123,7 @@ public class TmdbLists extends AbstractMethod {
         String webpage = httpTools.postRequest(url, jsonBody);
 
         try {
-            return MAPPER.readValue(webpage, MovieDbListStatus.class).getListId();
+            return MAPPER.readValue(webpage, ListStatusCode.class).getListId();
         } catch (IOException ex) {
             throw new MovieDbException(ApiExceptionType.MAPPING_FAILED, "Failed to create list", url, ex);
         }
diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java b/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java
index 57259e0e6..7b734ca0c 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/tv/AbstractTv.java
@@ -1,6 +1,6 @@
 package com.omertron.themoviedbapi.model.tv;
 
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 
 public class AbstractTv extends AbstractIdName {
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java b/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java
index e3478f456..a89f9cbd0 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/tv/Network.java
@@ -1,6 +1,6 @@
 package com.omertron.themoviedbapi.model.tv;
 
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 
 public class Network extends AbstractIdName {
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java b/src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java
rename to src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java
index 960955076..dc1e3de87 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/AbstractIdName.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2;
 
 import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/Genre.java b/src/main/java/com/omertron/themoviedbapi/model2/Genre.java
index 31b75e854..367ee89bb 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/Genre.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/Genre.java
@@ -20,7 +20,6 @@
 package com.omertron.themoviedbapi.model2;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.omertron.themoviedbapi.model.AbstractIdName;
 
 /**
  * @author stuart.boston
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java
index c6006b431..246dd03fa 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/keyword/Keyword.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model2.keyword;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 
 /**
  * @author stuart.boston
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java b/src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java
similarity index 92%
rename from src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java
rename to src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java
index 3a30e6444..981966e44 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/list/ListStatusCode.java
@@ -17,12 +17,12 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2.list;
 
 import com.omertron.themoviedbapi.model2.StatusCode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class MovieDbListStatus extends StatusCode {
+public class ListStatusCode extends StatusCode {
 
     @JsonProperty("list_id")
     private String listId;
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java b/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
index bf16345e6..ef1fe0d5b 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
@@ -20,7 +20,6 @@
 package com.omertron.themoviedbapi.model2.list;
 
 import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
-import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java
index 445c2a09b..66fcf4bb2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieDb.java
@@ -21,7 +21,6 @@ package com.omertron.themoviedbapi.model2.movie;
 
 import com.omertron.themoviedbapi.model2.Language;
 import com.omertron.themoviedbapi.model2.Genre;
-import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.person.PersonCast;
 import com.omertron.themoviedbapi.model.person.PersonCrew;
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java b/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java
index 9e287d045..ee8f9e00e 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/movie/ProductionCompany.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model2.movie;
 
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 
 /**
  * @author stuart.boston
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java b/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java
index 3de122563..b05b91810 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/person/PersonBasic.java
@@ -19,7 +19,7 @@
  */
 package com.omertron.themoviedbapi.model2.person;
 
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 
 /**
  * @author stuart.boston
diff --git a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java b/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java
index ce8ceae39..41532e848 100644
--- a/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/tv/TVCredit.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model2.tv;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractIdName;
+import com.omertron.themoviedbapi.model2.AbstractIdName;
 import java.util.List;
 
 /**