diff --git a/src/main/java/org/goudham/me/APIMapper.java b/src/main/java/me/goudham/APIMapper.java
similarity index 94%
rename from src/main/java/org/goudham/me/APIMapper.java
rename to src/main/java/me/goudham/APIMapper.java
index 1eea24a..4e98ded 100644
--- a/src/main/java/org/goudham/me/APIMapper.java
+++ b/src/main/java/me/goudham/APIMapper.java
@@ -1,13 +1,13 @@
-package org.goudham.me;
+package me.goudham;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.goudham.me.api.entity.series.FilteredSeries;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.Waifu;
-import org.goudham.me.exception.APIMapperException;
+import me.goudham.api.entity.series.Series;
+import me.goudham.exception.APIMapperException;
+import me.goudham.api.entity.series.FilteredSeries;
+import me.goudham.api.entity.waifu.Waifu;
 
 import java.util.List;
 
diff --git a/src/main/java/org/goudham/me/APIWrapper.java b/src/main/java/me/goudham/APIWrapper.java
similarity index 92%
rename from src/main/java/org/goudham/me/APIWrapper.java
rename to src/main/java/me/goudham/APIWrapper.java
index 648c7aa..d982453 100644
--- a/src/main/java/org/goudham/me/APIWrapper.java
+++ b/src/main/java/me/goudham/APIWrapper.java
@@ -1,13 +1,13 @@
-package org.goudham.me;
+package me.goudham;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.goudham.me.api.entity.series.FilteredSeries;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.FilteredWaifu;
-import org.goudham.me.api.entity.waifu.Waifu;
-import org.goudham.me.exception.APIMapperException;
-import org.goudham.me.exception.APIResponseException;
+import me.goudham.api.entity.series.FilteredSeries;
+import me.goudham.api.entity.series.Series;
+import me.goudham.api.entity.waifu.FilteredWaifu;
+import me.goudham.api.entity.waifu.Waifu;
+import me.goudham.exception.APIMapperException;
+import me.goudham.exception.APIResponseException;
 
 import java.net.URI;
 import java.net.http.HttpClient;
diff --git a/src/main/java/org/goudham/me/MyWaifuClient.java b/src/main/java/me/goudham/MyWaifuClient.java
similarity index 92%
rename from src/main/java/org/goudham/me/MyWaifuClient.java
rename to src/main/java/me/goudham/MyWaifuClient.java
index 2c5890f..cc8f197 100644
--- a/src/main/java/org/goudham/me/MyWaifuClient.java
+++ b/src/main/java/me/goudham/MyWaifuClient.java
@@ -1,11 +1,11 @@
-package org.goudham.me;
-
-import org.goudham.me.api.entity.series.FilteredSeries;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.FilteredWaifu;
-import org.goudham.me.api.entity.waifu.Waifu;
-import org.goudham.me.exception.APIMapperException;
-import org.goudham.me.exception.APIResponseException;
+package me.goudham;
+
+import me.goudham.api.entity.series.FilteredSeries;
+import me.goudham.api.entity.series.Series;
+import me.goudham.api.entity.waifu.FilteredWaifu;
+import me.goudham.api.entity.waifu.Waifu;
+import me.goudham.exception.APIMapperException;
+import me.goudham.exception.APIResponseException;
 import org.jetbrains.annotations.NotNull;
 
 import javax.net.ssl.SSLParameters;
