diff --git a/src/main/java/com/omertron/themoviedbapi/interfaces/IWrapperDates.java b/src/main/java/com/omertron/themoviedbapi/interfaces/IWrapperDates.java
index 384cff887..bdb3b490b 100644
--- a/src/main/java/com/omertron/themoviedbapi/interfaces/IWrapperDates.java
+++ b/src/main/java/com/omertron/themoviedbapi/interfaces/IWrapperDates.java
@@ -19,7 +19,7 @@
  */
 package com.omertron.themoviedbapi.interfaces;
 
-import com.omertron.themoviedbapi.wrapper.ResultDates;
+import com.omertron.themoviedbapi.results.ResultDates;
 
 public interface IWrapperDates {
 
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
index a9587fd34..b6494cbbe 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/AbstractMethod.java
@@ -45,8 +45,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperChanges;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperChanges;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import java.util.HashMap;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
index ae168a77b..56fd00dff 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbAccount.java
@@ -36,7 +36,7 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java
index fa2d73cab..de488feed 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbChanges.java
@@ -28,7 +28,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.net.URL;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
index 1b6708fbb..24c781c59 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCollections.java
@@ -30,7 +30,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperImages;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
index 40e880f31..848d96e9b 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbCompanies.java
@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
index e5ae1a807..b23a8a870 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbConfiguration.java
@@ -30,8 +30,8 @@ import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
-import com.omertron.themoviedbapi.wrapper.WrapperConfig;
-import com.omertron.themoviedbapi.wrapper.WrapperJobList;
+import com.omertron.themoviedbapi.results.WrapperConfig;
+import com.omertron.themoviedbapi.results.WrapperJobList;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java
index 208393d08..102785400 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbDiscover.java
@@ -28,7 +28,7 @@ import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.HttpTools;
 import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.net.URL;
 
 /**
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
index 4ef94d6b2..32cac1636 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbEpisodes.java
@@ -38,8 +38,8 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
index 7b38be0a0..c5a80403c 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbGenres.java
@@ -29,8 +29,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperGenres;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenres;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java
index 375d971c0..aef9a7ab8 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbKeywords.java
@@ -29,7 +29,7 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
index b748b37be..46c6644bb 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbMovies.java
@@ -43,13 +43,13 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords;
-import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperMovieKeywords;
+import com.omertron.themoviedbapi.results.WrapperReleaseInfo;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
index ae735bfcc..987db6c69 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbPeople.java
@@ -42,8 +42,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
index 718bdcdc2..ca3d15ec7 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSearch.java
@@ -37,8 +37,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperMultiSearch;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperMultiSearch;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
index a6c138fb4..7f4301632 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbSeasons.java
@@ -35,8 +35,8 @@ import com.omertron.themoviedbapi.tools.MethodBase;
 import com.omertron.themoviedbapi.tools.MethodSub;
 import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java b/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
index 5c61b39a7..c183c29ee 100644
--- a/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
+++ b/src/main/java/com/omertron/themoviedbapi/methods/TmdbTV.java
@@ -43,10 +43,10 @@ import com.omertron.themoviedbapi.tools.Param;
 import com.omertron.themoviedbapi.tools.PostBody;
 import com.omertron.themoviedbapi.tools.PostTools;
 import com.omertron.themoviedbapi.tools.TmdbParameters;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.io.IOException;
 import java.net.URL;
 import org.yamj.api.common.exception.ApiExceptionType;
diff --git a/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
index 54eddba31..cd9f345bd 100644
--- a/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/model/movie/MovieInfo.java
@@ -36,13 +36,13 @@ import com.omertron.themoviedbapi.model.media.MediaCreditCast;
 import com.omertron.themoviedbapi.model.media.MediaCreditCrew;
 import com.omertron.themoviedbapi.model.media.MediaCreditList;
 import com.omertron.themoviedbapi.model.review.Review;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
-import com.omertron.themoviedbapi.wrapper.WrapperGenericList;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords;
-import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo;
-import com.omertron.themoviedbapi.wrapper.WrapperTranslations;
-import com.omertron.themoviedbapi.wrapper.WrapperVideos;
+import com.omertron.themoviedbapi.results.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.results.WrapperGenericList;
+import com.omertron.themoviedbapi.results.WrapperImages;
+import com.omertron.themoviedbapi.results.WrapperMovieKeywords;
+import com.omertron.themoviedbapi.results.WrapperReleaseInfo;
+import com.omertron.themoviedbapi.results.WrapperTranslations;
+import com.omertron.themoviedbapi.results.WrapperVideos;
 import java.util.List;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperAll.java b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperAll.java
similarity index 57%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperAll.java
rename to src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperAll.java
index 05b129609..6e2024535 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperAll.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperAll.java
@@ -17,65 +17,28 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.interfaces.IWrapperDates;
 import com.omertron.themoviedbapi.interfaces.IWrapperPages;
 import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.results.AbstractResults;
 
 /**
  * Base class for the wrappers
  *
  * @author Stuart
  */
-public class AbstractWrapperAll extends AbstractWrapperId implements IIdentification, IWrapperPages, IWrapperDates {
+public class AbstractWrapperAll extends AbstractWrapperIdPages implements IIdentification, IWrapperPages, IWrapperDates {
 
-    @JsonProperty("page")
-    private int page;
-    @JsonProperty("total_pages")
-    private int totalPages;
-    @JsonProperty("total_results")
-    private int totalResults;
     @JsonProperty("dates")
     private ResultDates dates = new ResultDates();
 
-    @Override
-    public int getPage() {
-        return page;
-    }
-
-    @Override
-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    @Override
-    public int getTotalResults() {
-        return totalResults;
-    }
-
     @Override
     public ResultDates getDates() {
         return dates;
     }
 
-    @Override
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    @Override
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    @Override
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
-
     @Override
     public void setDates(ResultDates dates) {
         this.dates = dates;
@@ -87,10 +50,7 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IIdentifica
      * @param results
      */
     @Override
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         super.setResultProperties(results);
-        results.setPage(page);
-        results.setTotalPages(totalPages);
-        results.setTotalResults(totalResults);
     }
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
similarity index 87%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
rename to src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
index 498aed107..6a814adde 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperBase.java
@@ -17,16 +17,15 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;
-import com.omertron.themoviedbapi.results.AbstractResults;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
-public abstract class AbstractWrapper extends AbstractJsonMapping {
+public abstract class AbstractWrapperBase extends AbstractJsonMapping {
 
     /**
      * Get a list of the enums passed
@@ -49,7 +48,7 @@ public abstract class AbstractWrapper extends AbstractJsonMapping {
      *
      * @param results
      */
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         // There are no values to copy
         results.setId(0);
         results.setPage(0);
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperId.java b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperId.java
similarity index 84%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperId.java
rename to src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperId.java
index 9dd07c64e..4e5fdc354 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperId.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperId.java
@@ -17,18 +17,17 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.results.AbstractResults;
 
 /**
  * Base class for the wrappers
  *
  * @author Stuart
  */
-public class AbstractWrapperId extends AbstractWrapper implements IIdentification {
+public class AbstractWrapperId extends AbstractWrapperBase implements IIdentification {
 
     @JsonProperty("id")
     private int id;
@@ -49,7 +48,7 @@ public class AbstractWrapperId extends AbstractWrapper implements IIdentificatio
      * @param results
      */
     @Override
-    public void setResultProperties(AbstractResults results) {
+    public void setResultProperties(AbstractWrapperIdPages results) {
         super.setResultProperties(results);
         results.setId(id);
     }
diff --git a/src/main/java/com/omertron/themoviedbapi/results/AbstractResults.java b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperIdPages.java
similarity index 75%
rename from src/main/java/com/omertron/themoviedbapi/results/AbstractResults.java
rename to src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperIdPages.java
index e40ec7dfa..a34825149 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/AbstractResults.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/AbstractWrapperIdPages.java
@@ -19,28 +19,19 @@
  */
 package com.omertron.themoviedbapi.results;
 
-import com.omertron.themoviedbapi.interfaces.IIdentification;
 import com.omertron.themoviedbapi.interfaces.IWrapperPages;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * Abstract class to return the results and the id/page info
  *
  * @author Stuart
  */
-public abstract class AbstractResults implements IIdentification, IWrapperPages {
+public abstract class AbstractWrapperIdPages extends AbstractWrapperId implements IWrapperPages {
 
-    private int id = 0;
     private int page = 0;
     private int totalPages = 0;
     private int totalResults = 0;
 
-    @Override
-    public int getId() {
-        return id;
-    }
-
     @Override
     public int getPage() {
         return page;
@@ -56,11 +47,6 @@ public abstract class AbstractResults implements IIdentification, IWrapperPages
         return totalResults;
     }
 
-    @Override
-    public void setId(int id) {
-        this.id = id;
-    }
-
     @Override
     public void setPage(int page) {
         this.page = page;
@@ -76,8 +62,16 @@ public abstract class AbstractResults implements IIdentification, IWrapperPages
         this.totalResults = totalResults;
     }
 
+    /**
+     * Copy the wrapper values to the results
+     *
+     * @param results
+     */
     @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    public void setResultProperties(AbstractWrapperIdPages results) {
+        super.setResultProperties(results);
+        results.setPage(page);
+        results.setTotalPages(totalPages);
+        results.setTotalResults(totalResults);
     }
 }
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/ResultDates.java b/src/main/java/com/omertron/themoviedbapi/results/ResultDates.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/ResultDates.java
rename to src/main/java/com/omertron/themoviedbapi/results/ResultDates.java
index b25c16d68..998a78b51 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/ResultDates.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/ResultDates.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.AbstractJsonMapping;
diff --git a/src/main/java/com/omertron/themoviedbapi/results/ResultList.java b/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
index 0f54f6870..a58f013d8 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/ResultList.java
@@ -31,7 +31,7 @@ import java.util.List;
  * @author Stuart
  * @param <T>
  */
-public final class ResultList<T> extends AbstractResults {
+public final class ResultList<T> extends AbstractWrapperIdPages {
 
     private List<T> results;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java b/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
index ebc73b632..6e6391c1d 100644
--- a/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/ResultsMap.java
@@ -32,7 +32,7 @@ import java.util.Map;
  * @param <K>
  * @param <V>
  */
-public final class ResultsMap<K, V> extends AbstractResults {
+public final class ResultsMap<K, V> extends AbstractWrapperIdPages {
 
     private Map<K, V> results;
 
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperAlternativeTitles.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperAlternativeTitles.java
index 0f124e262..d5714e096 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperAlternativeTitles.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.media.AlternativeTitle;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
similarity index 92%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
index 9997d025b..4a39c0365 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperChanges.java
@@ -17,14 +17,14 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.change.ChangeKeyItem;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WrapperChanges extends AbstractWrapper {
+public class WrapperChanges extends AbstractWrapperBase {
 
     @JsonProperty("changes")
     private List<ChangeKeyItem> changedItems = new ArrayList<ChangeKeyItem>();
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperConfig.java
similarity index 93%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperConfig.java
index 98be2fae6..18a0ac555 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperConfig.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.config.Configuration;
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperConfig extends AbstractWrapper {
+public class WrapperConfig extends AbstractWrapperBase {
 
     @JsonProperty("images")
     private Configuration tmdbConfiguration;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenericList.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenericList.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
index f44b0914e..2e233122e 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenericList.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenericList.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenres.java
similarity index 92%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperGenres.java
index 6756690ad..5b3b9c2dd 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperGenres.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Genre;
@@ -28,7 +28,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperGenres extends AbstractWrapper {
+public class WrapperGenres extends AbstractWrapperBase {
 
     @JsonProperty("genres")
     private List<Genre> genres;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
similarity index 98%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
index f743f1fa5..a03b530b3 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperImages.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.enumeration.ArtworkType;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperJobList.java
similarity index 92%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperJobList.java
index 1221b26a6..e639f2f0c 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperJobList.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.config.JobDepartment;
@@ -27,7 +27,7 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperJobList extends AbstractWrapper {
+public class WrapperJobList extends AbstractWrapperBase {
 
     @JsonProperty("jobs")
     private List<JobDepartment> jobs;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperMovieKeywords.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperMovieKeywords.java
index 86a8628fd..fe0c6e959 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperMovieKeywords.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.keyword.Keyword;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperMultiSearch.java
similarity index 97%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperMultiSearch.java
index e08d79dc7..a71ee38ef 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMultiSearch.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperMultiSearch.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperReleaseInfo.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperReleaseInfo.java
index 2dd141b42..663aae065 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperReleaseInfo.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.movie.ReleaseInfo;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperTranslations.java
similarity index 96%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperTranslations.java
index dae57450e..93e0f8742 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperTranslations.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.media.Translation;
diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java b/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
similarity index 98%
rename from src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java
rename to src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
index 96411dd9e..609c875ab 100644
--- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperVideos.java
+++ b/src/main/java/com/omertron/themoviedbapi/results/WrapperVideos.java
@@ -17,7 +17,7 @@
  *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.omertron.themoviedbapi.wrapper;
+package com.omertron.themoviedbapi.results;
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.omertron.themoviedbapi.model.media.Trailer;