diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
index 7591ebb7a..ea6511832 100644
--- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
+++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java
@@ -39,7 +39,7 @@ import com.omertron.themoviedbapi.methods.TmdbPeople;
 import com.omertron.themoviedbapi.methods.TmdbReviews;
 import com.omertron.themoviedbapi.methods.TmdbSearch;
 import com.omertron.themoviedbapi.methods.TmdbTV;
-import com.omertron.themoviedbapi.model.Account;
+import com.omertron.themoviedbapi.model2.account.Account;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
 import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.Certification;
@@ -47,10 +47,10 @@ import com.omertron.themoviedbapi.model.change.ChangedMedia;
 import com.omertron.themoviedbapi.model.Collection;
 import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import com.omertron.themoviedbapi.model.discover.Discover;
 import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
 import com.omertron.themoviedbapi.model.MovieDb;
@@ -60,18 +60,18 @@ import com.omertron.themoviedbapi.model.person.Person;
 import com.omertron.themoviedbapi.model.person.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model.TBD_ExternalSource;
 import com.omertron.themoviedbapi.model.TBD_FindResults;
 import com.omertron.themoviedbapi.model.TBD_Network;
 import com.omertron.themoviedbapi.model.TBD_PersonCredits;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import com.omertron.themoviedbapi.tools.HttpTools;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
index e6591a472..ca4feb1f5 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
@@ -22,9 +22,9 @@ package com.omertron.themoviedbapi.methods;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
 import java.io.IOException;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
index 4249db340..1e5513bcc 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
@@ -21,11 +21,11 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.enumeration.MediaType;
-import com.omertron.themoviedbapi.model.Account;
-import com.omertron.themoviedbapi.model.StatusCode;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.account.Account;
+import com.omertron.themoviedbapi.model2.StatusCode;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java
index f378bc7c1..30413cf93 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAuthentication.java
@@ -20,8 +20,8 @@
 package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
index a36f85983..7cd8d57bc 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
@@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.MovieDbException;
 import static com.omertron.themoviedbapi.methods.AbstractMethod.MAPPER;
-import com.omertron.themoviedbapi.model.Configuration;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.Configuration;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
index 89f04b8f6..a6fa981cd 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbLists.java
@@ -23,7 +23,7 @@ import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.model.ListItemStatus;
 import com.omertron.themoviedbapi.model.MovieDbList;
 import com.omertron.themoviedbapi.model.MovieDbListStatus;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
index dcc52d5e6..19333b55f 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
@@ -25,7 +25,7 @@ import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.MovieDb;
 import com.omertron.themoviedbapi.model.MovieList;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/_Method_List.txt b/src/main/java/com/omertron/themoviedbapi/methods/_Method_List.txt
index 8e49394af..d7f323cf1 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/_Method_List.txt
+++ b/src/main/java/com/omertron/themoviedbapi/methods/_Method_List.txt
@@ -1,4 +1,4 @@
-Account
+Account (done)
 /account Get the basic information for an account. You will need to have a valid session id.
 /account/{id}/lists Get the lists that you have created and marked as a favorite.
 /account/{id}/favorite/movies Get the list of favorite movies for an account.
@@ -10,7 +10,7 @@ Account
 /account/{id}/watchlist/tv Get the list of TV series on an accounts watchlist
 /account/{id}/watchlist Add or remove a movie to an accounts watch list
 
-Authentication
+Authentication (done)
 /authentication/token/new This method is used to generate a valid request token for user based authentication
 /authentication/token/validate_with_login Once you have a valid request token you can use this method to authenticate a user with a TMDb username and password.
 /authentication/session/new This method is used to generate a session id for user based authentication. A session id is required in order to use any of the write methods.
@@ -51,7 +51,7 @@ Genres
 Guest Sessions
 /guest_session/{guest_session_id}/rated_movies Get a list of rated movies for a specific guest session id.
 
-Jobs
+Jobs (Done)
 /job/list Get a list of valid jobs.
 
 Keyword
diff --git a/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java b/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java
index 13ed73235..960955076 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/AbstractIdName.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
index 03e1f182e..a60009016 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Certification.java b/src/main/java/com/omertron/themoviedbapi/model/Certification.java
index 64bb68e33..c794d9155 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Certification.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Certification.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Collection.java b/src/main/java/com/omertron/themoviedbapi/model/Collection.java
index 254566531..df63d7a21 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Collection.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Collection.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
index cc6c6ed18..f4ae0af18 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Company.java b/src/main/java/com/omertron/themoviedbapi/model/Company.java
index 13f26393b..c7093334a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Company.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Company.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java
index c15db46bc..7f93cd410 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Language.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ListItemStatus.java b/src/main/java/com/omertron/themoviedbapi/model/ListItemStatus.java
index 63e2139cf..3581533e9 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ListItemStatus.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ListItemStatus.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java
index 0b00fa8cb..f42f2060d 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.person.PersonCast;
 import com.omertron.themoviedbapi.model.person.PersonCrew;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