diff --git a/src/main/java/org/goudham/me/Response.java b/src/main/java/me/goudham/Response.java
similarity index 91%
rename from src/main/java/org/goudham/me/Response.java
rename to src/main/java/me/goudham/Response.java
index 61c9079..fdf91aa 100644
--- a/src/main/java/org/goudham/me/Response.java
+++ b/src/main/java/me/goudham/Response.java
@@ -1,7 +1,7 @@
-package org.goudham.me;
+package me.goudham;
 
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.api.entity.series.Series;
+import me.goudham.api.entity.waifu.Waifu;
 
 /**
  * This is returned to the User when called by methods in {@link MyWaifuClient}.
diff --git a/src/main/java/org/goudham/me/Result.java b/src/main/java/me/goudham/Result.java
similarity index 93%
rename from src/main/java/org/goudham/me/Result.java
rename to src/main/java/me/goudham/Result.java
index 483e752..c56fcbb 100644
--- a/src/main/java/org/goudham/me/Result.java
+++ b/src/main/java/me/goudham/Result.java
@@ -1,4 +1,4 @@
-package org.goudham.me;
+package me.goudham;
 
 class Result {
     private final Integer statusCode;
diff --git a/src/main/java/org/goudham/me/api/entity/PaginationData.java b/src/main/java/me/goudham/api/entity/PaginationData.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/PaginationData.java
rename to src/main/java/me/goudham/api/entity/PaginationData.java
index 6c08c9d..2036561 100644
--- a/src/main/java/org/goudham/me/api/entity/PaginationData.java
+++ b/src/main/java/me/goudham/api/entity/PaginationData.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity;
+package me.goudham.api.entity;
 
 import javax.annotation.processing.Generated;
 
diff --git a/src/main/java/org/goudham/me/api/entity/Studio.java b/src/main/java/me/goudham/api/entity/Studio.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/Studio.java
rename to src/main/java/me/goudham/api/entity/Studio.java
index 7234096..8ce0145 100644
--- a/src/main/java/org/goudham/me/api/entity/Studio.java
+++ b/src/main/java/me/goudham/api/entity/Studio.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity;
+package me.goudham.api.entity;
 
 import javax.annotation.processing.Generated;
 
diff --git a/src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java b/src/main/java/me/goudham/api/entity/series/FilteredSeries.java
similarity index 99%
rename from src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java
rename to src/main/java/me/goudham/api/entity/series/FilteredSeries.java
index 27b94b5..07b9c7b 100644
--- a/src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java
+++ b/src/main/java/me/goudham/api/entity/series/FilteredSeries.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity.series;
+package me.goudham.api.entity.series;
 
 import javax.annotation.processing.Generated;
 
diff --git a/src/main/java/org/goudham/me/api/entity/series/Series.java b/src/main/java/me/goudham/api/entity/series/Series.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/series/Series.java
rename to src/main/java/me/goudham/api/entity/series/Series.java
index ef86aed..d3eda50 100644
--- a/src/main/java/org/goudham/me/api/entity/series/Series.java
+++ b/src/main/java/me/goudham/api/entity/series/Series.java
@@ -1,10 +1,10 @@
-package org.goudham.me.api.entity.series;
+package me.goudham.api.entity.series;
 
 import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.*;
-import org.goudham.me.api.entity.Studio;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.api.entity.Studio;
+import me.goudham.api.entity.waifu.Waifu;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/goudham/me/api/entity/user/Creator.java b/src/main/java/me/goudham/api/entity/user/Creator.java
similarity index 95%
rename from src/main/java/org/goudham/me/api/entity/user/Creator.java
rename to src/main/java/me/goudham/api/entity/user/Creator.java
index 5b42b91..a731470 100644
--- a/src/main/java/org/goudham/me/api/entity/user/Creator.java
+++ b/src/main/java/me/goudham/api/entity/user/Creator.java
@@ -1,9 +1,9 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.api.entity.user;
 
 import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.api.entity.waifu.Waifu;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/goudham/me/api/entity/user/TrueLove.java b/src/main/java/me/goudham/api/entity/user/TrueLove.java
similarity index 96%
rename from src/main/java/org/goudham/me/api/entity/user/TrueLove.java
rename to src/main/java/me/goudham/api/entity/user/TrueLove.java
index 3606c89..b8b36eb 100644
--- a/src/main/java/org/goudham/me/api/entity/user/TrueLove.java
+++ b/src/main/java/me/goudham/api/entity/user/TrueLove.java
@@ -1,11 +1,11 @@
 
-package org.goudham.me.api.entity.user;
+package me.goudham.api.entity.user;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.series.Series;
+import me.goudham.api.entity.series.Series;
 
 import javax.annotation.processing.Generated;
 import java.util.Objects;
diff --git a/src/main/java/org/goudham/me/api/entity/user/User.java b/src/main/java/me/goudham/api/entity/user/User.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/user/User.java
rename to src/main/java/me/goudham/api/entity/user/User.java
index 71fad46..cea7567 100644
--- a/src/main/java/org/goudham/me/api/entity/user/User.java
+++ b/src/main/java/me/goudham/api/entity/user/User.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.api.entity.user;
 
 import javax.annotation.processing.Generated;
 
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.api.entity.waifu.Waifu;
 
 import java.util.Objects;
 
diff --git a/src/main/java/org/goudham/me/api/entity/user/UserList.java b/src/main/java/me/goudham/api/entity/user/UserList.java
similarity index 97%
rename from src/main/java/org/goudham/me/api/entity/user/UserList.java
rename to src/main/java/me/goudham/api/entity/user/UserList.java
index a962aaf..4ee0a43 100644
--- a/src/main/java/org/goudham/me/api/entity/user/UserList.java
+++ b/src/main/java/me/goudham/api/entity/user/UserList.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.api.entity.user;
 
 import java.util.List;
 import java.util.Objects;
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.api.entity.waifu.Waifu;
 
 /**
  * {@link UserList}
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java b/src/main/java/me/goudham/api/entity/waifu/FilteredWaifu.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java
rename to src/main/java/me/goudham/api/entity/waifu/FilteredWaifu.java
index 52abbe1..71b0866 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java
+++ b/src/main/java/me/goudham/api/entity/waifu/FilteredWaifu.java
@@ -1,7 +1,7 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.api.entity.waifu;
 
 import com.fasterxml.jackson.annotation.*;
-import org.goudham.me.api.entity.series.FilteredSeries;
+import me.goudham.api.entity.series.FilteredSeries;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/Waifu.java b/src/main/java/me/goudham/api/entity/waifu/Waifu.java
similarity index 99%
rename from src/main/java/org/goudham/me/api/entity/waifu/Waifu.java
rename to src/main/java/me/goudham/api/entity/waifu/Waifu.java
index e80b849..2005e31 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/Waifu.java
+++ b/src/main/java/me/goudham/api/entity/waifu/Waifu.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.api.entity.waifu;
 
 import java.util.HashMap;
 import java.util.List;
@@ -7,8 +7,8 @@ import java.util.Objects;
 import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.*;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.user.Creator;
+import me.goudham.api.entity.series.Series;
+import me.goudham.api.entity.user.Creator;
 
 
 /**
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java b/src/main/java/me/goudham/api/entity/waifu/WaifuImage.java
similarity index 98%
rename from src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java
rename to src/main/java/me/goudham/api/entity/waifu/WaifuImage.java
index 06ef5d7..1ae4af0 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java
+++ b/src/main/java/me/goudham/api/entity/waifu/WaifuImage.java
@@ -1,4 +1,4 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.api.entity.waifu;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/goudham/me/exception/APIMapperException.java b/src/main/java/me/goudham/exception/APIMapperException.java
similarity index 74%
rename from src/main/java/org/goudham/me/exception/APIMapperException.java
rename to src/main/java/me/goudham/exception/APIMapperException.java
index 79bad38..4c7d9f3 100644
--- a/src/main/java/org/goudham/me/exception/APIMapperException.java
+++ b/src/main/java/me/goudham/exception/APIMapperException.java
@@ -1,7 +1,7 @@
-package org.goudham.me.exception;
+package me.goudham.exception;
 
-import org.goudham.me.APIWrapper;
-import org.goudham.me.Response;
+import me.goudham.APIWrapper;
+import me.goudham.Response;
 
 /**
  * Thrown when {@link APIWrapper} fails to deserialize json into Java POJO's ({@link Response#getEntity()})
diff --git a/src/main/java/org/goudham/me/exception/APIResponseException.java b/src/main/java/me/goudham/exception/APIResponseException.java
similarity index 78%
rename from src/main/java/org/goudham/me/exception/APIResponseException.java
rename to src/main/java/me/goudham/exception/APIResponseException.java
index 53259d2..f1a3439 100644
--- a/src/main/java/org/goudham/me/exception/APIResponseException.java
+++ b/src/main/java/me/goudham/exception/APIResponseException.java
@@ -1,6 +1,6 @@
-package org.goudham.me.exception;
+package me.goudham.exception;
 
-import org.goudham.me.APIWrapper;
+import me.goudham.APIWrapper;
 
 /**
  * Thrown when {@link APIWrapper} fails to return API information