index 7dbc9c700..6c3e6f31f 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java
index 3f63f12dc..3a30e6444 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class MovieDbListStatus extends StatusCode {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
index a910d83b5..f3d620ae2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
index fa0cd54ba..c5d5b6608 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
index 189b9a8a4..799e7fd86 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
index 13d78541d..34f75a288 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TBD_ExternalSource.java b/src/main/java/com/omertron/themoviedbapi/model/TBD_ExternalSource.java
index 57b7c5c34..fb52a06e2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TBD_ExternalSource.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TBD_ExternalSource.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TBD_FindResults.java b/src/main/java/com/omertron/themoviedbapi/model/TBD_FindResults.java
index 5b0ffbcd3..feeefa39c 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TBD_FindResults.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TBD_FindResults.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TBD_Network.java b/src/main/java/com/omertron/themoviedbapi/model/TBD_Network.java
index 540df4792..e0db300ce 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TBD_Network.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TBD_Network.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TBD_PersonCredits.java b/src/main/java/com/omertron/themoviedbapi/model/TBD_PersonCredits.java
index f2d77b628..92801a275 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TBD_PersonCredits.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TBD_PersonCredits.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
index 1bf4d7119..6a722959e 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
index c4e707cbe..ac991532a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Translation.java b/src/main/java/com/omertron/themoviedbapi/model/Translation.java
index 2e884deab..a9fc11390 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Translation.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Translation.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Video.java b/src/main/java/com/omertron/themoviedbapi/model/Video.java
index 1619abb75..f166e3869 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Video.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/Video.java
@@ -19,6 +19,7 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java
index a9f1a4183..fc135bf27 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedItem.java
@@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.model.change;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java
index 581865099..1e003f345 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMedia.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 public class ChangedMedia extends AbstractJsonMapping {
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java
index c6d55440b..bfd0ce731 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/change/ChangedMovie.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.change;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 public class ChangedMovie extends AbstractJsonMapping {
 
diff --git a/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java b/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java
index 6c804b43c..7ebe20bd9 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/keyword/KeywordMovie.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.keyword;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 
 /**
  * @author Stuart
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/Person.java b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java
index 389d5bac5..b76ffe852 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/Person.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/Person.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java
index d0ad61d81..2717003cd 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCast.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java
index a504a0475..048ab2f38 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCredit.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.util.Collections;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java
index 934757a30..a0851a564 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/person/PersonCrew.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.model.person;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java b/src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java
rename to src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.java
index ec03209c9..2fd9f2ed2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/AbstractJsonMapping.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.fasterxml.jackson.annotation.JsonAnySetter;
 import java.io.Serializable;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/Configuration.java b/src/main/java/com/omertron/themoviedbapi/model2/Configuration.java
similarity index 98%
rename from src/main/java/com/omertron/themoviedbapi/model/Configuration.java
rename to src/main/java/com/omertron/themoviedbapi/model2/Configuration.java
index a8338cc13..069f8a9ef 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Configuration.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/Configuration.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, 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;
 import com.omertron.themoviedbapi.MovieDbException;
 import java.net.MalformedURLException;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java b/src/main/java/com/omertron/themoviedbapi/model2/JobDepartment.java
similarity index 93%
rename from src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java
rename to src/main/java/com/omertron/themoviedbapi/model2/JobDepartment.java
index 1a233b9a0..e50763d9b 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/JobDepartment.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, 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;
 
 import java.util.List;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java b/src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java
similarity index 93%
rename from src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
rename to src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java
index 147df5938..6a8dafae1 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/StatusCode.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, 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/model/Account.java b/src/main/java/com/omertron/themoviedbapi/model2/account/Account.java
similarity index 95%
rename from src/main/java/com/omertron/themoviedbapi/model/Account.java
rename to src/main/java/com/omertron/themoviedbapi/model2/account/Account.java
index 7a732d0e3..f966cc0f8 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/Account.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/account/Account.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2.account;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Account extends AbstractJsonMapping {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java
similarity index 93%
rename from src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
rename to src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java
index 70db092d0..ecf36e60a 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenAuthorisation.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2.authentication;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenAuthorisation extends AbstractJsonMapping {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java
similarity index 95%
rename from src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
rename to src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java
index f812e623a..159d8902d 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/authentication/TokenSession.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model;
+package com.omertron.themoviedbapi.model2.authentication;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TokenSession extends AbstractJsonMapping {
diff --git a/src/main/java/com/omertron/themoviedbapi/model/list/UserList.java b/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/model/list/UserList.java
rename to src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
index 36288c303..bf16345e6 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/list/UserList.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/list/UserList.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+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/model/list/MovieFavorite.java b/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieFavorite.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/model/list/MovieFavorite.java
rename to src/main/java/com/omertron/themoviedbapi/model2/movie/MovieFavorite.java
index 489a91e36..eac5c7c05 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/list/MovieFavorite.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/movie/MovieFavorite.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+package com.omertron.themoviedbapi.model2.movie;
 
+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/model/list/TVFavorite.java b/src/main/java/com/omertron/themoviedbapi/model2/tv/TVFavorite.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/model/list/TVFavorite.java
rename to src/main/java/com/omertron/themoviedbapi/model2/tv/TVFavorite.java
index 388c5bdbe..8e70360d2 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/list/TVFavorite.java
+++ b/src/main/java/com/omertron/themoviedbapi/model2/tv/TVFavorite.java
@@ -17,8 +17,9 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.model.list;
+package com.omertron.themoviedbapi.model2.tv;
 
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import com.omertron.themoviedbapi.model.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
index 43538833b..afc0e1bde 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
+++ b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
@@ -19,7 +19,7 @@
  */
 package com.omertron.themoviedbapi.wrapper;
 
-import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import com.omertron.themoviedbapi.model2.AbstractJsonMapping;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
index 107a7e0c1..fd535cbee 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
+++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java
index 9aec0ce35..e21e509e3 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java
+++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java
@@ -20,7 +20,7 @@
 package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import java.util.List;
 
 /**
diff --git a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java b/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
index a120649bd..eb9ed21af 100644
--- a/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
+++ b/src/test/java/com/omertron/themoviedbapi/AbstractTests.java
@@ -21,9 +21,9 @@ package com.omertron.themoviedbapi;
 
 import com.omertron.themoviedbapi.methods.TmdbAccount;
 import com.omertron.themoviedbapi.methods.TmdbAuthentication;
-import com.omertron.themoviedbapi.model.Account;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.account.Account;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
index ccb06435b..d48758b10 100644
--- a/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java
@@ -27,7 +27,7 @@ import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
 import com.omertron.themoviedbapi.model.discover.Discover;
 import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model.JobDepartment;
+import com.omertron.themoviedbapi.model2.JobDepartment;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
 import com.omertron.themoviedbapi.model.keyword.KeywordMovie;
 import com.omertron.themoviedbapi.model.MovieDb;
@@ -37,9 +37,9 @@ import com.omertron.themoviedbapi.model.person.Person;
 import com.omertron.themoviedbapi.model.person.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
-import com.omertron.themoviedbapi.model.Configuration;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.Configuration;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java
index b7069d8d1..5ed8712e5 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAccountTest.java
@@ -22,11 +22,11 @@ package com.omertron.themoviedbapi.methods;
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.enumeration.MediaType;
-import com.omertron.themoviedbapi.model.Account;
-import com.omertron.themoviedbapi.model.StatusCode;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
-import com.omertron.themoviedbapi.model.list.TVFavorite;
-import com.omertron.themoviedbapi.model.list.UserList;
+import com.omertron.themoviedbapi.model2.account.Account;
+import com.omertron.themoviedbapi.model2.StatusCode;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
+import com.omertron.themoviedbapi.model2.tv.TVFavorite;
+import com.omertron.themoviedbapi.model2.list.UserList;
 import java.util.List;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java
index 9a73574a6..c8e74f4b0 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbAuthenticationTest.java
@@ -21,8 +21,8 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
+import com.omertron.themoviedbapi.model2.authentication.TokenAuthorisation;
+import com.omertron.themoviedbapi.model2.authentication.TokenSession;
 import org.junit.AfterClass;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
index f59f8acfe..65f661a18 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbConfigurationTest.java
@@ -21,7 +21,7 @@ package com.omertron.themoviedbapi.methods;
 
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
-import com.omertron.themoviedbapi.model.Configuration;
+import com.omertron.themoviedbapi.model2.Configuration;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java
index 640072366..c119391b3 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbListsTest.java
@@ -22,7 +22,7 @@ package com.omertron.themoviedbapi.methods;
 import com.omertron.themoviedbapi.AbstractTests;
 import com.omertron.themoviedbapi.MovieDbException;
 import com.omertron.themoviedbapi.model.MovieDbList;
-import com.omertron.themoviedbapi.model.StatusCode;
+import com.omertron.themoviedbapi.model2.StatusCode;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
index ec215741d..f57e707d1 100644
--- a/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
+++ b/src/test/java/com/omertron/themoviedbapi/methods/TmdbMoviesTest.java
@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.model.MovieList;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.model.Video;
-import com.omertron.themoviedbapi.model.list.MovieFavorite;
+import com.omertron.themoviedbapi.model2.movie.MovieFavorite;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import java.util.List;
 import java.util.Random;