From 616eed4c0d799d70500b59abe7e78de6f5245e82 Mon Sep 17 00:00:00 2001
From: Tykok <treportelie12@gmail.com>
Date: Sat, 29 Jun 2024 01:44:16 +0200
Subject: [PATCH 1/2] [Feat] Update PokeAPi class to use only valid classes

---
 .idea/kotlinc.xml                             |   3 +
 build.gradle.kts                              |  11 +-
 docs/mkdocs-markdown/entities/berry.md        |   2 +-
 docs/mkdocs-markdown/methods.md               |   8 +-
 docs/site/entities/berry/index.html           |  28 +-
 docs/site/methods/index.html                  |  32 +--
 src/main/kotlin/PokeApi.kt                    |  90 +++---
 src/main/kotlin/entities/PokeApiObject.kt     |   3 +
 .../{entity => entities}/berries/Berry.kt     |  31 +--
 .../berries/BerryFirmness.kt                  |  19 +-
 .../berries/BerryFlavor.kt                    |  23 +-
 .../berries/BerryFlavorMap.kt                 |  14 +-
 .../berries/FlavorBerryMap.kt                 |  13 +-
 .../common/APIResource.kt                     |   4 +-
 .../common/Description.kt                     |  14 +-
 .../{entity => entities}/common/Effect.kt     |  13 +-
 .../{entity => entities}/common/Encounter.kt  |  20 +-
 .../{entity => entities}/common/FlavorText.kt |  17 +-
 .../common/GenerationGameIndex.kt             |   8 +-
 .../common/MachineVersionDetail.kt            |  15 +-
 .../{entity => entities}/common/Name.kt       |  14 +-
 .../common/NamedApiResource.kt                |  27 +-
 .../common/NamedApiResources.kt               |  15 +-
 .../common/VerboseEffect.kt                   |   9 +-
 .../common/VersionEncounterDetail.kt          |  15 +-
 .../common/VersionGameIndex.kt                |   7 +-
 .../common/VersionGroupFlavorText.kt          |  11 +-
 .../contests/ContestEffect.kt                 |  20 +-
 .../contests/ContestName.kt                   |  17 +-
 .../contests/ContestType.kt                   |  18 +-
 .../contests/SuperContestEffects.kt           |  21 +-
 .../encounters/EncounterCondition.kt          |  19 +-
 .../encounters/EncounterConditionValue.kt     |  17 +-
 .../encounters/EncounterMethod.kt             |  17 +-
 .../evolution/ChainLink.kt                    |  18 +-
 .../evolution/EvolutionChain.kt               |  19 +-
 .../evolution/EvolutionDetail.kt              |  34 +--
 .../evolution/EvolutionTrigger.kt             |  21 +-
 .../{entity => entities}/games/Generation.kt  |  35 +--
 .../{entity => entities}/games/Pokedex.kt     |  27 +-
 .../games/PokemonEntry.kt                     |  16 +-
 .../{entity => entities}/games/Version.kt     |  18 +-
 .../games/VersionGroup.kt                     |  25 +-
 .../kotlin/{entity => entities}/items/Item.kt |  45 +--
 .../items/ItemAttribute.kt                    |  22 +-
 .../items/ItemCategory.kt                     |  20 +-
 .../items/ItemFlingEffect.kt                  |  19 +-
 .../items/ItemHolderPokemon.kt                |   7 +-
 .../items/ItemHolderPokemonVersionDetail.kt   |  10 +-
 .../{entity => entities}/items/ItemPocket.kt  |  19 +-
 .../{entity => entities}/items/ItemSprites.kt |   4 +-
 .../locations/EncounterMethodRate.kt          |  16 +-
 .../locations/EncounterVersionDetails.kt      |  16 +-
 .../locations/Location.kt                     |  22 +-
 .../locations/LocationArea.kt                 |  23 +-
 .../locations/PalParkArea.kt                  |  16 +-
 .../locations/PalParkEncounterSpecies.kt      |  17 +-
 .../locations/PokemonEncounter.kt             |  17 +-
 .../{entity => entities}/locations/Region.kt  |  28 +-
 .../{entity => entities}/machines/Machine.kt  |  23 +-
 .../moves/ContestComboDetail.kt               |  15 +-
 .../moves/ContestComboSets.kt                 |   6 +-
 .../kotlin/{entity => entities}/moves/Move.kt |  54 +---
 .../{entity => entities}/moves/MoveAilment.kt |  20 +-
 .../moves/MoveBattleStyle.kt                  |  16 +-
 .../moves/MoveCategory.kt                     |  15 +-
 .../moves/MoveDamageClass.kt                  |  22 +-
 .../moves/MoveFlavorText.kt                   |  20 +-
 .../moves/MoveLearnMethod.kt                  |  25 +-
 .../moves/MoveMetaData.kt                     |  25 +-
 .../moves/MoveStatChange.kt                   |  15 +-
 .../{entity => entities}/moves/MoveTarget.kt  |  23 +-
 .../moves/PastMoveStatValues.kt               |  25 +-
 .../{entity => entities}/pokemon/Ability.kt   |  32 +--
 .../pokemon/AbilityFlavorText.kt              |  12 +-
 .../pokemon/AbilityPokemon.kt                 |   9 +-
 .../pokemon/AwesomeName.kt                    |  15 +-
 .../pokemon/Characteristic.kt                 |  19 +-
 .../{entity => entities}/pokemon/EggGroup.kt  |  18 +-
 .../{entity => entities}/pokemon/Gender.kt    |  19 +-
 .../{entity => entities}/pokemon/Genus.kt     |  16 +-
 .../pokemon/GrowthRate.kt                     |  21 +-
 .../pokemon/GrowthRateExperienceLevel.kt      |  13 +-
 .../pokemon/MoveBattleStylePreference.kt      |  16 +-
 .../pokemon/MoveStatAffect.kt                 |   8 +-
 .../pokemon/MoveStatAffectSets.kt             |  13 +-
 .../{entity => entities}/pokemon/Nature.kt    |  27 +-
 .../pokemon/NaturePokeathlonStatAffect.kt     |  13 +-
 .../pokemon/NaturePokeathlonStatAffectSets.kt |  11 +-
 .../pokemon/NatureStatAffectSets.kt           |  14 +-
 .../pokemon/NatureStatChange.kt               |  13 +-
 .../pokemon/PalParkEncounterArea.kt           |  14 +-
 .../pokemon/PokeathlonStat.kt                 |  17 +-
 .../{entity => entities}/pokemon/Pokemon.kt   |  35 +--
 .../pokemon/PokemonAbility.kt                 |   8 +-
 .../pokemon/PokemonColor.kt                   |  19 +-
 .../pokemon/PokemonEncounter.kt               |  18 +-
 .../pokemon/PokemonForm.kt                    |  32 +--
 .../pokemon/PokemonFormSprites.kt             |  22 +-
 .../pokemon/PokemonFormType.kt                |  13 +-
 .../pokemon/PokemonHabitat.kt                 |  19 +-
 .../pokemon/PokemonHeldItem.kt                |   9 +-
 .../pokemon/PokemonHeldItemVersion.kt         |   9 +-
 .../entities/pokemon/PokemonLocationArea.kt   |  14 +
 .../pokemon/PokemonMove.kt                    |   9 +-
 .../pokemon/PokemonMoveVersion.kt             |  12 +-
 .../pokemon/PokemonShape.kt                   |  18 +-
 .../pokemon/PokemonSpecies.kt                 |  55 +---
 .../pokemon/PokemonSpeciesDexEntry.kt         |  15 +-
 .../pokemon/PokemonSpeciesGender.kt           |  13 +-
 .../pokemon/PokemonSpeciesVariety.kt          |  13 +-
 .../pokemon/PokemonSprites.kt                 |  33 +--
 .../pokemon/PokemonStat.kt                    |   8 +-
 .../pokemon/PokemonType.kt                    |   7 +-
 .../pokemon/PokemonTypePast.kt                |   9 +-
 .../{entity => entities}/pokemon/Stat.kt      |  28 +-
 .../{entity => entities}/pokemon/Type.kt      |  31 +--
 .../kotlin/entities/pokemon/TypePokemon.kt    |  11 +
 .../pokemon/TypeRelations.kt                  |   6 +-
 .../pokemon/TypeRelationsPast.kt              |  14 +-
 .../{entity => entities}/utility/Language.kt  |  19 +-
 .../entity/pokemon/PokemonLocationArea.kt     |  18 --
 src/main/kotlin/entity/pokemon/TypePokemon.kt |  17 --
 .../exception/HttpBodyResponseException.kt    |   5 -
 src/main/kotlin/exception/PokeApiException.kt |   4 +-
 .../exception/UnknownEndpointException.kt     |   8 +-
 src/main/kotlin/http/EndpointReference.kt     | 259 +++++++++---------
 src/test/kotlin/Berry.kt                      |   1 +
 src/test/kotlin/PokeApiTest.kt                |  40 ---
 129 files changed, 847 insertions(+), 1737 deletions(-)
 create mode 100644 src/main/kotlin/entities/PokeApiObject.kt
 rename src/main/kotlin/{entity => entities}/berries/Berry.kt (83%)
 rename src/main/kotlin/{entity => entities}/berries/BerryFirmness.kt (68%)
 rename src/main/kotlin/{entity => entities}/berries/BerryFlavor.kt (72%)
 rename src/main/kotlin/{entity => entities}/berries/BerryFlavorMap.kt (72%)
 rename src/main/kotlin/{entity => entities}/berries/FlavorBerryMap.kt (71%)
 rename src/main/kotlin/{entity => entities}/common/APIResource.kt (86%)
 rename src/main/kotlin/{entity => entities}/common/Description.kt (72%)
 rename src/main/kotlin/{entity => entities}/common/Effect.kt (72%)
 rename src/main/kotlin/{entity => entities}/common/Encounter.kt (77%)
 rename src/main/kotlin/{entity => entities}/common/FlavorText.kt (73%)
 rename src/main/kotlin/{entity => entities}/common/GenerationGameIndex.kt (86%)
 rename src/main/kotlin/{entity => entities}/common/MachineVersionDetail.kt (70%)
 rename src/main/kotlin/{entity => entities}/common/Name.kt (73%)
 rename src/main/kotlin/{entity => entities}/common/NamedApiResource.kt (61%)
 rename src/main/kotlin/{entity => entities}/common/NamedApiResources.kt (60%)
 rename src/main/kotlin/{entity => entities}/common/VerboseEffect.kt (88%)
 rename src/main/kotlin/{entity => entities}/common/VersionEncounterDetail.kt (74%)
 rename src/main/kotlin/{entity => entities}/common/VersionGameIndex.kt (78%)
 rename src/main/kotlin/{entity => entities}/common/VersionGroupFlavorText.kt (85%)
 rename src/main/kotlin/{entity => entities}/contests/ContestEffect.kt (79%)
 rename src/main/kotlin/{entity => entities}/contests/ContestName.kt (78%)
 rename src/main/kotlin/{entity => entities}/contests/ContestType.kt (83%)
 rename src/main/kotlin/{entity => entities}/contests/SuperContestEffects.kt (78%)
 rename src/main/kotlin/{entity => entities}/encounters/EncounterCondition.kt (77%)
 rename src/main/kotlin/{entity => entities}/encounters/EncounterConditionValue.kt (79%)
 rename src/main/kotlin/{entity => entities}/encounters/EncounterMethod.kt (80%)
 rename src/main/kotlin/{entity => entities}/evolution/ChainLink.kt (79%)
 rename src/main/kotlin/{entity => entities}/evolution/EvolutionChain.kt (82%)
 rename src/main/kotlin/{entity => entities}/evolution/EvolutionDetail.kt (94%)
 rename src/main/kotlin/{entity => entities}/evolution/EvolutionTrigger.kt (75%)
 rename src/main/kotlin/{entity => entities}/games/Generation.kt (75%)
 rename src/main/kotlin/{entity => entities}/games/Pokedex.kt (81%)
 rename src/main/kotlin/{entity => entities}/games/PokemonEntry.kt (68%)
 rename src/main/kotlin/{entity => entities}/games/Version.kt (78%)
 rename src/main/kotlin/{entity => entities}/games/VersionGroup.kt (82%)
 rename src/main/kotlin/{entity => entities}/items/Item.kt (79%)
 rename src/main/kotlin/{entity => entities}/items/ItemAttribute.kt (78%)
 rename src/main/kotlin/{entity => entities}/items/ItemCategory.kt (81%)
 rename src/main/kotlin/{entity => entities}/items/ItemFlingEffect.kt (76%)
 rename src/main/kotlin/{entity => entities}/items/ItemHolderPokemon.kt (87%)
 rename src/main/kotlin/{entity => entities}/items/ItemHolderPokemonVersionDetail.kt (76%)
 rename src/main/kotlin/{entity => entities}/items/ItemPocket.kt (79%)
 rename src/main/kotlin/{entity => entities}/items/ItemSprites.kt (92%)
 rename src/main/kotlin/{entity => entities}/locations/EncounterMethodRate.kt (70%)
 rename src/main/kotlin/{entity => entities}/locations/EncounterVersionDetails.kt (69%)
 rename src/main/kotlin/{entity => entities}/locations/Location.kt (81%)
 rename src/main/kotlin/{entity => entities}/locations/LocationArea.kt (82%)
 rename src/main/kotlin/{entity => entities}/locations/PalParkArea.kt (77%)
 rename src/main/kotlin/{entity => entities}/locations/PalParkEncounterSpecies.kt (71%)
 rename src/main/kotlin/{entity => entities}/locations/PokemonEncounter.kt (68%)
 rename src/main/kotlin/{entity => entities}/locations/Region.kt (80%)
 rename src/main/kotlin/{entity => entities}/machines/Machine.kt (78%)
 rename src/main/kotlin/{entity => entities}/moves/ContestComboDetail.kt (73%)
 rename src/main/kotlin/{entity => entities}/moves/ContestComboSets.kt (92%)
 rename src/main/kotlin/{entity => entities}/moves/Move.kt (82%)
 rename src/main/kotlin/{entity => entities}/moves/MoveAilment.kt (73%)
 rename src/main/kotlin/{entity => entities}/moves/MoveBattleStyle.kt (71%)
 rename src/main/kotlin/{entity => entities}/moves/MoveCategory.kt (75%)
 rename src/main/kotlin/{entity => entities}/moves/MoveDamageClass.kt (73%)
 rename src/main/kotlin/{entity => entities}/moves/MoveFlavorText.kt (68%)
 rename src/main/kotlin/{entity => entities}/moves/MoveLearnMethod.kt (71%)
 rename src/main/kotlin/{entity => entities}/moves/MoveMetaData.kt (83%)
 rename src/main/kotlin/{entity => entities}/moves/MoveStatChange.kt (63%)
 rename src/main/kotlin/{entity => entities}/moves/MoveTarget.kt (74%)
 rename src/main/kotlin/{entity => entities}/moves/PastMoveStatValues.kt (75%)
 rename src/main/kotlin/{entity => entities}/pokemon/Ability.kt (72%)
 rename src/main/kotlin/{entity => entities}/pokemon/AbilityFlavorText.kt (78%)
 rename src/main/kotlin/{entity => entities}/pokemon/AbilityPokemon.kt (87%)
 rename src/main/kotlin/{entity => entities}/pokemon/AwesomeName.kt (60%)
 rename src/main/kotlin/{entity => entities}/pokemon/Characteristic.kt (69%)
 rename src/main/kotlin/{entity => entities}/pokemon/EggGroup.kt (72%)
 rename src/main/kotlin/{entity => entities}/pokemon/Gender.kt (72%)
 rename src/main/kotlin/{entity => entities}/pokemon/Genus.kt (59%)
 rename src/main/kotlin/{entity => entities}/pokemon/GrowthRate.kt (75%)
 rename src/main/kotlin/{entity => entities}/pokemon/GrowthRateExperienceLevel.kt (60%)
 rename src/main/kotlin/{entity => entities}/pokemon/MoveBattleStylePreference.kt (63%)
 rename src/main/kotlin/{entity => entities}/pokemon/MoveStatAffect.kt (61%)
 rename src/main/kotlin/{entity => entities}/pokemon/MoveStatAffectSets.kt (66%)
 rename src/main/kotlin/{entity => entities}/pokemon/Nature.kt (79%)
 rename src/main/kotlin/{entity => entities}/pokemon/NaturePokeathlonStatAffect.kt (60%)
 rename src/main/kotlin/{entity => entities}/pokemon/NaturePokeathlonStatAffectSets.kt (66%)
 rename src/main/kotlin/{entity => entities}/pokemon/NatureStatAffectSets.kt (63%)
 rename src/main/kotlin/{entity => entities}/pokemon/NatureStatChange.kt (61%)
 rename src/main/kotlin/{entity => entities}/pokemon/PalParkEncounterArea.kt (70%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokeathlonStat.kt (72%)
 rename src/main/kotlin/{entity => entities}/pokemon/Pokemon.kt (82%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonAbility.kt (83%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonColor.kt (70%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonEncounter.kt (60%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonForm.kt (80%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonFormSprites.kt (59%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonFormType.kt (63%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonHabitat.kt (53%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonHeldItem.kt (67%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonHeldItemVersion.kt (58%)
 create mode 100644 src/main/kotlin/entities/pokemon/PokemonLocationArea.kt
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonMove.kt (71%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonMoveVersion.kt (77%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonShape.kt (75%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonSpecies.kt (65%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonSpeciesDexEntry.kt (57%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonSpeciesGender.kt (67%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonSpeciesVariety.kt (58%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonSprites.kt (72%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonStat.kt (82%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonType.kt (77%)
 rename src/main/kotlin/{entity => entities}/pokemon/PokemonTypePast.kt (70%)
 rename src/main/kotlin/{entity => entities}/pokemon/Stat.kt (76%)
 rename src/main/kotlin/{entity => entities}/pokemon/Type.kt (59%)
 create mode 100644 src/main/kotlin/entities/pokemon/TypePokemon.kt
 rename src/main/kotlin/{entity => entities}/pokemon/TypeRelations.kt (86%)
 rename src/main/kotlin/{entity => entities}/pokemon/TypeRelationsPast.kt (62%)
 rename src/main/kotlin/{entity => entities}/utility/Language.kt (80%)
 delete mode 100644 src/main/kotlin/entity/pokemon/PokemonLocationArea.kt
 delete mode 100644 src/main/kotlin/entity/pokemon/TypePokemon.kt
 delete mode 100644 src/main/kotlin/exception/HttpBodyResponseException.kt
 create mode 100644 src/test/kotlin/Berry.kt
 delete mode 100644 src/test/kotlin/PokeApiTest.kt

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index b1077fb..d6504c9 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="1.8" />
+  </component>
   <component name="KotlinJpsPluginSettings">
     <option name="version" value="1.7.10" />
   </component>
diff --git a/build.gradle.kts b/build.gradle.kts
index f49e936..ced5106 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,11 +10,12 @@ description = "PokeApi is a simple library you can use to make request to get da
 group = "fr.tykok"
 version = "1.0.0"
 
-fun getUriSonar(): String = if (version.toString().endsWith("SNAPSHOT")) {
-    sonarSnapshotUri
-} else {
-    sonarReleaseUri
-}
+fun getUriSonar(): String =
+    if (version.toString().endsWith("SNAPSHOT")) {
+        sonarSnapshotUri
+    } else {
+        sonarReleaseUri
+    }
 
 plugins {
     `java-library`
diff --git a/docs/mkdocs-markdown/entities/berry.md b/docs/mkdocs-markdown/entities/berry.md
index ef10a42..a3e0384 100644
--- a/docs/mkdocs-markdown/entities/berry.md
+++ b/docs/mkdocs-markdown/entities/berry.md
@@ -1,6 +1,6 @@
 # Berry
 
-The `Berry` entity is used to map data from `https://pokeapi.co/api/v2/berry/...`.
+The `Berry` entities is used to map data from `https://pokeapi.co/api/v2/berry/...`.
 
 ![Berry](../img/berry.jpeg)
 
diff --git a/docs/mkdocs-markdown/methods.md b/docs/mkdocs-markdown/methods.md
index 1b64794..6ce28d8 100644
--- a/docs/mkdocs-markdown/methods.md
+++ b/docs/mkdocs-markdown/methods.md
@@ -3,13 +3,13 @@
 To use the methods, you need to import `PokeApi` class. Next, you can use the `get` methods to fetch data from the
 [pokeapi.co][pokeapi].
 
-You need to give the entity type as a generic parameter to the `get()` methods. The available entity types are available
-in the `fr.tykok.pokeapi.entity` package, all the documentation are given in the `API Resource` section of this website.
+You need to give the entities type as a generic parameter to the `get()` methods. The available entities types are available
+in the `fr.tykok.pokeapi.entities` package, all the documentation are given in the `API Resource` section of this website.
 
 All entities used to call a specific endpoint and is used to map the response of the endpoint.
-Each entity are described in the entities section.
+Each entities are described in the entities section.
 
-Finally, you need to give an `id`, the `name`, or the `limit` of the list to get the entity or the list of entities
+Finally, you need to give an `id`, the `name`, or the `limit` of the list to get the entities or the list of entities
 given in the generic parameter.
 All parameters for the `get()` method are described below.
 
diff --git a/docs/site/entities/berry/index.html b/docs/site/entities/berry/index.html
index 9e0cc05..fe11bac 100644
--- a/docs/site/entities/berry/index.html
+++ b/docs/site/entities/berry/index.html
@@ -9,20 +9,20 @@
     <link rel="stylesheet" href="../../css/theme.css" />
     <link rel="stylesheet" href="../../css/theme_extra.css" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/styles/github.min.css" />
-    
+
       <script>
         // Current page data
         var mkdocs_page_name = "Berry";
         var mkdocs_page_input_path = "entities/berry.md";
         var mkdocs_page_url = "/PokeAPI-Kotlin/entities/berry/";
       </script>
-    
+
     <script src="../../js/jquery-3.6.0.min.js" defer></script>
     <!--[if lt IE 9]>
       <script src="../../js/html5shiv.min.js"></script>
     <![endif]-->
       <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/highlight.min.js"></script>
-      <script>hljs.initHighlightingOnLoad();</script> 
+      <script>hljs.initHighlightingOnLoad();</script>
 </head>
 
 <body class="wy-body-for-nav" role="document">
@@ -95,7 +95,7 @@
       <nav class="wy-nav-top" role="navigation" aria-label="Mobile navigation menu">
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
           <a href="../..">PokeApi - Documentation</a>
-        
+
       </nav>
       <div class="wy-nav-content">
         <div class="rst-content"><div role="navigation" aria-label="breadcrumbs navigation">
@@ -111,11 +111,11 @@
 </div>
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
             <div class="section" itemprop="articleBody">
-              
+
                 <h1 id="berry">Berry</h1>
-<p>The <code>Berry</code> entity is used to map data from <code>https://pokeapi.co/api/v2/berry/...</code>.</p>
+<p>The <code>Berry</code> entities is used to map data from <code>https://pokeapi.co/api/v2/berry/...</code>.</p>
 <p><img alt="Berry" src="../../img/berry.jpeg" /></p>
-              
+
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
@@ -131,7 +131,7 @@ <h1 id="berry">Berry</h1>
 
   Built with <a href="https://www.mkdocs.org/">MkDocs</a> using a <a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
 </footer>
-          
+
         </div>
       </div>
 
@@ -141,17 +141,17 @@ <h1 id="berry">Berry</h1>
 
   <div class="rst-versions" role="note" aria-label="Versions">
   <span class="rst-current-version" data-toggle="rst-current-version">
-    
+
         <span>
           <a href="https://github.com/Tykok/PokeAPI-Kotlin" class="fa fa-github" style="color: #fcfcfc"> GitHub</a>
         </span>
-    
-    
+
+
       <span><a href="../pokemon/" style="color: #fcfcfc">&laquo; Previous</a></span>
-    
-    
+
+
       <span><a href="../contest/" style="color: #fcfcfc">Next &raquo;</a></span>
-    
+
   </span>
 </div>
     <script>var base_url = '../..';</script>
diff --git a/docs/site/methods/index.html b/docs/site/methods/index.html
index f613d28..da8f0a6 100644
--- a/docs/site/methods/index.html
+++ b/docs/site/methods/index.html
@@ -9,20 +9,20 @@
     <link rel="stylesheet" href="../css/theme.css" />
     <link rel="stylesheet" href="../css/theme_extra.css" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/styles/github.min.css" />
-    
+
       <script>
         // Current page data
         var mkdocs_page_name = "Methods";
         var mkdocs_page_input_path = "methods.md";
         var mkdocs_page_url = "/PokeAPI-Kotlin/methods/";
       </script>
-    
+
     <script src="../js/jquery-3.6.0.min.js" defer></script>
     <!--[if lt IE 9]>
       <script src="../js/html5shiv.min.js"></script>
     <![endif]-->
       <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.5.0/highlight.min.js"></script>
-      <script>hljs.initHighlightingOnLoad();</script> 
+      <script>hljs.initHighlightingOnLoad();</script>
 </head>
 
 <body class="wy-body-for-nav" role="document">
@@ -101,7 +101,7 @@
       <nav class="wy-nav-top" role="navigation" aria-label="Mobile navigation menu">
           <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
           <a href="..">PokeApi - Documentation</a>
-        
+
       </nav>
       <div class="wy-nav-content">
         <div class="rst-content"><div role="navigation" aria-label="breadcrumbs navigation">
@@ -116,15 +116,15 @@
 </div>
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
             <div class="section" itemprop="articleBody">
-              
+
                 <h1 id="methods">Methods</h1>
 <p>To use the methods, you need to import <code>PokeApi</code> class. Next, you can use the <code>get</code> methods to fetch data from the
 <a href="https://pokeapi.co/">pokeapi.co</a>.</p>
-<p>You need to give the entity type as a generic parameter to the <code>get()</code> methods. The available entity types are available
+<p>You need to give the entities type as a generic parameter to the <code>get()</code> methods. The available entities types are available
 in the <code>fr.tykok.pokeapi.entity</code> package, all the documentation are given in the <code>API Resource</code> section of this website.</p>
 <p>All entities used to call a specific endpoint and is used to map the response of the endpoint.
-Each entity are described in the entities section.</p>
-<p>Finally, you need to give an <code>id</code>, the <code>name</code>, or the <code>limit</code> of the list to get the entity or the list of entities
+Each entities are described in the entities section.</p>
+<p>Finally, you need to give an <code>id</code>, the <code>name</code>, or the <code>limit</code> of the list to get the entities or the list of entities
 given in the generic parameter.
 All parameters for the <code>get()</code> method are described below.</p>
 <h2 id="with-id-of-the-pokemon">With <code>id</code> of the pokemon</h2>
@@ -148,7 +148,7 @@ <h2 id="list-of-pokemon">List of pokemon</h2>
 pokemon from 10 to 20 with <code>limit</code> = 10 and <code>offset</code> = 10 (you start at the 10th pokemon and you get the 10 next).</p>
 <pre><code class="language-kotlin">val pokemonList = PokeApi.get&lt;Pokemon&gt;(limit = 10, offset = 10)
 </code></pre>
-              
+
             </div>
           </div><footer>
     <div class="rst-footer-buttons" role="navigation" aria-label="Footer Navigation">
@@ -164,7 +164,7 @@ <h2 id="list-of-pokemon">List of pokemon</h2>
 
   Built with <a href="https://www.mkdocs.org/">MkDocs</a> using a <a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
 </footer>
-          
+
         </div>
       </div>
 
@@ -174,17 +174,17 @@ <h2 id="list-of-pokemon">List of pokemon</h2>
 
   <div class="rst-versions" role="note" aria-label="Versions">
   <span class="rst-current-version" data-toggle="rst-current-version">
-    
+
         <span>
           <a href="https://github.com/Tykok/PokeAPI-Kotlin" class="fa fa-github" style="color: #fcfcfc"> GitHub</a>
         </span>
-    
-    
+
+
       <span><a href="../getting-started/" style="color: #fcfcfc">&laquo; Previous</a></span>
-    
-    
+
+
       <span><a href="../about/" style="color: #fcfcfc">Next &raquo;</a></span>
-    
+
   </span>
 </div>
     <script>var base_url = '..';</script>
diff --git a/src/main/kotlin/PokeApi.kt b/src/main/kotlin/PokeApi.kt
index 383fe96..9c1d3b6 100644
--- a/src/main/kotlin/PokeApi.kt
+++ b/src/main/kotlin/PokeApi.kt
@@ -1,83 +1,63 @@
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import entity.common.NamedApiResources
-import exception.HttpBodyResponseException
+import entities.PokeApiObject
+import entities.common.NamedApiResources
 import http.getEndpoint
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import okhttp3.Response
 
 /**
- * PokeApi is a Kotlin wrapper for the PokeApi RESTful API.
+ * PokeApi main class, used to fetch resources from the PokeApi RESTful API.
  * @author Tykok
- * @version 1.0
+ * @version 2.0
  * @see <a href="https://pokeapi.co/">PokeApi</a>
  * @see <a href="https://pokeapi.co/docs/v2">PokeApi Docs</a>
  */
 abstract class PokeApi {
-    companion object PokeApi {
+    companion object {
         private const val VERSION = "v2"
         const val BASE_URL = "https://pokeapi.co/api/$VERSION"
 
         /**
          * Get a resource by its id.
          */
-        inline fun <reified T : Any> get(id: Int): T = fetch(resource = id)
+        inline fun <reified T : PokeApiObject> get(id: Int): PokeApiObject =
+            "$BASE_URL/${getEndpoint<T>()}/$id"
+                .let {
+                    Request.Builder().url(it).build()
+                }.let {
+                    OkHttpClient().newCall(it).execute()
+                }.let {
+                    Gson().fromJson(it.body?.string(), T::class.java)
+                }
 
         /**
          * Get a resource by its name.
          */
-        inline fun <reified T : Any> get(name: String): T = fetch(resource = name)
+        inline fun <reified T : PokeApiObject> get(name: String): PokeApiObject =
+            "$BASE_URL/${getEndpoint<T>()}/$name"
+                .let {
+                    Request.Builder().url(it).build()
+                }.let {
+                    OkHttpClient().newCall(it).execute()
+                }.let {
+                    Gson().fromJson(it.body?.string(), T::class.java)
+                }
 
         /**
          * Get a list of resources.
          */
-        inline fun <reified T : Any> get(limit: Int = 20, offset: Int = 20) = fetchAll<T>(
-            limit,
-            offset
-        )
-
-        inline fun <reified T : Any> fetch(resource: Any? = ""): T =
-            parseResponse(
-                OkHttpClient().newCall(
-                    createRequest("$BASE_URL/${getEndpoint<T>()}/$resource")
-                ).execute()
-            )
-
-        inline fun <reified T : Any> fetch(fullUrl: String): T =
-            parseResponse(
-                OkHttpClient().newCall(
-                    createRequest(fullUrl)
-                ).execute()
-            )
-
-        inline fun <reified T : Any> fetchAll(limit: Int, offset: Int): NamedApiResources<T> {
-            return parseResponses(
-                OkHttpClient().newCall(
-                    createRequest("$BASE_URL/${getEndpoint<T>()}?offset=$offset&limit=$limit")
-                ).execute()
-            )
-        }
-
-        fun createRequest(url: String): Request = Request.Builder().url(url).build()
-
-        inline fun <reified T : Any> parseResponse(response: Response): T {
-            try {
-                return Gson().fromJson(response.body?.string(), T::class.java)
-            } catch (e: Exception) {
-                throw HttpBodyResponseException(T::class)
-            }
-        }
-
-        inline fun <reified T : Any> parseResponses(response: Response): NamedApiResources<T> {
-            try {
-                return Gson().fromJson(
-                    response.body?.string(),
-                    object : TypeToken<NamedApiResources<T>>() {}.type
-                )
-            } catch (e: Exception) {
-                throw HttpBodyResponseException(T::class)
-            }
-        }
+        inline fun <reified T : PokeApiObject> get(
+            limit: Int = 20,
+            offset: Int = 20
+        ): NamedApiResources<PokeApiObject> =
+            "$BASE_URL/${getEndpoint<T>()}?offset=$offset&limit=$limit"
+                .let {
+                    Request.Builder().url(it).build()
+                }.let {
+                    OkHttpClient().newCall(it).execute()
+                }.let {
+                    Gson().fromJson(it.body?.string(), object : TypeToken<NamedApiResources<T>>() {}.type)
+                }
     }
 }
diff --git a/src/main/kotlin/entities/PokeApiObject.kt b/src/main/kotlin/entities/PokeApiObject.kt
new file mode 100644
index 0000000..a5b364d
--- /dev/null
+++ b/src/main/kotlin/entities/PokeApiObject.kt
@@ -0,0 +1,3 @@
+package entities
+
+interface PokeApiObject
diff --git a/src/main/kotlin/entity/berries/Berry.kt b/src/main/kotlin/entities/berries/Berry.kt
similarity index 83%
rename from src/main/kotlin/entity/berries/Berry.kt
rename to src/main/kotlin/entities/berries/Berry.kt
index f81bad0..49edb71 100644
--- a/src/main/kotlin/entity/berries/Berry.kt
+++ b/src/main/kotlin/entities/berries/Berry.kt
@@ -1,9 +1,10 @@
-package entity.berries
+package entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.items.Item
-import entity.pokemon.Type
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.items.Item
+import entities.pokemon.Type
 
 /**
  * Berries (Japanese: きのみ Tree Fruit) are small, juicy, fleshy fruit.
@@ -13,58 +14,49 @@ import entity.pokemon.Type
  * @version 1.0.0
  * @since 2022-07-27
  */
-class Berry(
-
+data class Berry(
     /**
      * The identifier of the resource
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name of the resource
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * Time it takes the tree to grow one stage, in hours.
      * Berry trees go through four of these growth stages before they can be picked.
      */
     @JsonProperty("growth_time")
     val growthTime: Number,
-
     /**
      * The maximum number of these berries that can grow on one tree in Generation IV.
      */
     @JsonProperty("max_harvest")
     val maxHarvest: Number,
-
     /**
      * The power of the move "Natural Gift" when used with this Berry.
      */
     @JsonProperty("natural_gift_power")
     val naturalGiftPower: Number,
-
     /**
      * The size of this Berry, in millimeters.
      */
     @JsonProperty("size")
     val size: Number,
-
     /**
      * The smoothness of this Berry, used in making Pokéblocks or Poffins.
      */
     @JsonProperty("smoothness")
     val smoothness: Number,
-
     /**
      * The speed at which this Berry dries out the soil as it grows.
      * A higher rate means the soil dries more quickly.
      */
     @JsonProperty("soil_dryness")
     val soilDryness: Number,
-
     /**
      * The firmness of this berry, used in making Pokéblocks or Poffins.
      * @see NamedApiResource
@@ -72,14 +64,12 @@ class Berry(
      */
     @JsonProperty("firmness")
     val firmness: NamedApiResource<BerryFirmness>,
-
     /**
      * A list of references to each flavor a berry can have and the potency of each of those flavors in regard to this berry.
      * @see BerryFlavorMap
      */
     @JsonProperty("flavors")
     val flavors: Array<BerryFlavorMap>,
-
     /**
      * Berries are actually items. This is a reference to the item specific data for this berry.
      * @see NamedApiResource
@@ -87,7 +77,6 @@ class Berry(
      */
     @JsonProperty("item")
     val item: NamedApiResource<Item>,
-
     /**
      * The type inherited by "Natural Gift" when used with this Berry.
      * @see NamedApiResource
@@ -95,10 +84,4 @@ class Berry(
      */
     @JsonProperty("natural_gift_type")
     val naturalGiftType: NamedApiResource<Type>
-) {
-    override fun toString() = """
-         Berry(id=$id, name='$name', growthTime=$growthTime, maxHarvest=$maxHarvest, naturalGiftPower=$naturalGiftPower,
-         size=$size, smoothness=$smoothness, soilDryness=$soilDryness, firmness=$firmness,
-         flavors=${flavors.contentToString()}, item=$item, naturalGiftType=$naturalGiftType)
-    """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/berries/BerryFirmness.kt b/src/main/kotlin/entities/berries/BerryFirmness.kt
similarity index 68%
rename from src/main/kotlin/entity/berries/BerryFirmness.kt
rename to src/main/kotlin/entities/berries/BerryFirmness.kt
index 240d316..dfdc3ba 100644
--- a/src/main/kotlin/entity/berries/BerryFirmness.kt
+++ b/src/main/kotlin/entities/berries/BerryFirmness.kt
@@ -1,8 +1,9 @@
-package entity.berries
+package entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-firmnesses
@@ -10,14 +11,11 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-07-27
  */
-class BerryFirmness(
-
+data class BerryFirmness(
     @JsonProperty("id")
     val id: Number,
-
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of the berries with this firmness.
      * @see NamedApiResource
@@ -25,15 +23,10 @@ class BerryFirmness(
      */
     @JsonProperty("berries")
     val berries: Array<NamedApiResource<Berry>>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>
-) {
-    override fun toString() = """
-         BerryFirmness(id=$id, name='$name', berries=${berries.contentToString()}, names=${names.contentToString()})
-         """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/berries/BerryFlavor.kt b/src/main/kotlin/entities/berries/BerryFlavor.kt
similarity index 72%
rename from src/main/kotlin/entity/berries/BerryFlavor.kt
rename to src/main/kotlin/entities/berries/BerryFlavor.kt
index 1968e59..ec03b3a 100644
--- a/src/main/kotlin/entity/berries/BerryFlavor.kt
+++ b/src/main/kotlin/entities/berries/BerryFlavor.kt
@@ -1,9 +1,10 @@
-package entity.berries
+package entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.contests.ContestType
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.contests.ContestType
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-flavors
@@ -11,27 +12,23 @@ import entity.contests.ContestType
  * @version 1.0.0
  * @since 2022-07-27
  */
-class BerryFlavor(
-
+data class BerryFlavor(
     /**
      * The identifier of the BerryFlavor
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name of the BerryFlavor
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of the berries with this flavor.
      * @see FlavorBerryMap
      */
     @JsonProperty("berries")
     val berries: Array<FlavorBerryMap>,
-
     /**
      * The contest type that correlates with this berry flavor.
      * @see NamedApiResource
@@ -39,16 +36,10 @@ class BerryFlavor(
      */
     @JsonProperty("contest_type")
     val contestType: NamedApiResource<ContestType>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>
-) {
-    override fun toString() = """
-        BerryFlavor(id=$id, name='$name', berries=${berries.contentToString()},
-        contestType=$contestType, names=${names.contentToString()})
-        """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/berries/BerryFlavorMap.kt b/src/main/kotlin/entities/berries/BerryFlavorMap.kt
similarity index 72%
rename from src/main/kotlin/entity/berries/BerryFlavorMap.kt
rename to src/main/kotlin/entities/berries/BerryFlavorMap.kt
index 50a6d3a..36c2232 100644
--- a/src/main/kotlin/entity/berries/BerryFlavorMap.kt
+++ b/src/main/kotlin/entities/berries/BerryFlavorMap.kt
@@ -1,7 +1,7 @@
-package entity.berries
+package entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berries
@@ -9,14 +9,12 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-07-27
  */
-class BerryFlavorMap(
-
+data class BerryFlavorMap(
     /**
      * How powerful the referenced flavor is for this berry.
      */
     @JsonProperty("potency")
     val potency: String,
-
     /**
      * The referenced berry flavor.
      * With each reference you can have a ``BerryFlavor`` object.
@@ -25,8 +23,4 @@ class BerryFlavorMap(
      */
     @JsonProperty("flavor")
     val flavor: NamedApiResource<BerryFlavor>
-) {
-    override fun toString(): String {
-        return "BerryFlavorMap(potency=$potency, flavor=$flavor)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/berries/FlavorBerryMap.kt b/src/main/kotlin/entities/berries/FlavorBerryMap.kt
similarity index 71%
rename from src/main/kotlin/entity/berries/FlavorBerryMap.kt
rename to src/main/kotlin/entities/berries/FlavorBerryMap.kt
index ba1888c..d4a2f3c 100644
--- a/src/main/kotlin/entity/berries/FlavorBerryMap.kt
+++ b/src/main/kotlin/entities/berries/FlavorBerryMap.kt
@@ -1,7 +1,7 @@
-package entity.berries
+package entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-flavors
@@ -9,13 +9,12 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-07-27
  */
-class FlavorBerryMap(
+data class FlavorBerryMap(
     /**
      * How powerful the referenced flavor is for this berry.
      */
     @JsonProperty("potency")
     val potency: Number,
-
     /**
      * The berry with the referenced flavor.
      * @see NamedApiResource
@@ -23,8 +22,4 @@ class FlavorBerryMap(
      */
     @JsonProperty("berry")
     val berry: NamedApiResource<Berry>
-) {
-    override fun toString(): String {
-        return "FlavorBerryMap(potency=$potency, berry=$berry)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/APIResource.kt b/src/main/kotlin/entities/common/APIResource.kt
similarity index 86%
rename from src/main/kotlin/entity/common/APIResource.kt
rename to src/main/kotlin/entities/common/APIResource.kt
index 930e7cf..0c006e6 100644
--- a/src/main/kotlin/entity/common/APIResource.kt
+++ b/src/main/kotlin/entities/common/APIResource.kt
@@ -1,4 +1,4 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @version 1.0.0
  * @since 2022-08-27
  */
-class APIResource(
+data class APIResource(
     /**
      *The URL of the referenced resource.
      */
diff --git a/src/main/kotlin/entity/common/Description.kt b/src/main/kotlin/entities/common/Description.kt
similarity index 72%
rename from src/main/kotlin/entity/common/Description.kt
rename to src/main/kotlin/entities/common/Description.kt
index 263002a..befc359 100644
--- a/src/main/kotlin/entity/common/Description.kt
+++ b/src/main/kotlin/entities/common/Description.kt
@@ -1,7 +1,7 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.utility.Language
+import entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#description">Documentation of PokeApi</a>
@@ -10,14 +10,12 @@ import entity.utility.Language
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Description(
-
+data class Description(
     /**
      * The localized description for an API resource in a specific language.
      */
     @JsonProperty("description")
     val description: String,
-
     /**
      * The language this name is in.
      * @see NamedApiResource
@@ -25,8 +23,4 @@ class Description(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "Description(description='$description', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/Effect.kt b/src/main/kotlin/entities/common/Effect.kt
similarity index 72%
rename from src/main/kotlin/entity/common/Effect.kt
rename to src/main/kotlin/entities/common/Effect.kt
index 2b523b9..59b5ccb 100644
--- a/src/main/kotlin/entity/common/Effect.kt
+++ b/src/main/kotlin/entities/common/Effect.kt
@@ -1,18 +1,17 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.utility.Language
+import entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#common-models">Documentation of PokeApi</a>
  */
-class Effect(
+data class Effect(
     /**
      * The localized effect text for an API resource in a specific language
      */
     @JsonProperty("effect")
     val effect: String,
-
     /**
      * The language this effect is in.
      * @see NamedApiResource
@@ -20,8 +19,4 @@ class Effect(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "Effect(effect='$effect', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/Encounter.kt b/src/main/kotlin/entities/common/Encounter.kt
similarity index 77%
rename from src/main/kotlin/entity/common/Encounter.kt
rename to src/main/kotlin/entities/common/Encounter.kt
index 6ffc99c..80aab0a 100644
--- a/src/main/kotlin/entity/common/Encounter.kt
+++ b/src/main/kotlin/entities/common/Encounter.kt
@@ -1,8 +1,8 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.encounters.EncounterConditionValue
-import entity.encounters.EncounterMethod
+import entities.encounters.EncounterConditionValue
+import entities.encounters.EncounterMethod
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encounter">Documentation of PokeApi</a>
@@ -11,20 +11,17 @@ import entity.encounters.EncounterMethod
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Encounter(
-
+data class Encounter(
     /**
      * The lowest level the Pokémon could be encountered at.
      */
     @JsonProperty("min_level")
     val minLevel: Number,
-
     /**
      * The highest level the Pokémon could be encountered at.
      */
     @JsonProperty("max_level")
     val maxLevel: Number,
-
     /**
      * A list of condition values that must be in effect for this encounter to occur.
      * @see EncounterConditionValue
@@ -32,13 +29,11 @@ class Encounter(
      */
     @JsonProperty("condition_values")
     val conditionValues: List<NamedApiResource<EncounterConditionValue>>,
-
     /**
      * Percent chance that this encounter will occur.
      */
     @JsonProperty("chance")
     val chance: Number,
-
     /**
      * The method by which this encounter happens.
      * @see EncounterMethod
@@ -46,9 +41,4 @@ class Encounter(
      */
     @JsonProperty("method")
     val method: NamedApiResource<EncounterMethod>
-
-) {
-    override fun toString(): String =
-        "Encounter(minLevel=$minLevel, maxLevel=$maxLevel, conditionValues=$conditionValues, " +
-            "chance=$chance, method=$method)"
-}
+)
diff --git a/src/main/kotlin/entity/common/FlavorText.kt b/src/main/kotlin/entities/common/FlavorText.kt
similarity index 73%
rename from src/main/kotlin/entity/common/FlavorText.kt
rename to src/main/kotlin/entities/common/FlavorText.kt
index e09cd54..6e8a2fc 100644
--- a/src/main/kotlin/entity/common/FlavorText.kt
+++ b/src/main/kotlin/entities/common/FlavorText.kt
@@ -1,20 +1,18 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.Version
-import entity.utility.Language
+import entities.games.Version
+import entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#common-models">Documentation of PokeApi</a>
  */
-class FlavorText(
-
+data class FlavorText(
     /**
      * The localized flavor text for an API resource in a specific language
      */
     @JsonProperty("flavor_text")
     val flavorText: String,
-
     /**
      * The language this name is in.
      * @see NamedApiResource
@@ -22,7 +20,6 @@ class FlavorText(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>,
-
     /**
      * The game version this flavor text is extracted from.
      * @see NamedApiResource
@@ -30,8 +27,4 @@ class FlavorText(
      */
     @JsonProperty("version")
     val version: NamedApiResource<Version>?
-) {
-    override fun toString(): String {
-        return "FlavorText(flavorText='$flavorText', language=$language, version=$version)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/GenerationGameIndex.kt b/src/main/kotlin/entities/common/GenerationGameIndex.kt
similarity index 86%
rename from src/main/kotlin/entity/common/GenerationGameIndex.kt
rename to src/main/kotlin/entities/common/GenerationGameIndex.kt
index 49609cb..10d654b 100644
--- a/src/main/kotlin/entity/common/GenerationGameIndex.kt
+++ b/src/main/kotlin/entities/common/GenerationGameIndex.kt
@@ -1,7 +1,7 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.Generation
+import entities.games.Generation
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#generationgameindex">Documentation of PokeApi</a>
@@ -10,14 +10,12 @@ import entity.games.Generation
  * @version 1.0.0
  * @since 2022-08-27
  */
-class GenerationGameIndex(
-
+data class GenerationGameIndex(
     /**
      * The internal id of an API resource within game data.
      */
     @JsonProperty("game_index")
     val gameIndex: Number,
-
     /**
      * The generation relevent to this game index.
      * @see NamedApiResource
diff --git a/src/main/kotlin/entity/common/MachineVersionDetail.kt b/src/main/kotlin/entities/common/MachineVersionDetail.kt
similarity index 70%
rename from src/main/kotlin/entity/common/MachineVersionDetail.kt
rename to src/main/kotlin/entities/common/MachineVersionDetail.kt
index ef7be0b..c08e3b3 100644
--- a/src/main/kotlin/entity/common/MachineVersionDetail.kt
+++ b/src/main/kotlin/entities/common/MachineVersionDetail.kt
@@ -1,8 +1,8 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.VersionGroup
-import entity.machines.Machine
+import entities.games.VersionGroup
+import entities.machines.Machine
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#machineversiondetail">Documentation of PokeApi</a>
@@ -11,7 +11,7 @@ import entity.machines.Machine
  * @version 1.0.0
  * @since 2022-08-27
  */
-class MachineVersionDetail(
+data class MachineVersionDetail(
     /**
      * The machine that teaches a move from an item.
      * @see NamedApiResource
@@ -19,7 +19,6 @@ class MachineVersionDetail(
      */
     @JsonProperty("machine")
     val machine: APIResource,
-
     /**
      * The version group of this specific machine.
      * @see NamedApiResource
@@ -27,8 +26,4 @@ class MachineVersionDetail(
      */
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>
-) {
-    override fun toString(): String {
-        return "MachineVersionDetail(machine=$machine, versionGroup=$versionGroup)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/Name.kt b/src/main/kotlin/entities/common/Name.kt
similarity index 73%
rename from src/main/kotlin/entity/common/Name.kt
rename to src/main/kotlin/entities/common/Name.kt
index a9a4c94..fec0f95 100644
--- a/src/main/kotlin/entity/common/Name.kt
+++ b/src/main/kotlin/entities/common/Name.kt
@@ -1,7 +1,7 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.utility.Language
+import entities.utility.Language
 
 /**
  * @link https://pokeapi.co/docs/v2#common-models
@@ -9,14 +9,12 @@ import entity.utility.Language
  * @version 1.0.0
  * @since 2022-07-27
  */
-class Name(
-
+data class Name(
     /**
      * The localized name for an API resource in a specific language
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The language this name is in.
      * @see NamedApiResource
@@ -24,8 +22,4 @@ class Name(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "Name(name='$name', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/common/NamedApiResource.kt b/src/main/kotlin/entities/common/NamedApiResource.kt
similarity index 61%
rename from src/main/kotlin/entity/common/NamedApiResource.kt
rename to src/main/kotlin/entities/common/NamedApiResource.kt
index 851815f..9e6d299 100644
--- a/src/main/kotlin/entity/common/NamedApiResource.kt
+++ b/src/main/kotlin/entities/common/NamedApiResource.kt
@@ -1,7 +1,9 @@
-package entity.common
+package entities.common
 
-import PokeApi
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.Gson
+import okhttp3.OkHttpClient
+import okhttp3.Request
 
 /**
  * NamedApiResource contains the name and the url to get the object from the API resource (pokeapi.co).
@@ -10,30 +12,31 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @version 1.0.0
  * @since 2022-07-27
  */
-class NamedApiResource<T : Any>(
-
+data class NamedApiResource<T : Any>(
     /**
      * The name of the referenced resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The URL of the referenced resource.
      */
     @JsonProperty("url")
     val url: String? = null,
-
     val resource: T? = null
-) {
-    override fun toString(): String {
-        return "NamedApiResource(name='$name', url=$url)"
-    }
-}
+)
 
 inline fun <reified T : Any> NamedApiResource<T>.get(): T? =
     if (this.url != null) {
-        PokeApi.fetch<T>(fullUrl = this.url)
+        Request
+            .Builder()
+            .url(this.url)
+            .build()
+            .let {
+                OkHttpClient().newCall(it).execute()
+            }.let {
+                Gson().fromJson(it.body?.string(), T::class.java)
+            }
     } else {
         null
     }
diff --git a/src/main/kotlin/entity/common/NamedApiResources.kt b/src/main/kotlin/entities/common/NamedApiResources.kt
similarity index 60%
rename from src/main/kotlin/entity/common/NamedApiResources.kt
rename to src/main/kotlin/entities/common/NamedApiResources.kt
index bce23f8..7d53a9f 100644
--- a/src/main/kotlin/entity/common/NamedApiResources.kt
+++ b/src/main/kotlin/entities/common/NamedApiResources.kt
@@ -1,23 +1,16 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-class NamedApiResources<T : Any>(
+data class NamedApiResources<T : Any>(
     @JsonProperty("count")
     val count: Int,
-
     @JsonProperty("next")
     val next: String?,
-
     @JsonProperty("previous")
     val previous: String?,
-
     @JsonProperty("results")
     val results: List<NamedApiResource<T>>
-) {
-    override fun toString() =
-        "NamedApiResources(count=$count, next=$next, previous=$previous, result=$results)"
-}
+)
 
-inline fun <reified T : Any> NamedApiResources<T>.get(): List<T> =
-    this.results.map { it.get()!! }
+inline fun <reified T : Any> NamedApiResources<T>.get(): List<T> = this.results.map { it.get()!! }
diff --git a/src/main/kotlin/entity/common/VerboseEffect.kt b/src/main/kotlin/entities/common/VerboseEffect.kt
similarity index 88%
rename from src/main/kotlin/entity/common/VerboseEffect.kt
rename to src/main/kotlin/entities/common/VerboseEffect.kt
index 786dd1d..933c7a6 100644
--- a/src/main/kotlin/entity/common/VerboseEffect.kt
+++ b/src/main/kotlin/entities/common/VerboseEffect.kt
@@ -1,7 +1,7 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.utility.Language
+import entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#verboseeffect">Documentation of PokeApi</a>
@@ -10,20 +10,17 @@ import entity.utility.Language
  * @version 1.0.0
  * @since 2022-08-27
  */
-class VerboseEffect(
-
+data class VerboseEffect(
     /**
      * The localized effect text for an API resource in a specific language.
      */
     @JsonProperty("effect")
     val effect: String,
-
     /**
      * The localized effect text in brief.
      */
     @JsonProperty("short_effect")
     val shortEffect: String,
-
     /**
      * The language this effect is in.
      * @see NamedApiResource
diff --git a/src/main/kotlin/entity/common/VersionEncounterDetail.kt b/src/main/kotlin/entities/common/VersionEncounterDetail.kt
similarity index 74%
rename from src/main/kotlin/entity/common/VersionEncounterDetail.kt
rename to src/main/kotlin/entities/common/VersionEncounterDetail.kt
index 18497ea..c793451 100644
--- a/src/main/kotlin/entity/common/VersionEncounterDetail.kt
+++ b/src/main/kotlin/entities/common/VersionEncounterDetail.kt
@@ -1,7 +1,7 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.Version
+import entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#versionencounterdetail">Documentation of PokeApi</a>
@@ -10,8 +10,7 @@ import entity.games.Version
  * @version 1.0.0
  * @since 2022-08-27
  */
-class VersionEncounterDetail(
-
+data class VersionEncounterDetail(
     /**
      * The game version this encounter happens in.
      * @see NamedApiResource
@@ -19,20 +18,14 @@ class VersionEncounterDetail(
      */
     @JsonProperty("version")
     val version: NamedApiResource<Version>,
-
     /**
      * The total percentage of all encounter potential.
      */
     @JsonProperty("max_chance")
     val maxChance: Number,
-
     /**
      * A list of encounters and their specifics.
      */
     @JsonProperty("encounter_details")
     val encounterDetails: List<Encounter>
-
-) {
-    override fun toString() =
-        "VersionEncounterDetail(version=$version, maxChance=$maxChance, encounterDetails=$encounterDetails)"
-}
+)
diff --git a/src/main/kotlin/entity/common/VersionGameIndex.kt b/src/main/kotlin/entities/common/VersionGameIndex.kt
similarity index 78%
rename from src/main/kotlin/entity/common/VersionGameIndex.kt
rename to src/main/kotlin/entities/common/VersionGameIndex.kt
index 2378f91..836d744 100644
--- a/src/main/kotlin/entity/common/VersionGameIndex.kt
+++ b/src/main/kotlin/entities/common/VersionGameIndex.kt
@@ -1,12 +1,11 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.Version
+import entities.games.Version
 
-class VersionGameIndex(
+data class VersionGameIndex(
     @JsonProperty("game_index")
     val gameIndex: Int,
-
     /**
      * The version relevent to this game index.
      * @see NamedApiResource
diff --git a/src/main/kotlin/entity/common/VersionGroupFlavorText.kt b/src/main/kotlin/entities/common/VersionGroupFlavorText.kt
similarity index 85%
rename from src/main/kotlin/entity/common/VersionGroupFlavorText.kt
rename to src/main/kotlin/entities/common/VersionGroupFlavorText.kt
index e1da6a3..906c24c 100644
--- a/src/main/kotlin/entity/common/VersionGroupFlavorText.kt
+++ b/src/main/kotlin/entities/common/VersionGroupFlavorText.kt
@@ -1,8 +1,8 @@
-package entity.common
+package entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.games.VersionGroup
-import entity.utility.Language
+import entities.games.VersionGroup
+import entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#versiongroupflavortext">Documentation of PokeApi</a>
@@ -11,14 +11,12 @@ import entity.utility.Language
  * @version 1.0.0
  * @since 2022-08-27
  */
-class VersionGroupFlavorText(
-
+data class VersionGroupFlavorText(
     /**
      * The localized name for an API resource in a specific language.
      */
     @JsonProperty("text")
     val text: String,
-
     /**
      * The language this name is in.
      * @see NamedApiResource
@@ -26,7 +24,6 @@ class VersionGroupFlavorText(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>,
-
     /**
      * The version group which uses this flavor text.
      * @see NamedApiResource
diff --git a/src/main/kotlin/entity/contests/ContestEffect.kt b/src/main/kotlin/entities/contests/ContestEffect.kt
similarity index 79%
rename from src/main/kotlin/entity/contests/ContestEffect.kt
rename to src/main/kotlin/entities/contests/ContestEffect.kt
index c253102..d0282d8 100644
--- a/src/main/kotlin/entity/contests/ContestEffect.kt
+++ b/src/main/kotlin/entities/contests/ContestEffect.kt
@@ -1,8 +1,9 @@
-package entity.contests
+package entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Effect
-import entity.common.FlavorText
+import entities.PokeApiObject
+import entities.common.Effect
+import entities.common.FlavorText
 
 /**
  * `ContestEffects` class refers to the effects of move on the public when used in contests.
@@ -15,41 +16,32 @@ import entity.common.FlavorText
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ContestEffect(
-
+data class ContestEffect(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The base number of hearts the user of this move gets.
      */
     @JsonProperty("appeal")
     val appeal: Number,
-
     /**
      * The base number of hearts the user's opponent loses.
      */
     @JsonProperty("jam")
     val jam: Number,
-
     /**
      * The result of this contest effect listed in different languages.
      * @see Effect
      */
     @JsonProperty("effect_entries")
     val effectEntries: Array<Effect>,
-
     /**
      * The flavor text of this contest effect listed in different languages.
      * @see FlavorText
      */
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: Array<FlavorText>
-) {
-    override fun toString(): String {
-        return "ContestEffect(id=$id, appeal=$appeal, jam=$jam, effectEntries=${effectEntries.contentToString()}, flavorTextEntries=${flavorTextEntries.contentToString()})"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/contests/ContestName.kt b/src/main/kotlin/entities/contests/ContestName.kt
similarity index 78%
rename from src/main/kotlin/entity/contests/ContestName.kt
rename to src/main/kotlin/entities/contests/ContestName.kt
index 1e3ee83..09c860e 100644
--- a/src/main/kotlin/entity/contests/ContestName.kt
+++ b/src/main/kotlin/entities/contests/ContestName.kt
@@ -1,8 +1,8 @@
-package entity.contests
+package entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.utility.Language
+import entities.common.NamedApiResource
+import entities.utility.Language
 
 /**
  * ContestName classe used to refer to a specific categories according to the color of the berry.
@@ -16,20 +16,17 @@ import entity.utility.Language
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ContestName(
-
+data class ContestName(
     /**
      * The name for this contest.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The color associated with this contest's name.
      */
     @JsonProperty("color")
     val color: String,
-
     /**
      * The language that this name is in.
      * @see NamedApiResource
@@ -37,8 +34,4 @@ class ContestName(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "ContestName(name='$name', color='$color', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/contests/ContestType.kt b/src/main/kotlin/entities/contests/ContestType.kt
similarity index 83%
rename from src/main/kotlin/entity/contests/ContestType.kt
rename to src/main/kotlin/entities/contests/ContestType.kt
index 2473f22..f9727c1 100644
--- a/src/main/kotlin/entity/contests/ContestType.kt
+++ b/src/main/kotlin/entities/contests/ContestType.kt
@@ -1,8 +1,9 @@
-package entity.contests
+package entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.berries.BerryFlavor
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.berries.BerryFlavor
+import entities.common.NamedApiResource
 
 /**
  * The types given to Pokémon in the contest are categories that judges use to evaluate the condition of a Pokémon in Pokémon contests.
@@ -25,20 +26,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ContestType(
-
+data class ContestType(
     /**
      * Identifier of the resource
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * Name of the resource
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The berry flavor that correlates with this contest type.
      * @see NamedApiResource
@@ -46,14 +44,10 @@ class ContestType(
      */
     @JsonProperty("berry_flavor")
     val berryFlavor: NamedApiResource<BerryFlavor>,
-
     /**
      * The name of this contest type listed in different languages.
      * @see ContestName
      */
     @JsonProperty("names")
     val names: Array<ContestName>
-) {
-    override fun toString() =
-        "ContestType(id=$id, name='$name', berryFlavor=$berryFlavor, names=${names.contentToString()})"
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/contests/SuperContestEffects.kt b/src/main/kotlin/entities/contests/SuperContestEffects.kt
similarity index 78%
rename from src/main/kotlin/entity/contests/SuperContestEffects.kt
rename to src/main/kotlin/entities/contests/SuperContestEffects.kt
index f231fb0..9f4ed85 100644
--- a/src/main/kotlin/entity/contests/SuperContestEffects.kt
+++ b/src/main/kotlin/entities/contests/SuperContestEffects.kt
@@ -1,9 +1,10 @@
-package entity.contests
+package entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.FlavorText
-import entity.common.NamedApiResource
-import entity.moves.Move
+import entities.PokeApiObject
+import entities.common.FlavorText
+import entities.common.NamedApiResource
+import entities.moves.Move
 
 /**
  * `SuperContestEffects` class refers to the effects of move on the public when used in super contests.
@@ -17,27 +18,23 @@ import entity.moves.Move
  * @version 1.0.0
  * @since 2022-08-27
  */
-class SuperContestEffects(
-
+data class SuperContestEffects(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The level of appeal this super contest effect has.
      */
     @JsonProperty("appeal")
     val appeal: Number,
-
     /**
      * The flavor text of this super contest effect listed in different languages.
      * @see FlavorText
      */
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: Array<FlavorText>,
-
     /**
      * A list of moves that have the effect when used in super contests.
      * @see NamedApiResource
@@ -45,8 +42,4 @@ class SuperContestEffects(
      */
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>
-) {
-    override fun toString(): String = """
-        SuperContestEffects(id=$id, appeal=$appeal, flavorTextEntries=${flavorTextEntries.contentToString()}, moves=$moves)
-        """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/encounters/EncounterCondition.kt b/src/main/kotlin/entities/encounters/EncounterCondition.kt
similarity index 77%
rename from src/main/kotlin/entity/encounters/EncounterCondition.kt
rename to src/main/kotlin/entities/encounters/EncounterCondition.kt
index 4c8b291..3c0e8a8 100644
--- a/src/main/kotlin/entity/encounters/EncounterCondition.kt
+++ b/src/main/kotlin/entities/encounters/EncounterCondition.kt
@@ -1,8 +1,9 @@
-package entity.encounters
+package entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Conditions which affect what Pokemon might appear in the wild.
@@ -15,27 +16,23 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EncounterCondition(
-
+data class EncounterCondition(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>,
-
     /**
      * A list of possible values for this encounter condition.
      * @see NamedApiResource
@@ -43,8 +40,4 @@ class EncounterCondition(
      */
     @JsonProperty("values")
     val values: Array<NamedApiResource<EncounterCondition>>
-) {
-    override fun toString() =
-        "EncounterCondition(id=$id, name='$name', names=${names.contentToString()}, " +
-            "values=${values.contentToString()})"
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/encounters/EncounterConditionValue.kt b/src/main/kotlin/entities/encounters/EncounterConditionValue.kt
similarity index 79%
rename from src/main/kotlin/entity/encounters/EncounterConditionValue.kt
rename to src/main/kotlin/entities/encounters/EncounterConditionValue.kt
index 64efc72..e6d311a 100644
--- a/src/main/kotlin/entity/encounters/EncounterConditionValue.kt
+++ b/src/main/kotlin/entities/encounters/EncounterConditionValue.kt
@@ -1,8 +1,9 @@
-package entity.encounters
+package entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Encounter condition values are the various states that an encounter condition can have, i.e., time of day can be either day or night.
@@ -14,19 +15,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EncounterConditionValue(
+data class EncounterConditionValue(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      *  The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The condition this encounter condition value pertains to.
      * @see NamedApiResource
@@ -34,14 +33,10 @@ class EncounterConditionValue(
      */
     @JsonProperty("condition")
     val condition: NamedApiResource<EncounterCondition>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>
-) {
-    override fun toString() =
-        "EncounterConditionValue(id=$id, name='$name', condition=$condition, names=${names.contentToString()})"
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/encounters/EncounterMethod.kt b/src/main/kotlin/entities/encounters/EncounterMethod.kt
similarity index 80%
rename from src/main/kotlin/entity/encounters/EncounterMethod.kt
rename to src/main/kotlin/entities/encounters/EncounterMethod.kt
index 19cedc0..b526709 100644
--- a/src/main/kotlin/entity/encounters/EncounterMethod.kt
+++ b/src/main/kotlin/entities/encounters/EncounterMethod.kt
@@ -1,7 +1,8 @@
-package entity.encounters
+package entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
+import entities.PokeApiObject
+import entities.common.Name
 
 /**
  * EncounterMethod define how you can encounter a Pokemon.
@@ -16,34 +17,26 @@ import entity.common.Name
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EncounterMethod(
-
+data class EncounterMethod(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A good value for sorting.
      */
     @JsonProperty("order")
     val order: Number,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>
-) {
-    override fun toString(): String {
-        return "EncounterMethod(id=$id, name='$name', order=$order, names=${names.contentToString()})"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/evolution/ChainLink.kt b/src/main/kotlin/entities/evolution/ChainLink.kt
similarity index 79%
rename from src/main/kotlin/entity/evolution/ChainLink.kt
rename to src/main/kotlin/entities/evolution/ChainLink.kt
index ef24801..0a2e30d 100644
--- a/src/main/kotlin/entity/evolution/ChainLink.kt
+++ b/src/main/kotlin/entities/evolution/ChainLink.kt
@@ -1,8 +1,8 @@
-package entity.evolution
+package entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.pokemon.PokemonSpecies
+import entities.common.NamedApiResource
+import entities.pokemon.PokemonSpecies
 
 /**
  * ChainLink, used to link a Pokemon with this evolution. With this classe you can have
@@ -17,14 +17,12 @@ import entity.pokemon.PokemonSpecies
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ChainLink(
-
+data class ChainLink(
     /**
      * Whether or not this link is for a baby Pokémon. This would only ever be true on the base link.
      */
     @JsonProperty("is_baby")
     val isBaby: Boolean,
-
     /**
      * The Pokémon species at this point in the evolution chain.
      * @see NamedApiResource
@@ -32,22 +30,16 @@ class ChainLink(
      */
     @JsonProperty("species")
     val species: NamedApiResource<PokemonSpecies>,
-
     /**
      * All details regarding the specific details of the referenced Pokémon species evolution.
      * @see EvolutionDetail
      */
     @JsonProperty("evolution_details")
     val evolutionDetails: Array<EvolutionDetail>,
-
     /**
      * A List of chain objects.
      * @see ChainLink
      */
     @JsonProperty("evolves_to")
     val evolvesTo: Array<ChainLink>
-) {
-    override fun toString(): String {
-        return "ChainLink(isBaby=$isBaby, species=$species, evolutionDetails=${evolutionDetails.contentToString()}, evolvesTo=${evolvesTo.contentToString()})"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/evolution/EvolutionChain.kt b/src/main/kotlin/entities/evolution/EvolutionChain.kt
similarity index 82%
rename from src/main/kotlin/entity/evolution/EvolutionChain.kt
rename to src/main/kotlin/entities/evolution/EvolutionChain.kt
index d579c5a..fec1562 100644
--- a/src/main/kotlin/entity/evolution/EvolutionChain.kt
+++ b/src/main/kotlin/entities/evolution/EvolutionChain.kt
@@ -1,8 +1,9 @@
-package entity.evolution
+package entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.items.Item
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.items.Item
 
 /**
  * Evolution chains are essentially family trees.
@@ -15,14 +16,12 @@ import entity.items.Item
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EvolutionChain(
-
+data class EvolutionChain(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The item that a Pokémon would be holding when mating that would trigger the egg hatching a baby Pokémon rather than a basic Pokémon.
      * @see NamedApiResource
@@ -30,7 +29,6 @@ class EvolutionChain(
      */
     @JsonProperty("baby_trigger_item")
     val babyTriggerItem: NamedApiResource<Item>?,
-
     /**
      * The base chain link object. Each link contains evolution details for a Pokémon in the chain.
      * Each link references the next Pokémon in the natural evolution order.
@@ -39,9 +37,4 @@ class EvolutionChain(
      */
     @JsonProperty("chain")
     val chain: ChainLink
-
-) {
-    override fun toString(): String {
-        return "EvolutionChain(id=$id, babyTriggerItem=$babyTriggerItem, chain=$chain)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/evolution/EvolutionDetail.kt b/src/main/kotlin/entities/evolution/EvolutionDetail.kt
similarity index 94%
rename from src/main/kotlin/entity/evolution/EvolutionDetail.kt
rename to src/main/kotlin/entities/evolution/EvolutionDetail.kt
index 87e6c77..ec1b733 100644
--- a/src/main/kotlin/entity/evolution/EvolutionDetail.kt
+++ b/src/main/kotlin/entities/evolution/EvolutionDetail.kt
@@ -1,12 +1,12 @@
-package entity.evolution
+package entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.items.Item
-import entity.locations.Location
-import entity.moves.Move
-import entity.pokemon.PokemonSpecies
-import entity.pokemon.Type
+import entities.common.NamedApiResource
+import entities.items.Item
+import entities.locations.Location
+import entities.moves.Move
+import entities.pokemon.PokemonSpecies
+import entities.pokemon.Type
 
 /**
  * EvolutionDetail define all possibility to make possible the evolution of the Pokemon.
@@ -18,8 +18,7 @@ import entity.pokemon.Type
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EvolutionDetail(
-
+data class EvolutionDetail(
     /**
      * The item required to cause evolution this into Pokémon species.
      * @see NamedApiResource
@@ -27,7 +26,6 @@ class EvolutionDetail(
      */
     @JsonProperty("item")
     val item: NamedApiResource<Item>?,
-
     /**
      * The type of event that triggers evolution into this Pokémon species.
      * @see NamedApiResource
@@ -35,13 +33,11 @@ class EvolutionDetail(
      */
     @JsonProperty("trigger")
     val trigger: NamedApiResource<EvolutionTrigger>?,
-
     /**
      * The id of the gender of the evolving Pokémon species must be in order to evolve into this Pokémon species.
      */
     @JsonProperty("number")
     val gender: Number?,
-
     /**
      * The item the evolving Pokémon species must be holding during the evolution trigger event to evolve into this Pokémon species.
      * @see NamedApiResource
@@ -49,7 +45,6 @@ class EvolutionDetail(
      */
     @JsonProperty("held_item")
     val heldItem: NamedApiResource<Item>?,
-
     /**
      * The move that must be known by the evolving Pokémon species during the evolution trigger event in order to evolve into this Pokémon species.
      * @see NamedApiResource
@@ -57,7 +52,6 @@ class EvolutionDetail(
      */
     @JsonProperty("known_move")
     val knownMove: NamedApiResource<Move>?,
-
     /**
      * The evolving Pokémon species must know a move with this type during the evolution trigger event in order to evolve into this Pokémon species.
      * @see NamedApiResource
@@ -65,7 +59,6 @@ class EvolutionDetail(
      */
     @JsonProperty("known_move_type")
     val knownMoveType: NamedApiResource<Type>?,
-
     /**
      * The location the evolution must be triggered at.
      * @see NamedApiResource
@@ -73,37 +66,31 @@ class EvolutionDetail(
      */
     @JsonProperty("location")
     val location: NamedApiResource<Location>?,
-
     /**
      * The minimum required level of the evolving Pokémon species to evolve into this Pokémon species.
      */
     @JsonProperty("min_level")
     val minLevel: Number,
-
     /**
      * The minimum required level of happiness the evolving Pokémon species to evolve into this Pokémon species.
      */
     @JsonProperty("min_happiness")
     val minHappiness: Number?,
-
     /**
      * The minimum required level of beauty the evolving Pokémon species to evolve into this Pokémon species.
      */
     @JsonProperty("min_beauty")
     val minBeauty: Number?,
-
     /**
      * The minimum required level of affection the evolving Pokémon species to evolve into this Pokémon species.
      */
     @JsonProperty("min_affection")
     val minAffection: Number?,
-
     /**
      * Whether or not it must be raining in the overworld to cause evolution this Pokémon species.
      */
     @JsonProperty("needs_overworld_rain")
     val needsOverworldRain: Boolean,
-
     /**
      * The Pokémon species that must be in the players party in order for the evolving Pokémon species to evolve into this Pokémon species.
      * @see NamedApiResource
@@ -111,7 +98,6 @@ class EvolutionDetail(
      */
     @JsonProperty("party_species")
     val partySpecies: Number?,
-
     /**
      * The player must have a Pokémon of this type in their party during the evolution trigger event in order for
      * the evolving Pokémon species to evolve into this Pokémon species.
@@ -120,19 +106,16 @@ class EvolutionDetail(
      */
     @JsonProperty("party_type")
     val partyType: NamedApiResource<Type>?,
-
     /**
      * The required relation between the Pokémon's Attack and Defense stats. 1 means Attack > Defense. 0 means Attack = Defense. -1 means Attack < Defense.
      */
     @JsonProperty("relative_physical_stats")
     val relativePhysicalStats: Number?,
-
     /**
      * The required time of day. Day or night.
      */
     @JsonProperty("time_of_day")
     val timeOfDay: String,
-
     /**
      * Pokémon species for which this one must be traded.
      * @see NamedApiResource
@@ -140,7 +123,6 @@ class EvolutionDetail(
      */
     @JsonProperty("trade_species")
     val tradeSpecies: NamedApiResource<PokemonSpecies>?,
-
     /**
      * Whether or not the 3DS needs to be turned upside-down as this Pokémon levels up.
      */
diff --git a/src/main/kotlin/entity/evolution/EvolutionTrigger.kt b/src/main/kotlin/entities/evolution/EvolutionTrigger.kt
similarity index 75%
rename from src/main/kotlin/entity/evolution/EvolutionTrigger.kt
rename to src/main/kotlin/entities/evolution/EvolutionTrigger.kt
index 2868d6a..df25d3a 100644
--- a/src/main/kotlin/entity/evolution/EvolutionTrigger.kt
+++ b/src/main/kotlin/entities/evolution/EvolutionTrigger.kt
@@ -1,9 +1,10 @@
-package entity.evolution
+package entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.pokemon.PokemonSpecies
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.pokemon.PokemonSpecies
 
 /**
  * Evolution triggers are the events and conditions that cause a Pokémon to evolve.
@@ -15,20 +16,17 @@ import entity.pokemon.PokemonSpecies
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EvolutionTrigger(
-
+data class EvolutionTrigger(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see NamedApiResource
@@ -36,7 +34,6 @@ class EvolutionTrigger(
      */
     @JsonProperty("names")
     val names: Array<Name>,
-
     /**
      * A list of pokemon species that result from this evolution trigger.
      * @see NamedApiResource
@@ -44,8 +41,4 @@ class EvolutionTrigger(
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: Array<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "EvolutionTrigger(id=$id, name='$name', names=${names.contentToString()}, pokemonSpecies=${pokemonSpecies.contentToString()})"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/games/Generation.kt b/src/main/kotlin/entities/games/Generation.kt
similarity index 75%
rename from src/main/kotlin/entity/games/Generation.kt
rename to src/main/kotlin/entities/games/Generation.kt
index 6e44f8d..0d64948 100644
--- a/src/main/kotlin/entity/games/Generation.kt
+++ b/src/main/kotlin/entities/games/Generation.kt
@@ -1,13 +1,14 @@
-package entity.games
+package entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.locations.Region
-import entity.moves.Move
-import entity.pokemon.Ability
-import entity.pokemon.PokemonSpecies
-import entity.pokemon.Type
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.locations.Region
+import entities.moves.Move
+import entities.pokemon.Ability
+import entities.pokemon.PokemonSpecies
+import entities.pokemon.Type
 
 /**
  * A generation is a grouping of the Pokémon games that separates them based on the Pokémon they include.
@@ -21,61 +22,47 @@ import entity.pokemon.Type
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Generation(
-
+data class Generation(
     @JsonProperty("id")
     val id: Number,
-
     @JsonProperty("name")
     val name: String,
-
     /**
      * @see NamedApiResource
      * @see Ability
      */
     @JsonProperty("abilities")
     val abilities: List<NamedApiResource<Ability>>,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * @see NamedApiResource
      * @see Region
      */
     @JsonProperty("main_region")
     val mainRegion: NamedApiResource<Region>,
-
     /**
      * @see NamedApiResource
      * @see Move
      */
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>,
-
     /**
      * @see NamedApiResource
      * @see PokemonSpecies
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>,
-
     /**
      * @see NamedApiResource
      * @see Type
      */
     @JsonProperty("types")
     val types: List<NamedApiResource<Type>>,
-
     /**
      * @see NamedApiResource
      * @see VersionGroup
      */
     @JsonProperty("version_groups")
     val versionGroups: List<NamedApiResource<VersionGroup>>
-) {
-    override fun toString(): String {
-        return "Generation(id=$id, name='$name', abilities=$abilities, names=$names, mainRegion=$mainRegion, moves=$moves, " +
-            "pokemonSpecies=$pokemonSpecies, types=$types, versionGroups=$versionGroups)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/games/Pokedex.kt b/src/main/kotlin/entities/games/Pokedex.kt
similarity index 81%
rename from src/main/kotlin/entity/games/Pokedex.kt
rename to src/main/kotlin/entities/games/Pokedex.kt
index aa272df..4f5314a 100644
--- a/src/main/kotlin/entity/games/Pokedex.kt
+++ b/src/main/kotlin/entities/games/Pokedex.kt
@@ -1,10 +1,11 @@
-package entity.games
+package entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.locations.Region
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.locations.Region
 
 /**
  * A Pokédex is a handheld electronic encyclopedia device; one which is capable of recording and retaining information
@@ -18,47 +19,40 @@ import entity.locations.Region
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Pokedex(
-
+data class Pokedex(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * Whether or not this Pokédex originated in the main series of the video games.
      */
     @JsonProperty("is_main_series")
     val isMainSeries: Boolean,
-
     /**
      * The description of this resource listed in different languages.
      * @see Description
      */
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of Pokémon catalogued in this Pokédex and their indexes.
      * @see PokemonEntry
      */
     @JsonProperty("pokemon_entries")
     val pokemonEntries: List<PokemonEntry>,
-
     /**
      * The region this Pokédex catalogues Pokémon for.
      * @see NamedApiResource
@@ -66,7 +60,6 @@ class Pokedex(
      */
     @JsonProperty("region")
     val region: NamedApiResource<Region>?,
-
     /**
      * A list of version groups this Pokédex is relevant to.
      * @see NamedApiResource
@@ -74,8 +67,4 @@ class Pokedex(
      */
     @JsonProperty("version_groups")
     val versionGroups: List<NamedApiResource<VersionGroup>>?
-) {
-    override fun toString(): String {
-        return "Pokedex(id=$id, name='$name', isMainSeries=$isMainSeries, descriptions=$descriptions, names=$names, pokemonEntries=$pokemonEntries, region=$region, versionGroups=$versionGroups)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/games/PokemonEntry.kt b/src/main/kotlin/entities/games/PokemonEntry.kt
similarity index 68%
rename from src/main/kotlin/entity/games/PokemonEntry.kt
rename to src/main/kotlin/entities/games/PokemonEntry.kt
index 5315e48..e035f40 100644
--- a/src/main/kotlin/entity/games/PokemonEntry.kt
+++ b/src/main/kotlin/entities/games/PokemonEntry.kt
@@ -1,8 +1,8 @@
-package entity.games
+package entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.pokemon.PokemonSpecies
+import entities.common.NamedApiResource
+import entities.pokemon.PokemonSpecies
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pokedexes">Documentation of PokeApi</a>
@@ -11,14 +11,12 @@ import entity.pokemon.PokemonSpecies
  * @version 1.0.0
  * @since 2022-08-27
  */
-class PokemonEntry(
-
+data class PokemonEntry(
     /**
      * The index of this Pokémon species entry within the Pokédex.
      */
     @JsonProperty("entry_number")
     val entryNumber: Number,
-
     /**
      * The Pokémon species being encountered.
      * @see NamedApiResource
@@ -26,8 +24,4 @@ class PokemonEntry(
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: NamedApiResource<PokemonSpecies>
-) {
-    override fun toString(): String {
-        return "PokemonEntry(entryNumber=$entryNumber, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/games/Version.kt b/src/main/kotlin/entities/games/Version.kt
similarity index 78%
rename from src/main/kotlin/entity/games/Version.kt
rename to src/main/kotlin/entities/games/Version.kt
index 8558c44..6c1c1fe 100644
--- a/src/main/kotlin/entity/games/Version.kt
+++ b/src/main/kotlin/entities/games/Version.kt
@@ -1,8 +1,9 @@
-package entity.games
+package entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Versions of the games, e.g., Red, Blue or Yellow.
@@ -14,26 +15,23 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Version(
+data class Version(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>,
-
     /**
      * A list of version groups this Pokédex is relevant to.
      * @see NamedApiResource
@@ -41,8 +39,4 @@ class Version(
      */
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>? = null
-) {
-    override fun toString(): String {
-        return "Version(id=$id, name='$name', names=${names.contentToString()}, versionGroups=$versionGroup)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/games/VersionGroup.kt b/src/main/kotlin/entities/games/VersionGroup.kt
similarity index 82%
rename from src/main/kotlin/entity/games/VersionGroup.kt
rename to src/main/kotlin/entities/games/VersionGroup.kt
index 9ab15db..f50f901 100644
--- a/src/main/kotlin/entity/games/VersionGroup.kt
+++ b/src/main/kotlin/entities/games/VersionGroup.kt
@@ -1,9 +1,10 @@
-package entity.games
+package entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.locations.Region
-import entity.moves.MoveLearnMethod
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.locations.Region
+import entities.moves.MoveLearnMethod
 
 /**
  * Version groups categorize highly similar versions of the games.
@@ -15,26 +16,22 @@ import entity.moves.MoveLearnMethod
  * @version 1.0.0
  * @since 2022-08-27
  */
-class VersionGroup(
-
+data class VersionGroup(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * Order for sorting. Almost by date of release, except similar versions are grouped together.
      */
     @JsonProperty("order")
     val order: Number,
-
     /**
      * The generation this version was introduced in.
      * @see NamedApiResource
@@ -42,7 +39,6 @@ class VersionGroup(
      */
     @JsonProperty("generation")
     val generation: NamedApiResource<Generation>,
-
     /**
      * A list of methods in which Pokémon can learn moves in this version group.
      * @see NamedApiResource
@@ -50,7 +46,6 @@ class VersionGroup(
      */
     @JsonProperty("move_learn_methods")
     val moveLearnMethods: List<NamedApiResource<MoveLearnMethod>>,
-
     /**
      * A list of Pokédexes introduces in this version group.
      * @see NamedApiResource
@@ -58,7 +53,6 @@ class VersionGroup(
      */
     @JsonProperty("pokedexes")
     val pokedexes: List<NamedApiResource<Pokedex>>,
-
     /**
      * A list of regions that can be visited in this version group.
      * @see NamedApiResource
@@ -66,7 +60,6 @@ class VersionGroup(
      */
     @JsonProperty("regions")
     val regions: List<NamedApiResource<Region>>,
-
     /**
      * The versions this version group owns.
      * @see NamedApiResource
@@ -74,8 +67,4 @@ class VersionGroup(
      */
     @JsonProperty("versions")
     val versions: List<NamedApiResource<Version>>
-) {
-    override fun toString(): String {
-        return "VersionGroup(id=$id, name='$name', order=$order, generation=$generation, moveLearnMethods=$moveLearnMethods, pokedexes=$pokedexes, regions=$regions, versions=$versions)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/Item.kt b/src/main/kotlin/entities/items/Item.kt
similarity index 79%
rename from src/main/kotlin/entity/items/Item.kt
rename to src/main/kotlin/entities/items/Item.kt
index f38d85f..7b24c47 100644
--- a/src/main/kotlin/entity/items/Item.kt
+++ b/src/main/kotlin/entities/items/Item.kt
@@ -1,14 +1,15 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.APIResource
-import entity.common.GenerationGameIndex
-import entity.common.MachineVersionDetail
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.common.VerboseEffect
-import entity.common.VersionGroupFlavorText
-import entity.evolution.EvolutionChain
+import entities.PokeApiObject
+import entities.common.APIResource
+import entities.common.GenerationGameIndex
+import entities.common.MachineVersionDetail
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.common.VerboseEffect
+import entities.common.VersionGroupFlavorText
+import entities.evolution.EvolutionChain
 
 /**
  * An item is an object in the games which the player can pick up, keep in their bag, and use in some manner.
@@ -21,32 +22,27 @@ import entity.evolution.EvolutionChain
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Item(
-
+data class Item(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The price of this item in stores.
      */
     @JsonProperty("cost")
     val cost: Int,
-
     /**
      * The power of the move Fling when used with this item.
      */
     @JsonProperty("fling_power")
     val flingPower: Number?,
-
     /**
      * The effect of the move Fling when used with this item.
      * @see NamedApiResource
@@ -54,7 +50,6 @@ class Item(
      */
     @JsonProperty("fling_effect")
     val flingEffect: NamedApiResource<ItemFlingEffect>?,
-
     /**
      * A list of attributes this item has.
      * @see NamedApiResource
@@ -62,7 +57,6 @@ class Item(
      */
     @JsonProperty("attributes")
     val attributes: List<NamedApiResource<ItemAttribute>>,
-
     /**
      * The category of items this item falls into.
      * @see NamedApiResource
@@ -70,49 +64,42 @@ class Item(
      */
     @JsonProperty("category")
     val category: NamedApiResource<ItemCategory>,
-
     /**
      * The effect of this ability listed in different languages.
      * @see VerboseEffect
      */
     @JsonProperty("effect_entries")
     val effectEntries: List<VerboseEffect>,
-
     /**
      * The flavor text of this ability listed in different languages.
      * @see VersionGroupFlavorText
      */
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: List<VersionGroupFlavorText>,
-
     /**
      * A list of game indices relevent to this item by generation.
      * @see GenerationGameIndex
      */
     @JsonProperty("game_indices")
     val gameIndices: List<GenerationGameIndex>,
-
     /**
      * The name of this item listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A set of sprites used to depict this item in the game.
      * @see ItemSprites
      */
     @JsonProperty("sprites")
     val sprites: ItemSprites?,
-
     /**
      * A list of Pokémon that might be found in the wild holding this item.
      * @see ItemHolderPokemon
      */
     @JsonProperty("held_by_pokemon")
     val heldByPokemon: List<ItemHolderPokemon>,
-
     /**
      * An evolution chain this item requires to produce a bay during mating.
      * @see APIResource
@@ -120,18 +107,10 @@ class Item(
      */
     @JsonProperty("baby_trigger_for")
     val babyTriggerFor: APIResource?,
-
     /**
      * A list of the machines related to this item.
      * @see MachineVersionDetail
      */
     @JsonProperty("machines")
     val machines: List<MachineVersionDetail>
-
-) {
-    override fun toString(): String {
-        return "Item(id=$id, name='$name', cost=$cost, flingPower=$flingPower, flingEffect=$flingEffect, attributes=$attributes, " +
-            "category=$category, effectEntries=$effectEntries, flavorTextEntries=$flavorTextEntries, gameIndices=$gameIndices, " +
-            "names=$names, sprites=$sprites, heldByPokemon=$heldByPokemon, babyTriggerFor=$babyTriggerFor, machines=$machines)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/ItemAttribute.kt b/src/main/kotlin/entities/items/ItemAttribute.kt
similarity index 78%
rename from src/main/kotlin/entity/items/ItemAttribute.kt
rename to src/main/kotlin/entities/items/ItemAttribute.kt
index 9199f89..b8f98a2 100644
--- a/src/main/kotlin/entity/items/ItemAttribute.kt
+++ b/src/main/kotlin/entities/items/ItemAttribute.kt
@@ -1,9 +1,10 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Item attributes define particular aspects of items, e.g. "usable in battle" or "consumable".
@@ -15,20 +16,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemAttribute(
-
+data class ItemAttribute(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of items that have this attribute.
      * @see NamedApiResource
@@ -36,22 +34,16 @@ class ItemAttribute(
      */
     @JsonProperty("items")
     val items: Array<NamedApiResource<Item>>,
-
     /**
      * The name of this item attribute listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>,
-
     /**
      * The description of this item attribute listed in different languages.
      * @see Description
      */
     @JsonProperty("descriptions")
     val descriptions: Array<Description>
-) {
-    override fun toString(): String {
-        return "ItemAttribute(id=$id, name='$name', items=$items, names=$names, descriptions=$descriptions)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/ItemCategory.kt b/src/main/kotlin/entities/items/ItemCategory.kt
similarity index 81%
rename from src/main/kotlin/entity/items/ItemCategory.kt
rename to src/main/kotlin/entities/items/ItemCategory.kt
index 6d2b7b7..797d45b 100644
--- a/src/main/kotlin/entity/items/ItemCategory.kt
+++ b/src/main/kotlin/entities/items/ItemCategory.kt
@@ -1,8 +1,9 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Item categories determine where items will be placed in the players bag.
@@ -14,20 +15,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemCategory(
-
+data class ItemCategory(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of items that have this attribute.
      * @see NamedApiResource
@@ -35,14 +33,12 @@ class ItemCategory(
      */
     @JsonProperty("items")
     val items: List<NamedApiResource<Item>>,
-
     /**
      * The name of this item attribute listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * The pocket items in this category would be put in.
      * @see NamedApiResource
@@ -50,8 +46,4 @@ class ItemCategory(
      */
     @JsonProperty("pocket")
     val pocket: NamedApiResource<ItemPocket>
-) {
-    override fun toString(): String {
-        return "ItemCategory(id=$id, name='$name', items=$items, names=$names, pocket=$pocket)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/ItemFlingEffect.kt b/src/main/kotlin/entities/items/ItemFlingEffect.kt
similarity index 76%
rename from src/main/kotlin/entity/items/ItemFlingEffect.kt
rename to src/main/kotlin/entities/items/ItemFlingEffect.kt
index c7a202c..ba6f52f 100644
--- a/src/main/kotlin/entity/items/ItemFlingEffect.kt
+++ b/src/main/kotlin/entities/items/ItemFlingEffect.kt
@@ -1,8 +1,9 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Effect
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Effect
+import entities.common.NamedApiResource
 
 /**
  * The various effects of the move "Fling" when used with different items.
@@ -13,27 +14,23 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemFlingEffect(
-
+data class ItemFlingEffect(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The result of this fling effect listed in different languages.
      * @see Effect
      */
     @JsonProperty("effect_entries")
     val effectEntries: List<Effect>,
-
     /**
      * A list of items that have this fling effect.
      * @see NamedApiResource
@@ -41,8 +38,4 @@ class ItemFlingEffect(
      */
     @JsonProperty("items")
     val items: List<NamedApiResource<Item>>
-) {
-    override fun toString(): String {
-        return "ItemFlingEffect(id=$id, name='$name', effectEntries=$effectEntries, items=$items)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/ItemHolderPokemon.kt b/src/main/kotlin/entities/items/ItemHolderPokemon.kt
similarity index 87%
rename from src/main/kotlin/entity/items/ItemHolderPokemon.kt
rename to src/main/kotlin/entities/items/ItemHolderPokemon.kt
index 90b1af3..6af1522 100644
--- a/src/main/kotlin/entity/items/ItemHolderPokemon.kt
+++ b/src/main/kotlin/entities/items/ItemHolderPokemon.kt
@@ -1,8 +1,8 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.pokemon.Pokemon
+import entities.common.NamedApiResource
+import entities.pokemon.Pokemon
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#itemholderpokemon">Documentation of PokeApi</a>
@@ -19,7 +19,6 @@ class ItemHolderPokemon(
      */
     @JsonProperty("pokemon")
     val pokemon: NamedApiResource<Pokemon>,
-
     /**
      * The details for the version that this item is held in by the Pokémon.
      * @see ItemHolderPokemonVersionDetail
diff --git a/src/main/kotlin/entity/items/ItemHolderPokemonVersionDetail.kt b/src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt
similarity index 76%
rename from src/main/kotlin/entity/items/ItemHolderPokemonVersionDetail.kt
rename to src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt
index 0753d24..faca1a4 100644
--- a/src/main/kotlin/entity/items/ItemHolderPokemonVersionDetail.kt
+++ b/src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt
@@ -1,7 +1,7 @@
-package entity.items
+package entities.items
 
-import entity.common.NamedApiResource
-import entity.games.Version
+import entities.common.NamedApiResource
+import entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#itemholderpokemondetail">Documentation of PokeApi</a>
@@ -10,13 +10,11 @@ import entity.games.Version
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemHolderPokemonVersionDetail(
-
+data class ItemHolderPokemonVersionDetail(
     /**
      * How often this Pokémon holds this item in this version.
      */
     val rarity: Number,
-
     /**
      * The version that this item is held in by the Pokémon.
      * @see NamedApiResource
diff --git a/src/main/kotlin/entity/items/ItemPocket.kt b/src/main/kotlin/entities/items/ItemPocket.kt
similarity index 79%
rename from src/main/kotlin/entity/items/ItemPocket.kt
rename to src/main/kotlin/entities/items/ItemPocket.kt
index 4b35ef2..bebbb53 100644
--- a/src/main/kotlin/entity/items/ItemPocket.kt
+++ b/src/main/kotlin/entities/items/ItemPocket.kt
@@ -1,8 +1,9 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Pockets within the players bag used for storing items by category.
@@ -14,20 +15,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemPocket(
-
+data class ItemPocket(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of item categories that are relevant to this item pocket.
      * @see NamedApiResource
@@ -35,15 +33,10 @@ class ItemPocket(
      */
     @JsonProperty("categories")
     val categories: List<NamedApiResource<ItemCategory>>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-) {
-    override fun toString(): String {
-        return "ItemPocket(id=$id, name='$name', categories=$categories, names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/items/ItemSprites.kt b/src/main/kotlin/entities/items/ItemSprites.kt
similarity index 92%
rename from src/main/kotlin/entity/items/ItemSprites.kt
rename to src/main/kotlin/entities/items/ItemSprites.kt
index f15f602..c9affff 100644
--- a/src/main/kotlin/entity/items/ItemSprites.kt
+++ b/src/main/kotlin/entities/items/ItemSprites.kt
@@ -1,4 +1,4 @@
-package entity.items
+package entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -12,7 +12,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ItemSprites(
+data class ItemSprites(
     /**
      * The default depiction of this item.
      */
diff --git a/src/main/kotlin/entity/locations/EncounterMethodRate.kt b/src/main/kotlin/entities/locations/EncounterMethodRate.kt
similarity index 70%
rename from src/main/kotlin/entity/locations/EncounterMethodRate.kt
rename to src/main/kotlin/entities/locations/EncounterMethodRate.kt
index c6379cf..976ddee 100644
--- a/src/main/kotlin/entity/locations/EncounterMethodRate.kt
+++ b/src/main/kotlin/entities/locations/EncounterMethodRate.kt
@@ -1,8 +1,8 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.encounters.EncounterMethod
+import entities.common.NamedApiResource
+import entities.encounters.EncounterMethod
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encountermethodrate">Documentation of PokeApi</a>
@@ -11,8 +11,7 @@ import entity.encounters.EncounterMethod
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EncounterMethodRate(
-
+data class EncounterMethodRate(
     /**
      * The method in which Pokémon may be encountered in an area..
      * @see NamedApiResource
@@ -20,15 +19,10 @@ class EncounterMethodRate(
      */
     @JsonProperty("encounter_method")
     val encounterMethod: NamedApiResource<EncounterMethod>,
-
     /**
      * The chance of the encounter to occur on a version of the game.
      * @see EncounterVersionDetails
      */
     @JsonProperty("version_details")
     val versionDetails: List<EncounterVersionDetails>
-) {
-    override fun toString(): String {
-        return "EncounterMethodRate(encounterMethod=$encounterMethod, versionDetails=$versionDetails)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/locations/EncounterVersionDetails.kt b/src/main/kotlin/entities/locations/EncounterVersionDetails.kt
similarity index 69%
rename from src/main/kotlin/entity/locations/EncounterVersionDetails.kt
rename to src/main/kotlin/entities/locations/EncounterVersionDetails.kt
index 3fd21bc..8e4b027 100644
--- a/src/main/kotlin/entity/locations/EncounterVersionDetails.kt
+++ b/src/main/kotlin/entities/locations/EncounterVersionDetails.kt
@@ -1,8 +1,8 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.Version
+import entities.common.NamedApiResource
+import entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encounterversiondetails">Documentation of PokeApi</a>
@@ -11,14 +11,12 @@ import entity.games.Version
  * @version 1.0.0
  * @since 2022-08-27
  */
-class EncounterVersionDetails(
-
+data class EncounterVersionDetails(
     /**
      * The chance of an encounter to occur.
      */
     @JsonProperty("rate")
     val rate: Number,
-
     /**
      * The version of the game in which the encounter can occur with the given chance.
      * @see NamedApiResource
@@ -26,8 +24,4 @@ class EncounterVersionDetails(
      */
     @JsonProperty("version")
     val version: NamedApiResource<Version>
-) {
-    override fun toString(): String {
-        return "EncounterVersionDetails(rate=$rate, version=$version)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/locations/Location.kt b/src/main/kotlin/entities/locations/Location.kt
similarity index 81%
rename from src/main/kotlin/entity/locations/Location.kt
rename to src/main/kotlin/entities/locations/Location.kt
index 819ee50..23b042c 100644
--- a/src/main/kotlin/entity/locations/Location.kt
+++ b/src/main/kotlin/entities/locations/Location.kt
@@ -1,9 +1,10 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.GenerationGameIndex
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.GenerationGameIndex
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Locations that can be visited within the games. Locations make up sizable portions of regions, like cities or routes.
@@ -15,19 +16,17 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Location(
+data class Location(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The region this location can be found in.
      * @see NamedApiResource
@@ -35,21 +34,18 @@ class Location(
      */
     @JsonProperty("region")
     val region: NamedApiResource<Region>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of game indices relevent to this location by generation.
      * @see GenerationGameIndex
      */
     @JsonProperty("game_indices")
     val gameIndices: List<GenerationGameIndex>,
-
     /**
      * Areas that can be found within this location.
      * @see NamedApiResource
@@ -57,8 +53,4 @@ class Location(
      */
     @JsonProperty("areas")
     val areas: List<NamedApiResource<LocationArea>>
-) {
-    override fun toString(): String {
-        return "Location(id=$id, name='$name', region=$region, names=$names, gameIndices=$gameIndices, areas=$areas)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/locations/LocationArea.kt b/src/main/kotlin/entities/locations/LocationArea.kt
similarity index 82%
rename from src/main/kotlin/entity/locations/LocationArea.kt
rename to src/main/kotlin/entities/locations/LocationArea.kt
index 7a9122e..0d3bc0b 100644
--- a/src/main/kotlin/entity/locations/LocationArea.kt
+++ b/src/main/kotlin/entities/locations/LocationArea.kt
@@ -1,8 +1,9 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Location areas are sections of areas, such as floors in a building or cave.
@@ -15,26 +16,22 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class LocationArea(
-
+data class LocationArea(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The internal id of an API resource within game data.
      */
     @JsonProperty("game_index")
     val gameIndex: Number,
-
     /**
      * A list of methods in which Pokémon may be encountered in this area and how likely the method
      * will occur depending on the version of the game.
@@ -42,7 +39,6 @@ class LocationArea(
      */
     @JsonProperty("encounter_method_rates")
     val encounterMethodRates: List<EncounterMethodRate>,
-
     /**
      * The region this location area can be found in.
      * @see NamedApiResource
@@ -50,23 +46,16 @@ class LocationArea(
      */
     @JsonProperty("location")
     val location: NamedApiResource<Location>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of Pokémon that can be encountered in this area along with version specific details about the encounter.
      * @see PokemonEncounter
      */
     @JsonProperty("pokemon_encounters")
     val pokemonEncounters: List<PokemonEncounter>
-) {
-    override fun toString(): String {
-        return "LocationArea(id=$id, name=$name, gameIndex=$gameIndex, encounterMethodRates=$encounterMethodRates, location=$location, " +
-            "names=$names, pokemonEncounters=$pokemonEncounters)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/locations/PalParkArea.kt b/src/main/kotlin/entities/locations/PalParkArea.kt
similarity index 77%
rename from src/main/kotlin/entity/locations/PalParkArea.kt
rename to src/main/kotlin/entities/locations/PalParkArea.kt
index a1c063a..39e46da 100644
--- a/src/main/kotlin/entity/locations/PalParkArea.kt
+++ b/src/main/kotlin/entities/locations/PalParkArea.kt
@@ -1,7 +1,8 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
+import entities.PokeApiObject
+import entities.common.Name
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pal-park-areas">Documentation of PokeApi</a>
@@ -10,34 +11,27 @@ import entity.common.Name
  * @version 1.0.0
  * @since 2022-08-27
  */
-class PalParkArea(
+data class PalParkArea(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of Pokémon encountered in thi pal park area along with details.
      * @see PalParkEncounterSpecies
      */
     @JsonProperty("pokemon_encounters")
     val pokemonEncounters: List<PalParkEncounterSpecies>
-) {
-    override fun toString(): String {
-        return "PalParkArea(id=$id, name='$name', names=$names, pokemonEncounters=$pokemonEncounters)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/locations/PalParkEncounterSpecies.kt b/src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt
similarity index 71%
rename from src/main/kotlin/entity/locations/PalParkEncounterSpecies.kt
rename to src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt
index 5d55987..6deefb9 100644
--- a/src/main/kotlin/entity/locations/PalParkEncounterSpecies.kt
+++ b/src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt
@@ -1,8 +1,8 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.pokemon.PokemonSpecies
+import entities.common.NamedApiResource
+import entities.pokemon.PokemonSpecies
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#palparkencounterspecies">Documentation of PokeApi</a>
@@ -11,20 +11,17 @@ import entity.pokemon.PokemonSpecies
  * @version 1.0.0
  * @since 2022-08-27
  */
-class PalParkEncounterSpecies(
-
+data class PalParkEncounterSpecies(
     /**
      * The base score given to the player when this Pokémon is caught during a pal park run
      */
     @JsonProperty("base_score")
     val baseScore: Number,
-
     /**
      * The base rate for encountering this Pokémon in this pal park area
      */
     @JsonProperty("rate")
     val rate: Number,
-
     /**
      * The Pokémon species being encountered
      * @see NamedApiResource
@@ -32,8 +29,4 @@ class PalParkEncounterSpecies(
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: NamedApiResource<PokemonSpecies>
-) {
-    override fun toString(): String {
-        return "PalParkEncounterSpecies(baseScore=$baseScore, rate=$rate, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/locations/PokemonEncounter.kt b/src/main/kotlin/entities/locations/PokemonEncounter.kt
similarity index 68%
rename from src/main/kotlin/entity/locations/PokemonEncounter.kt
rename to src/main/kotlin/entities/locations/PokemonEncounter.kt
index 276d22f..4882f05 100644
--- a/src/main/kotlin/entity/locations/PokemonEncounter.kt
+++ b/src/main/kotlin/entities/locations/PokemonEncounter.kt
@@ -1,9 +1,9 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.common.VersionEncounterDetail
-import entity.pokemon.Pokemon
+import entities.common.NamedApiResource
+import entities.common.VersionEncounterDetail
+import entities.pokemon.Pokemon
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pokemonencounter">Documentation of PokeApi</a>
@@ -12,7 +12,7 @@ import entity.pokemon.Pokemon
  * @version 1.0.0
  * @since 2022-08-27
  */
-class PokemonEncounter(
+data class PokemonEncounter(
     /**
      * The Pokémon being encountered.
      * @see NamedApiResource
@@ -20,15 +20,10 @@ class PokemonEncounter(
      */
     @JsonProperty("pokemon")
     val pokemon: NamedApiResource<Pokemon>,
-
     /**
      * A list of versions and encounters with Pokémon that might happen in the referenced location area.
      * @see VersionEncounterDetail
      */
     @JsonProperty("version_details")
     val versionDetails: List<VersionEncounterDetail>
-) {
-    override fun toString(): String {
-        return "PokemonEncounter(pokemon=$pokemon, versionDetails=$versionDetails)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/locations/Region.kt b/src/main/kotlin/entities/locations/Region.kt
similarity index 80%
rename from src/main/kotlin/entity/locations/Region.kt
rename to src/main/kotlin/entities/locations/Region.kt
index 5557854..9c121dd 100644
--- a/src/main/kotlin/entity/locations/Region.kt
+++ b/src/main/kotlin/entities/locations/Region.kt
@@ -1,11 +1,12 @@
-package entity.locations
+package entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.games.Generation
-import entity.games.Pokedex
-import entity.games.VersionGroup
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.games.Generation
+import entities.games.Pokedex
+import entities.games.VersionGroup
 
 /**
  * A region is an organized area of the Pokémon world. Most often, the main difference between regions is the
@@ -18,14 +19,12 @@ import entity.games.VersionGroup
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Region(
-
+data class Region(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * A list of locations that can be found in this region.
      * @see NamedApiResource
@@ -33,20 +32,17 @@ class Region(
      */
     @JsonProperty("locations")
     val locations: List<NamedApiResource<Location>>,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * The generation this region was introduced in.
      * @see NamedApiResource
@@ -54,7 +50,6 @@ class Region(
      */
     @JsonProperty("main_generation")
     val mainGeneration: NamedApiResource<Generation>,
-
     /**
      * A list of pokédexes that catalogue Pokémon in this region.
      * @see Pokedex
@@ -62,7 +57,6 @@ class Region(
      */
     @JsonProperty("pokedexes")
     val pokedexes: List<NamedApiResource<Pokedex>>,
-
     /**
      * A list of version groups where this region can be visited.
      * @see NamedApiResource
@@ -70,8 +64,4 @@ class Region(
      */
     @JsonProperty("version_groups")
     val versionGroups: List<NamedApiResource<VersionGroup>>
-) {
-    override fun toString(): String {
-        return "Region(id=$id, locations=$locations, name='$name', names=$names, mainGeneration=$mainGeneration, pokedexes=$pokedexes, versionGroups=$versionGroups)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/machines/Machine.kt b/src/main/kotlin/entities/machines/Machine.kt
similarity index 78%
rename from src/main/kotlin/entity/machines/Machine.kt
rename to src/main/kotlin/entities/machines/Machine.kt
index 28f0b87..abdf9f4 100644
--- a/src/main/kotlin/entity/machines/Machine.kt
+++ b/src/main/kotlin/entities/machines/Machine.kt
@@ -1,10 +1,11 @@
-package entity.machines
+package entities.machines
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
-import entity.items.Item
-import entity.moves.Move
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
+import entities.items.Item
+import entities.moves.Move
 
 /**
  * Machines are the representation of items that teach moves to Pokémon.
@@ -16,14 +17,12 @@ import entity.moves.Move
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Machine(
-
+data class Machine(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The TM or HM item that corresponds to this machine.
      * @see NamedApiResource
@@ -31,7 +30,6 @@ class Machine(
      */
     @JsonProperty("item")
     val item: NamedApiResource<Item>,
-
     /**
      * The move that is taught by this machine.
      * @see NamedApiResource
@@ -39,7 +37,6 @@ class Machine(
      */
     @JsonProperty("move")
     val move: NamedApiResource<Move>,
-
     /**
      * The version group that this machine applies to.
      * @see NamedApiResource
@@ -47,8 +44,4 @@ class Machine(
      */
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>
-) {
-    override fun toString(): String {
-        return "Machine(id=$id, item=$item, move=$move, versionGroup=$versionGroup)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/ContestComboDetail.kt b/src/main/kotlin/entities/moves/ContestComboDetail.kt
similarity index 73%
rename from src/main/kotlin/entity/moves/ContestComboDetail.kt
rename to src/main/kotlin/entities/moves/ContestComboDetail.kt
index 7d185ad..62598df 100644
--- a/src/main/kotlin/entity/moves/ContestComboDetail.kt
+++ b/src/main/kotlin/entities/moves/ContestComboDetail.kt
@@ -1,7 +1,7 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#contestcombodetail">Documentation of PokeApi</a>
@@ -10,8 +10,7 @@ import entity.common.NamedApiResource
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ContestComboDetail(
-
+data class ContestComboDetail(
     /**
      * A list of moves to use before this move.
      * @see NamedApiResource
@@ -19,7 +18,6 @@ class ContestComboDetail(
      */
     @JsonProperty("use_before")
     val useBefore: List<NamedApiResource<Move>>? = null,
-
     /**
      * A list of moves to use after this move.
      * @see NamedApiResource
@@ -27,9 +25,4 @@ class ContestComboDetail(
      */
     @JsonProperty("use_after")
     val useAfter: List<NamedApiResource<Move>>? = null
-
-) {
-    override fun toString(): String {
-        return "ContestComboDetail(useBefore=$useBefore, useAfter=$useAfter)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/moves/ContestComboSets.kt b/src/main/kotlin/entities/moves/ContestComboSets.kt
similarity index 92%
rename from src/main/kotlin/entity/moves/ContestComboSets.kt
rename to src/main/kotlin/entities/moves/ContestComboSets.kt
index d906dc6..9def88e 100644
--- a/src/main/kotlin/entity/moves/ContestComboSets.kt
+++ b/src/main/kotlin/entities/moves/ContestComboSets.kt
@@ -1,4 +1,4 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -9,15 +9,13 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @version 1.0.0
  * @since 2022-08-27
  */
-class ContestComboSets(
-
+data class ContestComboSets(
     /**
      * A detail of moves this move can be used before or after, granting additional appeal points in contests.
      * @see ContestComboDetail
      */
     @JsonProperty("normal")
     val normal: ContestComboDetail,
-
     /**
      * A detail of moves this move can be used before or after, granting additional appeal points in super contests.
      * @see ContestComboDetail
diff --git a/src/main/kotlin/entity/moves/Move.kt b/src/main/kotlin/entities/moves/Move.kt
similarity index 82%
rename from src/main/kotlin/entity/moves/Move.kt
rename to src/main/kotlin/entities/moves/Move.kt
index d27196c..2b115b3 100644
--- a/src/main/kotlin/entity/moves/Move.kt
+++ b/src/main/kotlin/entities/moves/Move.kt
@@ -1,16 +1,17 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.APIResource
-import entity.common.MachineVersionDetail
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.common.VerboseEffect
-import entity.contests.ContestType
-import entity.contests.SuperContestEffects
-import entity.games.Generation
-import entity.pokemon.Pokemon
-import entity.pokemon.Type
+import entities.PokeApiObject
+import entities.common.APIResource
+import entities.common.MachineVersionDetail
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.common.VerboseEffect
+import entities.contests.ContestType
+import entities.contests.SuperContestEffects
+import entities.games.Generation
+import entities.pokemon.Pokemon
+import entities.pokemon.Type
 
 /**
  * Moves are the skills of Pokémon in battle. In battle, a Pokémon uses one move each turn.
@@ -24,56 +25,48 @@ import entity.pokemon.Type
  * @version 1.0.0
  * @since 2022-08-27
  */
-class Move(
+data class Move(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The percent value of how likely this move is to be successful.
      */
     @JsonProperty("accuracy")
     val accuracy: Number,
-
     /**
      * The percent value of how likely it is this moves effect will happen.
      */
     @JsonProperty("effect_chance")
     val effectChance: Number? = null,
-
     /**
      * Power points. The number of times this move can be used.
      */
     @JsonProperty("pp")
     val pp: Number,
-
     /**
      * A value between -8 and 8. Sets the order in which moves are executed during battle. See Bulbapedia for greater detail.
      */
     @JsonProperty("priority")
     val priority: Number,
-
     /**
      * The base power of this move with a value of 0 if it does not have a base power.
      */
     @JsonProperty("power")
     val power: Number,
-
     /**
      * A detail of normal and super contest combos that require this move.
      * @see ContestComboSets
      */
     @JsonProperty("contest_combos")
     val contestCombos: ContestComboSets,
-
     /**
      * The type of appeal this move gives a Pokémon when used in a contest.
      * @see ContestType
@@ -81,7 +74,6 @@ class Move(
      */
     @JsonProperty("contest_type")
     val contestType: NamedApiResource<ContestType>,
-
     /**
      * The effect the move has when used in a contest.
      * @see APIResource
@@ -89,7 +81,6 @@ class Move(
      */
     @JsonProperty("contest_effect")
     val contestEffect: APIResource,
-
     /**
      * The type of damage the move inflicts on the target, e.g. physical.
      * @ee NamedApiResource
@@ -97,21 +88,18 @@ class Move(
      */
     @JsonProperty("damage_class")
     val damageClass: NamedApiResource<MoveDamageClass>,
-
     /**
      * The effect of this move listed in different languages.
      * @see VerboseEffect
      */
     @JsonProperty("effect_entries")
     val effectEntries: List<VerboseEffect>,
-
     /**
      * The list of previous effects this move has had across version groups of the games.
      * @see SuperContestEffects
      */
     @JsonProperty("effect_changes")
     val effectChanges: List<SuperContestEffects>,
-
     /**
      * List of Pokemon that can learn the move
      * @see NamedApiResource
@@ -119,14 +107,12 @@ class Move(
      */
     @JsonProperty("learned_by_pokemon")
     val learnedByPokemon: List<NamedApiResource<Pokemon>>,
-
     /**
      * The flavor text of this move listed in different languages.
      * @see MoveFlavorText
      */
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: List<MoveFlavorText>,
-
     /**
      * The generation in which this move was introduced.
      * @see NamedApiResource
@@ -134,42 +120,36 @@ class Move(
      */
     @JsonProperty("generation")
     val generation: NamedApiResource<Generation>,
-
     /**
      * A list of the machines that teach this move.
      * @see MachineVersionDetail
      */
     @JsonProperty("machines")
     val machines: List<MachineVersionDetail>,
-
     /**
      * Metadata about this move
      * @see MoveMetaData
      */
     @JsonProperty("meta")
     val meta: MoveMetaData,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of move resource value changes across version groups of the game.
      * @see PastMoveStatValues
      */
     @JsonProperty("past_values")
     val pastValues: List<PastMoveStatValues>,
-
     /**
      * A list of stats this moves effects and how much it effects them.
      * @see MoveStatChange
      */
     @JsonProperty("stat_changes")
     val statChanges: List<MoveStatChange>,
-
     /**
      * The effect the move has when used in a super contest.
      * @see APIResource
@@ -177,7 +157,6 @@ class Move(
      */
     @JsonProperty("super_contest_effect")
     val superContestEffect: APIResource,
-
     /**
      * The type of target that will receive the effects of the attack.
      * @see NamedApiResource
@@ -185,7 +164,6 @@ class Move(
      */
     @JsonProperty("target")
     val target: NamedApiResource<MoveTarget>,
-
     /**
      * The elemental type of this move.
      * @see NamedApiResource
@@ -193,8 +171,4 @@ class Move(
      */
     @JsonProperty("type")
     val type: NamedApiResource<Type>
-) {
-    override fun toString(): String {
-        return "Move(id=$id, name='$name', accuracy=$accuracy, effectChance=$effectChance, pp=$pp, priority=$priority, power=$power, contestCombos=$contestCombos, contestType=$contestType, contestEffect=$contestEffect, damageClass=$damageClass, effectEntries=$effectEntries, effectChanges=$effectChanges, learnedByPokemon=$learnedByPokemon, flavorTextEntries=$flavorTextEntries, generation=$generation, machines=$machines, meta=$meta, names=$names, pastValues=$pastValues, statChanges=$statChanges, superContestEffect=$superContestEffect, target=$target, type=$type)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveAilment.kt b/src/main/kotlin/entities/moves/MoveAilment.kt
similarity index 73%
rename from src/main/kotlin/entity/moves/MoveAilment.kt
rename to src/main/kotlin/entities/moves/MoveAilment.kt
index ea5bc65..f26fc4d 100644
--- a/src/main/kotlin/entity/moves/MoveAilment.kt
+++ b/src/main/kotlin/entities/moves/MoveAilment.kt
@@ -1,8 +1,9 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * @author Tykok
@@ -10,20 +11,17 @@ import entity.common.NamedApiResource
  * @since 2022-08-30
  *
  */
-class MoveAilment(
-
+data class MoveAilment(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of moves that cause this ailment.
      * @see NamedApiResource
@@ -31,16 +29,10 @@ class MoveAilment(
      */
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-
-) {
-    override fun toString(): String {
-        return "MoveAilment(id=$id, name='$name', moves=$moves, names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveBattleStyle.kt b/src/main/kotlin/entities/moves/MoveBattleStyle.kt
similarity index 71%
rename from src/main/kotlin/entity/moves/MoveBattleStyle.kt
rename to src/main/kotlin/entities/moves/MoveBattleStyle.kt
index ab323b4..9e65bb6 100644
--- a/src/main/kotlin/entity/moves/MoveBattleStyle.kt
+++ b/src/main/kotlin/entities/moves/MoveBattleStyle.kt
@@ -1,7 +1,8 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
+import entities.PokeApiObject
+import entities.common.Name
 
 /**
  * @author Tykok
@@ -9,28 +10,21 @@ import entity.common.Name
  * @since 2022-08-30
  *
  */
-class MoveBattleStyle(
+data class MoveBattleStyle(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-
-) {
-    override fun toString(): String {
-        return "MoveBattleStyle(id=$id, name='$name', names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveCategory.kt b/src/main/kotlin/entities/moves/MoveCategory.kt
similarity index 75%
rename from src/main/kotlin/entity/moves/MoveCategory.kt
rename to src/main/kotlin/entities/moves/MoveCategory.kt
index b8f63d4..5c820d9 100644
--- a/src/main/kotlin/entity/moves/MoveCategory.kt
+++ b/src/main/kotlin/entities/moves/MoveCategory.kt
@@ -1,7 +1,8 @@
-package entity.moves
+package entities.moves
 
-import entity.common.Description
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.NamedApiResource
 
 /**
  * @author Tykok
@@ -9,28 +10,24 @@ import entity.common.NamedApiResource
  * @since 2022-08-30
  *
  */
-class MoveCategory(
-
+data class MoveCategory(
     /**
      * The identifier for this resource.
      */
     val id: Number,
-
     /**
      * The name for this resource.
      */
     val name: String,
-
     /**
      * A list of moves that fall into this category.
      * @see NamedApiResource
      * @see Move
      */
     val moves: Array<NamedApiResource<Move>>,
-
     /**
      * The description of this resource listed in different languages.
      * @see Move
      */
     val descriptions: Array<Description>
-)
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveDamageClass.kt b/src/main/kotlin/entities/moves/MoveDamageClass.kt
similarity index 73%
rename from src/main/kotlin/entity/moves/MoveDamageClass.kt
rename to src/main/kotlin/entities/moves/MoveDamageClass.kt
index d4777b8..5bb014d 100644
--- a/src/main/kotlin/entity/moves/MoveDamageClass.kt
+++ b/src/main/kotlin/entities/moves/MoveDamageClass.kt
@@ -1,9 +1,10 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * @author Tykok
@@ -11,27 +12,23 @@ import entity.common.NamedApiResource
  * @since 2022-08-30
  *
  */
-class MoveDamageClass(
-
+data class MoveDamageClass(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The description of this resource listed in different languages.
      * @see Description
      */
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * A list of moves that fall into this damage class.
      * @see NamedApiResource
@@ -39,15 +36,10 @@ class MoveDamageClass(
      */
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-) {
-    override fun toString(): String {
-        return "MoveDamageClass(id=$id, name='$name', descriptions=$descriptions, moves=$moves, names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveFlavorText.kt b/src/main/kotlin/entities/moves/MoveFlavorText.kt
similarity index 68%
rename from src/main/kotlin/entity/moves/MoveFlavorText.kt
rename to src/main/kotlin/entities/moves/MoveFlavorText.kt
index a081606..a255449 100644
--- a/src/main/kotlin/entity/moves/MoveFlavorText.kt
+++ b/src/main/kotlin/entities/moves/MoveFlavorText.kt
@@ -1,23 +1,21 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
-import entity.utility.Language
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
+import entities.utility.Language
 
 /**
  * @author Tykok
  * @version 1.0.0
  * @since 2022-08-27
  */
-class MoveFlavorText(
-
+data class MoveFlavorText(
     /**
      * The localized flavor text for an api resource in a specific language.
      */
     @JsonProperty("flavor_text")
     val flavorText: String,
-
     /**
      * The language this name is in.
      * @see NamedApiResource
@@ -25,7 +23,6 @@ class MoveFlavorText(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>,
-
     /**
      * The version group that uses this flavor text.
      * @see NamedApiResource
@@ -33,9 +30,4 @@ class MoveFlavorText(
      */
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>
-
-) {
-    override fun toString(): String {
-        return "MoveFlavorText(flavorText='$flavorText', language=$language, versionGroup=$versionGroup)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/moves/MoveLearnMethod.kt b/src/main/kotlin/entities/moves/MoveLearnMethod.kt
similarity index 71%
rename from src/main/kotlin/entity/moves/MoveLearnMethod.kt
rename to src/main/kotlin/entities/moves/MoveLearnMethod.kt
index ade95d2..b793756 100644
--- a/src/main/kotlin/entity/moves/MoveLearnMethod.kt
+++ b/src/main/kotlin/entities/moves/MoveLearnMethod.kt
@@ -1,10 +1,11 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
 
 /**
  * @author Tykok
@@ -12,34 +13,29 @@ import entity.games.VersionGroup
  * @since 2022-08-30
  *
  */
-class MoveLearnMethod(
-
+data class MoveLearnMethod(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The description of this resource listed in different languages.
      * @see Description
      */
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of version groups where moves can be learned through this method.
      * @see NamedApiResource
@@ -47,9 +43,4 @@ class MoveLearnMethod(
      */
     @JsonProperty("version_groups")
     val versionGroups: List<NamedApiResource<VersionGroup>>
-
-) {
-    override fun toString(): String {
-        return "MoveLearnMethod(id=$id, name='$name', descriptions=$descriptions, names=$names, versionGroups=$versionGroups)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/MoveMetaData.kt b/src/main/kotlin/entities/moves/MoveMetaData.kt
similarity index 83%
rename from src/main/kotlin/entity/moves/MoveMetaData.kt
rename to src/main/kotlin/entities/moves/MoveMetaData.kt
index b7084b5..ee6b18f 100644
--- a/src/main/kotlin/entity/moves/MoveMetaData.kt
+++ b/src/main/kotlin/entities/moves/MoveMetaData.kt
@@ -1,15 +1,14 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @author Tykok
  * @version 1.0.0
  * @since 2022-08-27
  */
-class MoveMetaData(
-
+data class MoveMetaData(
     /**
      * The status ailment this move inflicts on its target.
      * @see MoveAilment
@@ -17,7 +16,6 @@ class MoveMetaData(
      */
     @JsonProperty("ailment")
     val ailment: NamedApiResource<MoveAilment>,
-
     /**
      * The category of move this move falls under, e.g. damage or ailment.
      * @see MoveCategory
@@ -25,69 +23,54 @@ class MoveMetaData(
      */
     @JsonProperty("category")
     val category: NamedApiResource<MoveCategory>,
-
     /**
      * The minimum number of times this move hits. Null if it always only hits once.
      */
     @JsonProperty("min_hits")
     val minHits: Number? = null,
-
     /**
      * The maximum number of times this move hits. Null if it always only hits once.
      */
     @JsonProperty("max_hits")
     val maxHits: Number? = null,
-
     /**
      * The minimum number of turns this move continues to take effect. Null if it always only lasts one turn.
      */
     @JsonProperty("min_turns")
     val minTurns: Number? = null,
-
     /**
      * The maximum number of turns this move continues to take effect. Null if it always only lasts one turn.
      */
     @JsonProperty("max_turns")
     val maxTurns: Number? = null,
-
     /**
      * HP drain (if positive) or Recoil damage (if negative), in percent of damage done.
      */
     @JsonProperty("drain")
     val drain: Number,
-
     /**
      * The amount of hp gained by the attacking Pokemon, in percent of it's maximum HP.
      */
     @JsonProperty("healing")
     val healing: Number,
-
     /**
      * Critical hit rate bonus.
      */
     @JsonProperty("crit_rate")
     val critRate: Number,
-
     /**
      * The likelihood this attack will cause an ailment.
      */
     @JsonProperty("ailment_chance")
     val ailmentChance: Number,
-
     /**
      * The likelihood this attack will cause the target Pokémon to flinch.
      */
     @JsonProperty("flinch_chance")
     val flinchChance: Number,
-
     /**
      * The likelihood this attack will cause a stat change in the target Pokémon.
      */
     @JsonProperty("stat_chance")
     val statChance: Number? = null
-
-) {
-    override fun toString(): String {
-        return "MoveMetaData(ailment=$ailment, category=$category, minHits=$minHits, maxHits=$maxHits, minTurns=$minTurns, maxTurns=$maxTurns, drain=$drain, healing=$healing, crit_rate=$critRate, ailmentChance=$ailmentChance, flinchChance=$flinchChance, statChance=$statChance)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/moves/MoveStatChange.kt b/src/main/kotlin/entities/moves/MoveStatChange.kt
similarity index 63%
rename from src/main/kotlin/entity/moves/MoveStatChange.kt
rename to src/main/kotlin/entities/moves/MoveStatChange.kt
index 6b360c6..399258a 100644
--- a/src/main/kotlin/entity/moves/MoveStatChange.kt
+++ b/src/main/kotlin/entities/moves/MoveStatChange.kt
@@ -1,21 +1,20 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.pokemon.Stat
+import entities.common.NamedApiResource
+import entities.pokemon.Stat
 
 /**
  * @author Tykok
  * @version 1.0.0
  * @since 2022-08-27
  */
-class MoveStatChange(
+data class MoveStatChange(
     /**
      * The amount of change.
      */
     @JsonProperty("change")
     val change: Number,
-
     /**
      * The stat being affected.
      * @see NamedApiResource
@@ -23,8 +22,4 @@ class MoveStatChange(
      */
     @JsonProperty("stat")
     val stat: NamedApiResource<Stat>
-) {
-    override fun toString(): String {
-        return "MoveStatChange(change=$change, stat=$stat)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/moves/MoveTarget.kt b/src/main/kotlin/entities/moves/MoveTarget.kt
similarity index 74%
rename from src/main/kotlin/entity/moves/MoveTarget.kt
rename to src/main/kotlin/entities/moves/MoveTarget.kt
index 238c899..0ad12a9 100644
--- a/src/main/kotlin/entity/moves/MoveTarget.kt
+++ b/src/main/kotlin/entities/moves/MoveTarget.kt
@@ -1,9 +1,10 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * @author Tykok
@@ -11,27 +12,23 @@ import entity.common.NamedApiResource
  * @since 2022-08-30
  *
  */
-class MoveTarget(
-
+data class MoveTarget(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The description of this resource listed in different languages.
      * @see Description
      */
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * A list of moves that that are directed at this target.
      * @see NamedApiResource
@@ -39,16 +36,10 @@ class MoveTarget(
      */
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-
-) {
-    override fun toString(): String {
-        return "MoveTarget(id=$id, name='$name', descriptions=$descriptions, moves=$moves, names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/moves/PastMoveStatValues.kt b/src/main/kotlin/entities/moves/PastMoveStatValues.kt
similarity index 75%
rename from src/main/kotlin/entity/moves/PastMoveStatValues.kt
rename to src/main/kotlin/entities/moves/PastMoveStatValues.kt
index 0fd68c2..ce84556 100644
--- a/src/main/kotlin/entity/moves/PastMoveStatValues.kt
+++ b/src/main/kotlin/entities/moves/PastMoveStatValues.kt
@@ -1,49 +1,43 @@
-package entity.moves
+package entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.common.VerboseEffect
-import entity.games.VersionGroup
-import entity.pokemon.Type
+import entities.common.NamedApiResource
+import entities.common.VerboseEffect
+import entities.games.VersionGroup
+import entities.pokemon.Type
 
 /**
  * @author Tykok
  * @version 1.0.0
  * @since 2022-08-27
  */
-class PastMoveStatValues(
-
+data class PastMoveStatValues(
     /**
      * The percent value of how likely this move is to be successful.
      */
     @JsonProperty("accuracy")
     val accuracy: Number,
-
     /**
      * The percent value of how likely it is this moves effect will take effect.
      */
     @JsonProperty("effect_chance")
     val effectChance: Number,
-
     /**
      * The base power of this move with a value of 0 if it does not have a base power.
      */
     @JsonProperty("power")
     val power: Number,
-
     /**
      * Power points. The number of times this move can be used.
      */
     @JsonProperty("pp")
     val pp: Number,
-
     /**
      * The effect of this move listed in different languages.
      * @see VerboseEffect
      */
     @JsonProperty("effect_entries")
     val effectEntries: List<VerboseEffect>,
-
     /**
      * The elemental type of this move.
      * @see NamedApiResource
@@ -51,7 +45,6 @@ class PastMoveStatValues(
      */
     @JsonProperty("type")
     val type: NamedApiResource<Type>,
-
     /**
      * The version group in which these move stat values were in effect.
      * @see NamedApiResource
@@ -59,8 +52,4 @@ class PastMoveStatValues(
      */
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>
-) {
-    override fun toString(): String {
-        return "PastMoveStatValues(accuracy=$accuracy, effectChance=$effectChance, power=$power, pp=$pp, effectEntries=$effectEntries, type=$type, versionGroup=$versionGroup)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/Ability.kt b/src/main/kotlin/entities/pokemon/Ability.kt
similarity index 72%
rename from src/main/kotlin/entity/pokemon/Ability.kt
rename to src/main/kotlin/entities/pokemon/Ability.kt
index fe9c0f9..fc0d97c 100644
--- a/src/main/kotlin/entity/pokemon/Ability.kt
+++ b/src/main/kotlin/entities/pokemon/Ability.kt
@@ -1,34 +1,31 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.common.VerboseEffect
-import entity.contests.SuperContestEffects
-import entity.games.Generation
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.common.VerboseEffect
+import entities.contests.SuperContestEffects
+import entities.games.Generation
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class Ability(
-
+data class Ability(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * Whether this ability originated in the main series of the video games.
      */
     @JsonProperty("is_main_series")
     val isMainSeries: Boolean,
-
     /**
      * The generation this ability originated in.
      * @see Generation
@@ -36,45 +33,34 @@ class Ability(
      */
     @JsonProperty("generation")
     val generation: NamedApiResource<Generation>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>,
-
     /**
      * The effect of this ability listed in different languages.
      * @see VerboseEffect
      */
     @JsonProperty("effect_entries")
     val effectEntries: Array<VerboseEffect>,
-
     /**
      * The list of previous effects this ability has had across version groups.
      * @see SuperContestEffects
      */
     @JsonProperty("effect_changes")
     val effectChanges: Array<SuperContestEffects>,
-
     /**
      * The flavor text of this ability listed in different languages.
      * @see AbilityFlavorText
      */
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: Array<AbilityFlavorText>,
-
     /**
      * A list of Pokémon that could potentially have this ability.
      * @see AbilityPokemon
      */
     @JsonProperty("pokemon")
     val pokemon: Array<AbilityPokemon>
-) {
-    override fun toString(): String = """
-        Ability(id=$id, name='$name', isMainSeries=$isMainSeries, generation=$generation, names=${names.contentToString()},
-        effectEntries=${effectEntries.contentToString()}, effectChanges=${effectChanges.contentToString()},
-        flavorTextEntries=${flavorTextEntries.contentToString()}, pokemon=${pokemon.contentToString()})
-        """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/AbilityFlavorText.kt b/src/main/kotlin/entities/pokemon/AbilityFlavorText.kt
similarity index 78%
rename from src/main/kotlin/entity/pokemon/AbilityFlavorText.kt
rename to src/main/kotlin/entities/pokemon/AbilityFlavorText.kt
index 0d6a6fc..e7e8c54 100644
--- a/src/main/kotlin/entity/pokemon/AbilityFlavorText.kt
+++ b/src/main/kotlin/entities/pokemon/AbilityFlavorText.kt
@@ -1,17 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
-import entity.utility.Language
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
+import entities.utility.Language
 
-class AbilityFlavorText(
+data class AbilityFlavorText(
     /**
      * The localized name for an API resource in a specific language.
      */
     @JsonProperty("flavor_text")
     val flavorText: String,
-
     /**
      * The language this text resource is in.
      * @see NamedApiResource
@@ -19,7 +18,6 @@ class AbilityFlavorText(
      */
     @JsonProperty("language")
     val language: NamedApiResource<Language>,
-
     /**
      * The version group that uses this flavor text.
      * @see VersionGroup
diff --git a/src/main/kotlin/entity/pokemon/AbilityPokemon.kt b/src/main/kotlin/entities/pokemon/AbilityPokemon.kt
similarity index 87%
rename from src/main/kotlin/entity/pokemon/AbilityPokemon.kt
rename to src/main/kotlin/entities/pokemon/AbilityPokemon.kt
index 741709f..74a5bec 100644
--- a/src/main/kotlin/entity/pokemon/AbilityPokemon.kt
+++ b/src/main/kotlin/entities/pokemon/AbilityPokemon.kt
@@ -1,22 +1,19 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-
-class AbilityPokemon(
+import entities.common.NamedApiResource
 
+data class AbilityPokemon(
     /**
      * Whether or not this a hidden ability for the referenced Pokémon.
      */
     @JsonProperty("is_hidden")
     val isHidden: Boolean,
-
     /**
      * Pokémon have 3 ability 'slots' which hold references to possible abilities they could have. This is the slot of this ability for the referenced pokemon.
      */
     @JsonProperty("slot")
     val slot: Number,
-
     /**
      * The Pokémon this ability could belong to.
      * @see Pokemon
diff --git a/src/main/kotlin/entity/pokemon/AwesomeName.kt b/src/main/kotlin/entities/pokemon/AwesomeName.kt
similarity index 60%
rename from src/main/kotlin/entity/pokemon/AwesomeName.kt
rename to src/main/kotlin/entities/pokemon/AwesomeName.kt
index fd35d64..9cda11d 100644
--- a/src/main/kotlin/entity/pokemon/AwesomeName.kt
+++ b/src/main/kotlin/entities/pokemon/AwesomeName.kt
@@ -1,21 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.utility.Language
+import entities.common.NamedApiResource
+import entities.utility.Language
 
 /**
  * @property awesomeName The localized "scientific" name for an API resource in a specific language.
  * @property language The language this "scientific" name is in.
  */
-class AwesomeName(
+data class AwesomeName(
     @JsonProperty("awesome_name")
     val awesomeName: String,
-
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "AwesomeName(awesomeName='$awesomeName', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/Characteristic.kt b/src/main/kotlin/entities/pokemon/Characteristic.kt
similarity index 69%
rename from src/main/kotlin/entity/pokemon/Characteristic.kt
rename to src/main/kotlin/entities/pokemon/Characteristic.kt
index ce0714f..51b6f15 100644
--- a/src/main/kotlin/entity/pokemon/Characteristic.kt
+++ b/src/main/kotlin/entities/pokemon/Characteristic.kt
@@ -1,38 +1,31 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.NamedApiResource
 
-class Characteristic(
+data class Characteristic(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The remainder of the highest stat/IV divided by 5.
      */
     @JsonProperty("gene_modulo")
     val geneModulo: Number,
-
     /**
      * The possible values of the highest stat that would result in a Pokémon recieving this characteristic when divided by 5.
      */
     @JsonProperty("possible_values")
     val possibleValues: List<Number>,
-
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * The stat which is affected by this characteristic.
      */
     @JsonProperty("highest_stat")
     val highestStat: NamedApiResource<Stat>
-) {
-    override fun toString(): String {
-        return "Characteristic(id=$id, geneModulo=$geneModulo, possibleValues=$possibleValues), descriptions=$descriptions), highestStat=$highestStat)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/EggGroup.kt b/src/main/kotlin/entities/pokemon/EggGroup.kt
similarity index 72%
rename from src/main/kotlin/entity/pokemon/EggGroup.kt
rename to src/main/kotlin/entities/pokemon/EggGroup.kt
index 62b8673..6a4c5bd 100644
--- a/src/main/kotlin/entity/pokemon/EggGroup.kt
+++ b/src/main/kotlin/entities/pokemon/EggGroup.kt
@@ -1,29 +1,27 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
-class EggGroup(
+data class EggGroup(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A list of all Pokémon species that are members of this egg group.
      * @see PokemonSpecies
@@ -31,8 +29,4 @@ class EggGroup(
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "EggGroup(id=$id, name='$name', names=$names, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/Gender.kt b/src/main/kotlin/entities/pokemon/Gender.kt
similarity index 72%
rename from src/main/kotlin/entity/pokemon/Gender.kt
rename to src/main/kotlin/entities/pokemon/Gender.kt
index 3ae36ea..8c0073a 100644
--- a/src/main/kotlin/entity/pokemon/Gender.kt
+++ b/src/main/kotlin/entities/pokemon/Gender.kt
@@ -1,28 +1,26 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.NamedApiResource
 
-class Gender(
+data class Gender(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * A list of Pokémon species that can be this gender and how likely it is that they will be.
      * @see PokemonSpeciesGender
      */
     @JsonProperty("pokemon_species_details")
     val pokemonSpeciesDetails: List<PokemonSpeciesGender>,
-
     /**
      * A list of Pokémon species that required this gender in order for a Pokémon to evolve into them.
      * @see PokemonSpecies
@@ -30,11 +28,4 @@ class Gender(
      */
     @JsonProperty("required_for_evolution")
     val requiredForEvolution: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "id= $id" +
-            "name = $name" +
-            "pokemonSpeciesDetails = $pokemonSpeciesDetails" +
-            "requiredForEvolution = $requiredForEvolution"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/Genus.kt b/src/main/kotlin/entities/pokemon/Genus.kt
similarity index 59%
rename from src/main/kotlin/entity/pokemon/Genus.kt
rename to src/main/kotlin/entities/pokemon/Genus.kt
index 1aba622..0a56513 100644
--- a/src/main/kotlin/entity/pokemon/Genus.kt
+++ b/src/main/kotlin/entities/pokemon/Genus.kt
@@ -1,22 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.utility.Language
+import entities.common.NamedApiResource
+import entities.utility.Language
 
 /**
  * @property genus The localized genus for the referenced Pokémon species
  * @property language The language this genus is in.
  */
-class Genus(
-
+data class Genus(
     @JsonProperty("genus")
     val genus: String,
-
     @JsonProperty("language")
     val language: NamedApiResource<Language>
-) {
-    override fun toString(): String {
-        return "Genus(genus='$genus', language=$language)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/GrowthRate.kt b/src/main/kotlin/entities/pokemon/GrowthRate.kt
similarity index 75%
rename from src/main/kotlin/entity/pokemon/GrowthRate.kt
rename to src/main/kotlin/entities/pokemon/GrowthRate.kt
index 1812b14..f4be0e4 100644
--- a/src/main/kotlin/entity/pokemon/GrowthRate.kt
+++ b/src/main/kotlin/entities/pokemon/GrowthRate.kt
@@ -1,49 +1,40 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Description
-import entity.common.NamedApiResource
-
-class GrowthRate(
+import entities.PokeApiObject
+import entities.common.Description
+import entities.common.NamedApiResource
 
+data class GrowthRate(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The formula used to calculate the rate at which the Pokémon species gains level.
      */
     @JsonProperty("formula")
     val formula: String,
-
     /**
      * The descriptions of this characteristic listed in different languages.
      */
     @JsonProperty("descriptions")
     val descriptions: List<Description>,
-
     /**
      * A list of levels and the amount of experienced needed to atain them based on this growth rate.
      */
     @JsonProperty("levels")
     val levels: List<GrowthRateExperienceLevel>,
-
     /**
      * A list of Pokémon species that gain levels at this growth rate.
      *  @see PokemonSpecies
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "GrowthRate(id=$id, name='$name', formula='$formula', descriptions=$descriptions, levels=$levels, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/GrowthRateExperienceLevel.kt b/src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt
similarity index 60%
rename from src/main/kotlin/entity/pokemon/GrowthRateExperienceLevel.kt
rename to src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt
index 4dadc77..ec44ca4 100644
--- a/src/main/kotlin/entity/pokemon/GrowthRateExperienceLevel.kt
+++ b/src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt
@@ -1,23 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-class GrowthRateExperienceLevel(
-
+data class GrowthRateExperienceLevel(
     /**
      * The level gained.
      */
     @JsonProperty("level")
     val level: Number,
-
     /**
      * The amount of experience required to reach the referenced level.
      */
     @JsonProperty("experience")
     val experience: Number
-) {
-
-    override fun toString(): String {
-        return "GrowthRateExperienceLevel(level=$level, experience=$experience)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/MoveBattleStylePreference.kt b/src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt
similarity index 63%
rename from src/main/kotlin/entity/pokemon/MoveBattleStylePreference.kt
rename to src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt
index cf1eec9..4f1a01a 100644
--- a/src/main/kotlin/entity/pokemon/MoveBattleStylePreference.kt
+++ b/src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt
@@ -1,22 +1,20 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.moves.MoveBattleStyle
+import entities.common.NamedApiResource
+import entities.moves.MoveBattleStyle
 
-class MoveBattleStylePreference(
+data class MoveBattleStylePreference(
     /**
      * Chance of using the move, in percent, if HP is under one half.
      */
     @JsonProperty("low_hp_preference")
     val lowHpPreference: Number,
-
     /**
      * Chance of using the move, in percent, if HP is over one half.
      */
     @JsonProperty("high_hp_preference")
     val highHpPreference: Number,
-
     /**
      * The move battle style.
      * @see MoveBattleStyle
@@ -24,8 +22,4 @@ class MoveBattleStylePreference(
      */
     @JsonProperty("move_battle_style")
     val moveBattleStyle: NamedApiResource<MoveBattleStyle>
-) {
-    override fun toString(): String {
-        return "MoveBattleStylePreference(lowHpPreference=$lowHpPreference, highHpPreference=$highHpPreference, moveBattleStyle=$moveBattleStyle)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/MoveStatAffect.kt b/src/main/kotlin/entities/pokemon/MoveStatAffect.kt
similarity index 61%
rename from src/main/kotlin/entity/pokemon/MoveStatAffect.kt
rename to src/main/kotlin/entities/pokemon/MoveStatAffect.kt
index 4d8d226..403e310 100644
--- a/src/main/kotlin/entity/pokemon/MoveStatAffect.kt
+++ b/src/main/kotlin/entities/pokemon/MoveStatAffect.kt
@@ -1,13 +1,13 @@
-package entity.pokemon
+package entities.pokemon
 
-import entity.common.NamedApiResource
-import entity.moves.Move
+import entities.common.NamedApiResource
+import entities.moves.Move
 
 /**
  * @property change The maximum amount of change to the referenced stat.
  * @property move The move causing the change.
  */
-class MoveStatAffect(
+data class MoveStatAffect(
     val change: Number,
     val move: NamedApiResource<Move>
 )
diff --git a/src/main/kotlin/entity/pokemon/MoveStatAffectSets.kt b/src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt
similarity index 66%
rename from src/main/kotlin/entity/pokemon/MoveStatAffectSets.kt
rename to src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt
index 63114da..ca236f9 100644
--- a/src/main/kotlin/entity/pokemon/MoveStatAffectSets.kt
+++ b/src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt
@@ -1,4 +1,4 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -6,16 +6,9 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @property increase A list of moves and how they change the referenced stat.
  * @property decrease A list of moves and how they change the referenced stat.
  */
-class MoveStatAffectSets(
-
+data class MoveStatAffectSets(
     @JsonProperty("increase")
     val increase: List<MoveStatAffect>,
-
     @JsonProperty("decrease")
     val decrease: List<MoveStatAffect>
-) {
-
-    override fun toString(): String {
-        return "MoveStatAffectSets(increase=$increase, decrease=$decrease)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/Nature.kt b/src/main/kotlin/entities/pokemon/Nature.kt
similarity index 79%
rename from src/main/kotlin/entity/pokemon/Nature.kt
rename to src/main/kotlin/entities/pokemon/Nature.kt
index 32ce3ed..6da9cd5 100644
--- a/src/main/kotlin/entity/pokemon/Nature.kt
+++ b/src/main/kotlin/entities/pokemon/Nature.kt
@@ -1,24 +1,22 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.berries.BerryFlavor
-import entity.common.Name
-import entity.common.NamedApiResource
-
-class Nature(
+import entities.PokeApiObject
+import entities.berries.BerryFlavor
+import entities.common.Name
+import entities.common.NamedApiResource
 
+data class Nature(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The stat decreased by 10% in Pokémon with this nature.
      * @see Stat
@@ -26,7 +24,6 @@ class Nature(
      */
     @JsonProperty("decreased_stat")
     val decreasedStat: NamedApiResource<Stat>?,
-
     /**
      * The stat increased by 10% in Pokémon with this nature.
      * @see Stat
@@ -34,7 +31,6 @@ class Nature(
      */
     @JsonProperty("increased_stat")
     val increasedStat: NamedApiResource<Stat>?,
-
     /**
      * The flavor hated by Pokémon with this nature.
      * @see BerryFlavor
@@ -42,7 +38,6 @@ class Nature(
      */
     @JsonProperty("hates_flavor")
     val hatesFlavor: NamedApiResource<BerryFlavor>?,
-
     /**
      * The flavor liked by Pokémon with this nature.
      * @see BerryFlavor
@@ -50,30 +45,22 @@ class Nature(
      */
     @JsonProperty("likes_flavor")
     val likesFlavor: NamedApiResource<BerryFlavor>?,
-
     /**
      * A list of Pokéathlon stats this nature effects and how much it effects them.
      * @see NatureStatChange
      */
     @JsonProperty("pokeathlon_stat_changes")
     val pokeathlonStatChanges: List<NatureStatChange>,
-
     /**
      * A list of battle styles and how likely a Pokémon with this nature is to use them in the Battle Palace or Battle Tent.
      * @see MoveBattleStylePreference
      */
     @JsonProperty("move_battle_style_preferences")
     val moveBattleStylePreferences: List<MoveBattleStylePreference>,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: List<Name>
-
-) {
-    override fun toString(): String {
-        return "Nature(id=$id, name='$name', decreasedStat=$decreasedStat, increasedStat=$increasedStat, hatesFlavor=$hatesFlavor, likesFlavor=$likesFlavor, pokeathlonStatChanges=$pokeathlonStatChanges, moveBattleStylePreferences=$moveBattleStylePreferences, names=$names)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffect.kt b/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt
similarity index 60%
rename from src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffect.kt
rename to src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt
index f1529f1..b3b33ba 100644
--- a/src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffect.kt
+++ b/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt
@@ -1,23 +1,18 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class NaturePokeathlonStatAffect(
+data class NaturePokeathlonStatAffect(
     /**
      *  The maximum amount of change to the referenced Pokéathlon stat.
      */
     @JsonProperty("max_change")
     val maxChange: Number,
-
     /**
      * The nature causing the change.
      * @see Nature
      */
     @JsonProperty("nature")
     val nature: NamedApiResource<Nature>
-) {
-    override fun toString(): String {
-        return "NaturePokeathlonStatAffect(maxChange=$maxChange, nature=$nature)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffectSets.kt b/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt
similarity index 66%
rename from src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffectSets.kt
rename to src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt
index 552eec9..4e80c6c 100644
--- a/src/main/kotlin/entity/pokemon/NaturePokeathlonStatAffectSets.kt
+++ b/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt
@@ -1,21 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-class NaturePokeathlonStatAffectSets(
+data class NaturePokeathlonStatAffectSets(
     /**
      * A list of natures and how they change the referenced Pokéathlon stat.
      */
     @JsonProperty("increase")
     val increase: List<NaturePokeathlonStatAffect>,
-
     /**
      * A list of natures and how they change the referenced Pokéathlon stat.
      */
     @JsonProperty("decrease")
     val decrease: List<NaturePokeathlonStatAffect>
-) {
-    override fun toString(): String {
-        return "NaturePokeathlonStatAffectSets(increase=$increase, decrease=$decrease)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/NatureStatAffectSets.kt b/src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt
similarity index 63%
rename from src/main/kotlin/entity/pokemon/NatureStatAffectSets.kt
rename to src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt
index ee00226..3bb60a7 100644
--- a/src/main/kotlin/entity/pokemon/NatureStatAffectSets.kt
+++ b/src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt
@@ -1,21 +1,15 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @property increase A list of natures and how they change the referenced stat.
  * @property decrease A list of natures and how they change the referenced stat.
  */
-class NatureStatAffectSets(
-
+data class NatureStatAffectSets(
     @JsonProperty("increase")
     val increase: List<NamedApiResource<Nature>>,
-
     @JsonProperty("decrease")
     val decrease: List<NamedApiResource<Nature>>
-) {
-    override fun toString(): String {
-        return "NatureStatAffectSets(increase=$increase, decrease=$decrease)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/NatureStatChange.kt b/src/main/kotlin/entities/pokemon/NatureStatChange.kt
similarity index 61%
rename from src/main/kotlin/entity/pokemon/NatureStatChange.kt
rename to src/main/kotlin/entities/pokemon/NatureStatChange.kt
index 79ff55d..3071077 100644
--- a/src/main/kotlin/entity/pokemon/NatureStatChange.kt
+++ b/src/main/kotlin/entities/pokemon/NatureStatChange.kt
@@ -1,15 +1,14 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class NatureStatChange(
+data class NatureStatChange(
     /**
      * The amount of change.
      */
     @JsonProperty("max_change")
     val maxChange: Number,
-
     /**
      * The stat being affected.
      * @see PokeathlonStat
@@ -17,8 +16,4 @@ class NatureStatChange(
      */
     @JsonProperty("pokeathlon_stat")
     val pokeathlonStat: NamedApiResource<PokeathlonStat>
-) {
-    override fun toString(): String {
-        return "NatureStatChange(maxChange=$maxChange, pokeathlonStat=$pokeathlonStat)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PalParkEncounterArea.kt b/src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt
similarity index 70%
rename from src/main/kotlin/entity/pokemon/PalParkEncounterArea.kt
rename to src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt
index d701ccc..0cc095e 100644
--- a/src/main/kotlin/entity/pokemon/PalParkEncounterArea.kt
+++ b/src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt
@@ -1,24 +1,18 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @property baseScore The base score given to the player when the referenced Pokémon is caught during a pal park run.
  * @property rate The base rate for encountering the referenced Pokémon in this pal park area.
  * @property area The pal park area where this encounter happens.
  */
-class PalParkEncounterArea(
+data class PalParkEncounterArea(
     @JsonProperty("base_score")
     val baseScore: Number,
-
     @JsonProperty("rate")
     val rate: Number,
-
     @JsonProperty("area")
     val area: NamedApiResource<PalParkEncounterArea>
-) {
-    override fun toString(): String {
-        return "PalParkEncounterArea(baseScore=$baseScore, rate=$rate, area=$area)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokeathlonStat.kt b/src/main/kotlin/entities/pokemon/PokeathlonStat.kt
similarity index 72%
rename from src/main/kotlin/entity/pokemon/PokeathlonStat.kt
rename to src/main/kotlin/entities/pokemon/PokeathlonStat.kt
index 2212339..a51fedd 100644
--- a/src/main/kotlin/entity/pokemon/PokeathlonStat.kt
+++ b/src/main/kotlin/entities/pokemon/PokeathlonStat.kt
@@ -1,35 +1,28 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-
-class PokeathlonStat(
+import entities.PokeApiObject
+import entities.common.Name
 
+data class PokeathlonStat(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The name of this resource listed in different languages.
      */
     @JsonProperty("names")
     val names: List<Name>,
-
     /**
      * A detail of natures which affect this Pokéathlon stat positively or negatively.
      */
     @JsonProperty("affecting_natures")
     val affectingNatures: NaturePokeathlonStatAffectSets
-) {
-    override fun toString(): String {
-        return "PokeathlonStat(id=$id, name='$name', names=$names, affectingNatures=$affectingNatures)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/Pokemon.kt b/src/main/kotlin/entities/pokemon/Pokemon.kt
similarity index 82%
rename from src/main/kotlin/entity/pokemon/Pokemon.kt
rename to src/main/kotlin/entities/pokemon/Pokemon.kt
index 89eb513..8cef4ba 100644
--- a/src/main/kotlin/entity/pokemon/Pokemon.kt
+++ b/src/main/kotlin/entities/pokemon/Pokemon.kt
@@ -1,125 +1,102 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.common.VersionGameIndex
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.common.VersionGameIndex
 
-class Pokemon(
+data class Pokemon(
     /**
      * The identifier for this resource.
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * The base experience gained for defeating this Pokémon.
      */
     @JsonProperty("base_experience")
     val baseExperience: Number,
-
     /**
      * The height of this Pokémon in decimetres.
      */
     @JsonProperty("height")
     val height: Number,
-
     /**
      * Set for exactly one Pokémon used as the default for each species.
      */
     @JsonProperty("is_default")
     val isDefault: Boolean,
-
     /**
      * Order for sorting. Almost national order, except families are grouped together.
      */
     @JsonProperty("order")
     val order: Number,
-
     /**
      * The weight of this Pokémon in hectograms.
      */
     @JsonProperty("weight")
     val weight: Number,
-
     /**
      * A list of abilities this Pokémon could potentially have.
      */
     @JsonProperty("abilities")
     val abilities: List<PokemonAbility>,
-
     /**
      * A list of forms this Pokémon can take on.
      *  @see PokemonForm
      */
     @JsonProperty("forms")
     val forms: List<NamedApiResource<PokemonForm>>,
-
     /**
      * A list of game indices relevent to Pokémon item by generation.
      */
     @JsonProperty("game_indices")
     val gameIndices: List<VersionGameIndex>,
-
     /**
      * A list of items this Pokémon may be holding when encountered.
      */
     @JsonProperty("held_items")
     val heldItems: List<PokemonHeldItem>,
-
     /**
      * A link to a list of location areas, as well as encounter details pertaining to specific versions.
      */
     @JsonProperty("location_area_encounters")
     val locationAreaEncounters: String,
-
     /**
      * A list of moves along with learn methods and level details pertaining to specific version groups.
      */
     @JsonProperty("moves")
     val moves: List<PokemonMove>,
-
     /**
      * A list of details showing types this pokémon had in previous generations
      */
     @JsonProperty("past_types")
     val pastTypes: List<PokemonTypePast>,
-
     /**
      * A set of sprites used to depict this Pokémon in the game. A visual representation of the various sprites can be found at PokeAPI/sprites
      */
     @JsonProperty("sprites")
     val sprites: PokemonSprites,
-
     /**
      * The species this Pokémon belongs to.
      * @see PokemonSpecies
      */
     @JsonProperty("species")
     val species: NamedApiResource<PokemonSpecies>,
-
     /**
      * A list of base stat values for this Pokémon.
      */
 
     @JsonProperty("stats")
     val stats: List<PokemonStat>,
-
     /**
      * A list of details showing types this Pokémon has.
      */
     @JsonProperty("types")
     val types: List<PokemonType>
-) {
-    override fun toString(): String = """
-        Pokemon(id=$id, name='$name', baseExperience=$baseExperience, height=$height, isDefault=$isDefault, order=$order,
-            weight=$weight, abilities=$abilities, forms=$forms, gameIndices=$gameIndices, heldItems=$heldItems,
-            locationAreaEncounters='$locationAreaEncounters', moves=$moves, pastTypes=$pastTypes, sprites=$sprites,
-            species=$species, stats=$stats, types=$types)
-            """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonAbility.kt b/src/main/kotlin/entities/pokemon/PokemonAbility.kt
similarity index 83%
rename from src/main/kotlin/entity/pokemon/PokemonAbility.kt
rename to src/main/kotlin/entities/pokemon/PokemonAbility.kt
index 272c51a..0c4ee69 100644
--- a/src/main/kotlin/entity/pokemon/PokemonAbility.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonAbility.kt
@@ -1,22 +1,20 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class PokemonAbility(
+data class PokemonAbility(
     /**
      *
      * Whether or not this is a hidden ability.
      */
     @JsonProperty("is_hidden")
     val isHidden: Boolean,
-
     /**
      * The slot this ability occupies in this Pokémon species.
      */
     @JsonProperty("slot")
     val slot: Int,
-
     /**
      * The ability the Pokémon may have.
      * @see Ability
diff --git a/src/main/kotlin/entity/pokemon/PokemonColor.kt b/src/main/kotlin/entities/pokemon/PokemonColor.kt
similarity index 70%
rename from src/main/kotlin/entity/pokemon/PokemonColor.kt
rename to src/main/kotlin/entities/pokemon/PokemonColor.kt
index 69cb641..9e84514 100644
--- a/src/main/kotlin/entity/pokemon/PokemonColor.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonColor.kt
@@ -1,8 +1,9 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * A class representing the details of a Pokémon color.
@@ -12,21 +13,13 @@ import entity.common.NamedApiResource
  * @property names The name of this resource listed in different languages.
  * @property pokemonSpecies A list of the Pokémon species that have this color.
  */
-class PokemonColor(
-
+data class PokemonColor(
     @JsonProperty("id")
     val id: Int,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "PokemonColor(id=$id, name='$name', names=$names, pokemonSpecies=$pokemonSpecies"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonEncounter.kt b/src/main/kotlin/entities/pokemon/PokemonEncounter.kt
similarity index 60%
rename from src/main/kotlin/entity/pokemon/PokemonEncounter.kt
rename to src/main/kotlin/entities/pokemon/PokemonEncounter.kt
index a03fd04..9d08427 100644
--- a/src/main/kotlin/entity/pokemon/PokemonEncounter.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonEncounter.kt
@@ -1,9 +1,9 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.common.VersionEncounterDetail
-import entity.locations.LocationArea
+import entities.common.NamedApiResource
+import entities.common.VersionEncounterDetail
+import entities.locations.LocationArea
 
 /**
  * A class representing the encounter details of a Pokémon.
@@ -11,15 +11,9 @@ import entity.locations.LocationArea
  * @property locationArea The location area the referenced Pokémon can be encountered in.
  * @property versionDetails A list of versions and encounters with the referenced Pokémon that might happen.
  */
-class PokemonEncounter(
-
+data class PokemonEncounter(
     @JsonProperty("location_area")
     val locationArea: NamedApiResource<LocationArea>,
-
     @JsonProperty("version_details")
     val versionDetails: Array<VersionEncounterDetail>
-) {
-    override fun toString(): String {
-        return "PokemonEncounter(locationArea=$locationArea, versionDetails=${versionDetails.contentToString()})"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonForm.kt b/src/main/kotlin/entities/pokemon/PokemonForm.kt
similarity index 80%
rename from src/main/kotlin/entity/pokemon/PokemonForm.kt
rename to src/main/kotlin/entities/pokemon/PokemonForm.kt
index 05ae900..f843c12 100644
--- a/src/main/kotlin/entity/pokemon/PokemonForm.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonForm.kt
@@ -1,9 +1,10 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
 
 /**
  * A class representing the details of a Pokémon form.
@@ -23,52 +24,33 @@ import entity.games.VersionGroup
  * @property names The form specific full name of this Pokémon form, or empty if the form does not have a specific name.
  * @property formNames The form specific form name of this Pokémon form, or empty if the form does not have a specific name.
  */
-class PokemonForm(
+data class PokemonForm(
     @JsonProperty("id")
     val id: Int,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("order")
     val order: Int,
-
     @JsonProperty("form_order")
     val formOrder: Int,
-
     @JsonProperty("is_default")
     val isDefault: Boolean,
-
     @JsonProperty("is_battle_only")
     val isBattleOnly: Boolean,
-
     @JsonProperty("is_mega")
     val isMega: Boolean,
-
     @JsonProperty("form_name")
     val formName: String,
-
     @JsonProperty("pokemon")
     val pokemon: NamedApiResource<Pokemon>,
-
     @JsonProperty("types")
     val types: List<PokemonFormType>,
-
     @JsonProperty("sprites")
     val sprites: PokemonFormSprites,
-
     @JsonProperty("version_group")
     val versionGroup: NamedApiResource<VersionGroup>,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("form_names")
     val formNames: List<Name>
-
-) {
-    override fun toString(): String {
-        return "PokemonForm(id=$id, name='$name', order=$order, formOrder=$formOrder, isDefault=$isDefault, isBattleOnly=$isBattleOnly, isMega=$isMega, " +
-            "formName='$formName', pokemon=$pokemon, types=$types, sprites=$sprites, versionGroup=$versionGroup, names=$name, formNames=$formName"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonFormSprites.kt b/src/main/kotlin/entities/pokemon/PokemonFormSprites.kt
similarity index 59%
rename from src/main/kotlin/entity/pokemon/PokemonFormSprites.kt
rename to src/main/kotlin/entities/pokemon/PokemonFormSprites.kt
index 047ffa3..4b712d5 100644
--- a/src/main/kotlin/entity/pokemon/PokemonFormSprites.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonFormSprites.kt
@@ -1,40 +1,22 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
 data class PokemonFormSprites(
     @JsonProperty("front_default")
     val frontDefault: String?,
-
     @JsonProperty("front_shiny")
     val frontShiny: String?,
-
     @JsonProperty("back_default")
     val backDefault: String?,
-
     @JsonProperty("back_shiny")
     val backShiny: String?,
-
     @JsonProperty("back_female")
     val backFemale: String?,
-
     @JsonProperty("back_shiny_female")
     val backShinyFemale: String?,
-
     @JsonProperty("front_female")
     val frontFemale: String?,
-
     @JsonProperty("front_shiny_female")
     val frontShinyFemale: String?
-) {
-    override fun toString(): String {
-        return "frontDefault=$frontDefault," +
-            "frontShiny=$frontShiny" +
-            "backDefault=$backDefault" +
-            "backShiny=$backShiny" +
-            "backFemale=$backFemale" +
-            "backShinyFemale=$backShinyFemale" +
-            "frontFemale=$frontFemale" +
-            "frontShinyFemale=$frontShinyFemale"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonFormType.kt b/src/main/kotlin/entities/pokemon/PokemonFormType.kt
similarity index 63%
rename from src/main/kotlin/entity/pokemon/PokemonFormType.kt
rename to src/main/kotlin/entities/pokemon/PokemonFormType.kt
index 75b9d35..f1a1dbd 100644
--- a/src/main/kotlin/entity/pokemon/PokemonFormType.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonFormType.kt
@@ -1,23 +1,18 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class PokemonFormType(
+data class PokemonFormType(
     /**
      * The order the Pokémon's types are listed in.
      */
     @JsonProperty("slot")
     val slot: Number,
-
     /**
      * The type the referenced Form has.
      * @see Type
      */
     @JsonProperty("type")
     val type: NamedApiResource<Type>
-) {
-    override fun toString(): String {
-        return "slot=$slot, type=$type"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonHabitat.kt b/src/main/kotlin/entities/pokemon/PokemonHabitat.kt
similarity index 53%
rename from src/main/kotlin/entity/pokemon/PokemonHabitat.kt
rename to src/main/kotlin/entities/pokemon/PokemonHabitat.kt
index fbcd0ec..5dcf721 100644
--- a/src/main/kotlin/entity/pokemon/PokemonHabitat.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonHabitat.kt
@@ -1,24 +1,17 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
-
-class PokemonHabitat(
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
+data class PokemonHabitat(
     @JsonProperty("id")
     val id: Number,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "PokemonHabitat(id=$id, name='$name', names=$names, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonHeldItem.kt b/src/main/kotlin/entities/pokemon/PokemonHeldItem.kt
similarity index 67%
rename from src/main/kotlin/entity/pokemon/PokemonHeldItem.kt
rename to src/main/kotlin/entities/pokemon/PokemonHeldItem.kt
index 9932cae..4e3cce2 100644
--- a/src/main/kotlin/entity/pokemon/PokemonHeldItem.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonHeldItem.kt
@@ -1,14 +1,13 @@
-package entity.pokemon
+package entities.pokemon
 
-import entity.common.NamedApiResource
-import entity.items.Item
+import entities.common.NamedApiResource
+import entities.items.Item
 
-class PokemonHeldItem(
+data class PokemonHeldItem(
     /**
      * The item the referenced Pokémon holds.
      */
     val item: NamedApiResource<Item>,
-
     /**
      * The details for the version that this item is held in by the Pokémon.
      */
diff --git a/src/main/kotlin/entity/pokemon/PokemonHeldItemVersion.kt b/src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt
similarity index 58%
rename from src/main/kotlin/entity/pokemon/PokemonHeldItemVersion.kt
rename to src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt
index 95cb7e9..46a8c45 100644
--- a/src/main/kotlin/entity/pokemon/PokemonHeldItemVersion.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt
@@ -1,14 +1,13 @@
-package entity.pokemon
+package entities.pokemon
 
-import entity.common.NamedApiResource
-import entity.games.Version
+import entities.common.NamedApiResource
+import entities.games.Version
 
-class PokemonHeldItemVersion(
+data class PokemonHeldItemVersion(
     /**
      * The version in which the item is held.
      */
     val version: NamedApiResource<Version>,
-
     /**
      * How often the item is held.
      */
diff --git a/src/main/kotlin/entities/pokemon/PokemonLocationArea.kt b/src/main/kotlin/entities/pokemon/PokemonLocationArea.kt
new file mode 100644
index 0000000..372f053
--- /dev/null
+++ b/src/main/kotlin/entities/pokemon/PokemonLocationArea.kt
@@ -0,0 +1,14 @@
+package entities.pokemon
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import entities.PokeApiObject
+import entities.common.NamedApiResource
+import entities.common.VersionEncounterDetail
+import entities.locations.LocationArea
+
+data class PokemonLocationArea(
+    @JsonProperty("location_area")
+    val locationArea: NamedApiResource<LocationArea>,
+    @JsonProperty("version_details")
+    val versionDetails: List<VersionEncounterDetail>
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonMove.kt b/src/main/kotlin/entities/pokemon/PokemonMove.kt
similarity index 71%
rename from src/main/kotlin/entity/pokemon/PokemonMove.kt
rename to src/main/kotlin/entities/pokemon/PokemonMove.kt
index 83e3d69..6cba9e8 100644
--- a/src/main/kotlin/entity/pokemon/PokemonMove.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonMove.kt
@@ -1,17 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.moves.Move
+import entities.common.NamedApiResource
+import entities.moves.Move
 
-class PokemonMove(
+data class PokemonMove(
     /**
      * The move the Pokémon can learn.
      * @see Move
      */
     @JsonProperty("move")
     val move: NamedApiResource<Move>,
-
     @JsonProperty("version_group_details")
     val versionGroupDetails: Array<PokemonMoveVersion>
 )
diff --git a/src/main/kotlin/entity/pokemon/PokemonMoveVersion.kt b/src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt
similarity index 77%
rename from src/main/kotlin/entity/pokemon/PokemonMoveVersion.kt
rename to src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt
index 7eab64f..183c79a 100644
--- a/src/main/kotlin/entity/pokemon/PokemonMoveVersion.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt
@@ -1,23 +1,21 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.VersionGroup
-import entity.moves.MoveLearnMethod
+import entities.common.NamedApiResource
+import entities.games.VersionGroup
+import entities.moves.MoveLearnMethod
 
-class PokemonMoveVersion(
+data class PokemonMoveVersion(
     /**
      * The method by which the move is learned.
      * @see MoveLearnMethod
      */
     @JsonProperty("move_learn_method") val moveLearnMethod: NamedApiResource<MoveLearnMethod>,
-
     /**
      * The version group in which the move is learned.
      * @see VersionGroup
      */
     @JsonProperty("version_group") val versionGroup: NamedApiResource<VersionGroup>,
-
     /**
      * The minimum level to learn the move. Specified for each different move learn method.
      */
diff --git a/src/main/kotlin/entity/pokemon/PokemonShape.kt b/src/main/kotlin/entities/pokemon/PokemonShape.kt
similarity index 75%
rename from src/main/kotlin/entity/pokemon/PokemonShape.kt
rename to src/main/kotlin/entities/pokemon/PokemonShape.kt
index 43dd1ad..410a7b5 100644
--- a/src/main/kotlin/entity/pokemon/PokemonShape.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonShape.kt
@@ -1,8 +1,9 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
-import entity.common.NamedApiResource
+import entities.PokeApiObject
+import entities.common.Name
+import entities.common.NamedApiResource
 
 /**
  * Represents a shape that a Pokémon species can take on.
@@ -14,23 +15,14 @@ import entity.common.NamedApiResource
  * @property pokemonSpecies A list of the Pokémon species that have this shape.
  */
 data class PokemonShape(
-
     @JsonProperty("id")
     val id: Number,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("awesome_names")
     val awesomeNames: List<AwesomeName>,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("pokemon_species")
     val pokemonSpecies: List<NamedApiResource<PokemonSpecies>>
-) {
-    override fun toString(): String {
-        return "PokemonShape(id=$id, name='$name', awesomeNames=$awesomeNames, names=$names, pokemonSpecies=$pokemonSpecies)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonSpecies.kt b/src/main/kotlin/entities/pokemon/PokemonSpecies.kt
similarity index 65%
rename from src/main/kotlin/entity/pokemon/PokemonSpecies.kt
rename to src/main/kotlin/entities/pokemon/PokemonSpecies.kt
index f3eb3cd..e7153d4 100644
--- a/src/main/kotlin/entity/pokemon/PokemonSpecies.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonSpecies.kt
@@ -1,105 +1,70 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.APIResource
-import entity.common.Description
-import entity.common.FlavorText
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.games.Generation
+import entities.PokeApiObject
+import entities.common.APIResource
+import entities.common.Description
+import entities.common.FlavorText
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.games.Generation
 
 /**
  * Represents a Pokémon species.
  */
-class PokemonSpecies(
-
+data class PokemonSpecies(
     @JsonProperty("id")
     val id: Number,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("order")
     val order: Number,
-
     @JsonProperty("gender_rate")
     val genderRate: Number,
-
     @JsonProperty("capture_rate")
     val captureRate: Number,
-
     @JsonProperty("base_happiness")
     val baseHappiness: Number,
-
     @JsonProperty("is_baby")
     val isBaby: Boolean,
-
     @JsonProperty("is_legendary")
     val isLegendary: Boolean,
-
     @JsonProperty("is_mythical")
     val isMythical: Boolean,
-
     @JsonProperty("hatch_counter")
     val hatchCounter: Number,
-
     @JsonProperty("has_gender_differences")
     val hasGenderDifferences: Boolean,
-
     @JsonProperty("forms_switchable")
     val formsSwitchable: Boolean,
-
     @JsonProperty("growth_rate")
     val growthRate: NamedApiResource<GrowthRate>,
-
     @JsonProperty("pokedex_numbers")
     val pokedexNumbers: List<PokemonSpeciesDexEntry>,
-
     @JsonProperty("egg_groups")
     val eggGroups: List<NamedApiResource<EggGroup>>,
-
     @JsonProperty("color")
     val color: NamedApiResource<PokemonColor>,
-
     @JsonProperty("shape")
     val shape: NamedApiResource<PokemonShape>,
-
     @JsonProperty("evolves_from_species")
     val evolvesFromSpecies: NamedApiResource<PokemonSpecies>?,
-
     @JsonProperty("evolution_chain")
     val evolutionChain: APIResource,
-
     @JsonProperty("habitat")
     val habitat: NamedApiResource<PokemonHabitat>?,
-
     @JsonProperty("generation")
     val generation: NamedApiResource<Generation>,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("pal_park_encounters")
     val palParkEncounters: List<PalParkEncounterArea>,
-
     @JsonProperty("flavor_text_entries")
     val flavorTextEntries: List<FlavorText>,
-
     @JsonProperty("form_descriptions")
     val formDescriptions: List<Description>,
-
     @JsonProperty("genera")
     val genera: List<Genus>,
-
     @JsonProperty("varieties")
     val varieties: List<PokemonSpeciesVariety>
-) {
-    override fun toString() =
-        """PokemonSpecies(id=$id, name='$name', order=$order, genderRate=$genderRate, captureRate=$captureRate, baseHappiness=$baseHappiness,
-            isBaby=$isBaby, isLegendary=$isLegendary, isMythical=$isMythical, hatchCounter=$hatchCounter, hasGenderDifferences=$hasGenderDifferences,
-            formsSwitchable=$formsSwitchable, growthRate=$growthRate, pokedexNumbers=$pokedexNumbers, eggGroups=$eggGroups, color=$color,
-            shape=$shape, evolvesFromSpecies=$evolvesFromSpecies, evolutionChain=$evolutionChain, habitat=$habitat, generation=$generation,
-            names=$names, palParkEncounters=$palParkEncounters, flavorTextEntries=$flavorTextEntries, formDescriptions=$formDescriptions,
-            genera=$genera, varieties=$varieties)
-            """
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/PokemonSpeciesDexEntry.kt b/src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt
similarity index 57%
rename from src/main/kotlin/entity/pokemon/PokemonSpeciesDexEntry.kt
rename to src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt
index 4f53c79..81f4800 100644
--- a/src/main/kotlin/entity/pokemon/PokemonSpeciesDexEntry.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt
@@ -1,21 +1,16 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.games.Pokedex
+import entities.common.NamedApiResource
+import entities.games.Pokedex
 
 /**
  * @property entryNumber The index number within the Pokédex.
  * @property pokedex The Pokédex the referenced Pokémon species can be found in.
  */
-class PokemonSpeciesDexEntry(
+data class PokemonSpeciesDexEntry(
     @JsonProperty("entry_number")
     val entryNumber: Number,
-
     @JsonProperty("pokedex")
     val pokedex: NamedApiResource<Pokedex>
-) {
-    override fun toString(): String {
-        return "PokemonSpeciesDexEntry(entryNumber=$entryNumber, pokedex=$pokedex)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonSpeciesGender.kt b/src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt
similarity index 67%
rename from src/main/kotlin/entity/pokemon/PokemonSpeciesGender.kt
rename to src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt
index abdca07..4fb1c34 100644
--- a/src/main/kotlin/entity/pokemon/PokemonSpeciesGender.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt
@@ -1,15 +1,14 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class PokemonSpeciesGender(
+data class PokemonSpeciesGender(
     /**
      * The chance of this Pokémon being female, in eighths; or -1 for genderless.
      */
     @JsonProperty("rate")
     val rate: Number,
-
     /**
      * A Pokémon species that can be the referenced gender.
      * @see PokemonSpecies
@@ -17,8 +16,4 @@ class PokemonSpeciesGender(
      */
     @JsonProperty("pokemon_species")
     val pokemonSpecies: NamedApiResource<PokemonSpecies>
-) {
-    override fun toString(): String {
-        return "rate = $rate pokemonSpecies = $pokemonSpecies"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonSpeciesVariety.kt b/src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt
similarity index 58%
rename from src/main/kotlin/entity/pokemon/PokemonSpeciesVariety.kt
rename to src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt
index f84e4b6..5c926f2 100644
--- a/src/main/kotlin/entity/pokemon/PokemonSpeciesVariety.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt
@@ -1,20 +1,15 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
 /**
  * @property isDefault Whether this variety is the default variety.
  * @property pokemon The Pokémon variety.
  */
-class PokemonSpeciesVariety(
+data class PokemonSpeciesVariety(
     @JsonProperty("is_default")
     val isDefault: Boolean,
-
     @JsonProperty("pokemon")
     val pokemon: NamedApiResource<Pokemon>
-) {
-    override fun toString(): String {
-        return "PokemonSpeciesVariety(isDefault=$isDefault, pokemon=$pokemon)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonSprites.kt b/src/main/kotlin/entities/pokemon/PokemonSprites.kt
similarity index 72%
rename from src/main/kotlin/entity/pokemon/PokemonSprites.kt
rename to src/main/kotlin/entities/pokemon/PokemonSprites.kt
index 00b1a81..c5bfdde 100644
--- a/src/main/kotlin/entity/pokemon/PokemonSprites.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonSprites.kt
@@ -1,4 +1,4 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
@@ -14,66 +14,39 @@ import com.fasterxml.jackson.annotation.JsonProperty
  * @property backFemale The female depiction of this Pokémon from the back in battle.
  * @property backShinyFemale The shiny female depiction of this Pokémon from the back in battle.
  */
-class PokemonSprites(
+data class PokemonSprites(
     @JsonProperty("front_default")
     val frontDefault: String?,
-
     @JsonProperty("front_shiny")
     val frontShiny: String?,
-
     @JsonProperty("front_female")
     val frontFemale: String?,
-
     @JsonProperty("front_shiny_female")
     val frontShinyFemale: String?,
-
     @JsonProperty("back_default")
     val backDefault: String?,
-
     @JsonProperty("back_shiny")
     val backShiny: String?,
-
     @JsonProperty("back_female")
     val backFemale: String?,
-
     @JsonProperty("back_shiny_female")
     val backShinyFemale: String?,
-
     @JsonProperty("back_gray")
     val backGray: String?,
-
     @JsonProperty("front_gray")
     val frontGray: String?,
-
     @JsonProperty("back_transparent")
     val backTransparent: String?,
-
     @JsonProperty("front_transparent")
     val frontTransparent: String?,
-
     @JsonProperty("back_shiny_transparent")
     val backShinyTransparent: String?,
-
     @JsonProperty("front_shiny_transparent")
     val frontShinyTransparent: String?,
-
     @JsonProperty("animated")
     val animated: PokemonSprites?,
-
     @JsonProperty("versions")
     val versions: Map<String, Map<String, PokemonSprites>>?,
-
     @JsonProperty("other")
     val other: Map<String, PokemonSprites>?
-) {
-    // constructor() : this(null, null, null, null, null, null, null, null, null, null)
-
-    override fun toString(): String {
-        return "PokemonSprites(frontDefault=$frontDefault, frontShiny=$frontShiny, frontFemale=$frontFemale, " +
-            "frontShinyFemale=$frontShinyFemale, backDefault=$backDefault, backShiny=$backShiny, " +
-            "backFemale=$backFemale, backShinyFemale=$backShinyFemale, backGray=$backGray, " +
-            "frontGray=$frontGray, backTransparent=$backTransparent, frontTransparent=$frontTransparent, " +
-            "backShinyTransparent=$backShinyTransparent, frontShinyTransparent=$frontShinyTransparent, " +
-            "versions=$versions, other=$other)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonStat.kt b/src/main/kotlin/entities/pokemon/PokemonStat.kt
similarity index 82%
rename from src/main/kotlin/entity/pokemon/PokemonStat.kt
rename to src/main/kotlin/entities/pokemon/PokemonStat.kt
index 06b2b03..5dd1808 100644
--- a/src/main/kotlin/entity/pokemon/PokemonStat.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonStat.kt
@@ -1,22 +1,20 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class PokemonStat(
+data class PokemonStat(
     /**
      * The stat the Pokémon has.
      * @see Stat
      */
     @JsonProperty("stat")
     val stat: NamedApiResource<Stat>,
-
     /**
      * The effort points (EV) the Pokémon has in the stat.
      */
     @JsonProperty("effort")
     val effort: Number,
-
     /**
      * The base value of the stat.
      */
diff --git a/src/main/kotlin/entity/pokemon/PokemonType.kt b/src/main/kotlin/entities/pokemon/PokemonType.kt
similarity index 77%
rename from src/main/kotlin/entity/pokemon/PokemonType.kt
rename to src/main/kotlin/entities/pokemon/PokemonType.kt
index ffb8d84..6ade101 100644
--- a/src/main/kotlin/entity/pokemon/PokemonType.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonType.kt
@@ -1,15 +1,14 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class PokemonType(
+data class PokemonType(
     /**
      * The order the Pokémon's types are listed in.
      */
     @JsonProperty("slot")
     val slot: Number,
-
     /**
      * The type the referenced Pokémon has.
      * @see Type
diff --git a/src/main/kotlin/entity/pokemon/PokemonTypePast.kt b/src/main/kotlin/entities/pokemon/PokemonTypePast.kt
similarity index 70%
rename from src/main/kotlin/entity/pokemon/PokemonTypePast.kt
rename to src/main/kotlin/entities/pokemon/PokemonTypePast.kt
index 8a81fb4..74137e4 100644
--- a/src/main/kotlin/entity/pokemon/PokemonTypePast.kt
+++ b/src/main/kotlin/entities/pokemon/PokemonTypePast.kt
@@ -1,15 +1,14 @@
-package entity.pokemon
+package entities.pokemon
 
-import entity.common.NamedApiResource
-import entity.games.Generation
+import entities.common.NamedApiResource
+import entities.games.Generation
 
-class PokemonTypePast(
+data class PokemonTypePast(
     /**
      * The last generation in which the referenced pokémon had the listed types.
      * @see Generation
      */
     val generation: NamedApiResource<Generation>,
-
     /**
      * The types the referenced pokémon had in the listed generation.
      */
diff --git a/src/main/kotlin/entity/pokemon/Stat.kt b/src/main/kotlin/entities/pokemon/Stat.kt
similarity index 76%
rename from src/main/kotlin/entity/pokemon/Stat.kt
rename to src/main/kotlin/entities/pokemon/Stat.kt
index b215002..61ecc9b 100644
--- a/src/main/kotlin/entity/pokemon/Stat.kt
+++ b/src/main/kotlin/entities/pokemon/Stat.kt
@@ -1,10 +1,11 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.APIResource
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.moves.MoveDamageClass
+import entities.PokeApiObject
+import entities.common.APIResource
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.moves.MoveDamageClass
 
 /**
  * A stat refers to an aspect of a Pokémon that is used to represent its strengths and weaknesses. Each Pokémon has
@@ -21,37 +22,22 @@ import entity.moves.MoveDamageClass
  * @property names The name of this resource listed in different languages.
  */
 data class Stat(
-
     @JsonProperty("id")
     val id: Int,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("game_index")
     val gameIndex: String,
-
     @JsonProperty("is_battle_only")
     val isBattleOnly: Boolean,
-
     @JsonProperty("affecting_moves")
     val affectingMoves: MoveStatAffectSets,
-
     @JsonProperty("affecting_natures")
     val affectingNatures: NatureStatAffectSets,
-
     @JsonProperty("characteristics")
     val characteristics: List<APIResource>,
-
     @JsonProperty("move_damage_class")
     val moveDamageClass: NamedApiResource<MoveDamageClass>?,
-
     @JsonProperty("names")
     val names: List<Name>
-) {
-    override fun toString(): String {
-        return "Stat(id=$id, name='$name', gameIndex='$gameIndex', isBattleOnly=$isBattleOnly, affectingMoves=$affectingMoves, " +
-            "affectingNatures=$affectingNatures, characteristics=$characteristics, moveDamageClass=$moveDamageClass, " +
-            "names=$names"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entity/pokemon/Type.kt b/src/main/kotlin/entities/pokemon/Type.kt
similarity index 59%
rename from src/main/kotlin/entity/pokemon/Type.kt
rename to src/main/kotlin/entities/pokemon/Type.kt
index 311ba64..37c3a79 100644
--- a/src/main/kotlin/entity/pokemon/Type.kt
+++ b/src/main/kotlin/entities/pokemon/Type.kt
@@ -1,46 +1,33 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.GenerationGameIndex
-import entity.common.Name
-import entity.common.NamedApiResource
-import entity.games.Generation
-import entity.moves.Move
-import entity.moves.MoveDamageClass
+import entities.PokeApiObject
+import entities.common.GenerationGameIndex
+import entities.common.Name
+import entities.common.NamedApiResource
+import entities.games.Generation
+import entities.moves.Move
+import entities.moves.MoveDamageClass
 
 data class Type(
     @JsonProperty("id")
     val id: Int,
-
     @JsonProperty("name")
     val name: String,
-
     @JsonProperty("damage_relations")
     val damageRelations: TypeRelations,
-
     @JsonProperty("past_damage_relations")
     val pastDamageRelations: List<TypeRelationsPast>,
-
     @JsonProperty("game_indices")
     val gameIndices: List<GenerationGameIndex>,
-
     @JsonProperty("generation")
     val generation: NamedApiResource<Generation>,
-
     @JsonProperty("move_damage_class")
     val moveDamageClass: NamedApiResource<MoveDamageClass>,
-
     @JsonProperty("names")
     val names: List<Name>,
-
     @JsonProperty("pokemon")
     val pokemon: List<TypePokemon>,
-
     @JsonProperty("moves")
     val moves: List<NamedApiResource<Move>>
-) {
-    override fun toString(): String {
-        return "Type(id=$id, name='$name', damageRelations=$damageRelations, pastDamageRelations=$pastDamageRelations, gameIndices=$gameIndices, " +
-            "generation=$generation, moveDamageClass=$moveDamageClass, names=$names, pokemon=$pokemon, moves=$moves)"
-    }
-}
+) : PokeApiObject
diff --git a/src/main/kotlin/entities/pokemon/TypePokemon.kt b/src/main/kotlin/entities/pokemon/TypePokemon.kt
new file mode 100644
index 0000000..d9f2f78
--- /dev/null
+++ b/src/main/kotlin/entities/pokemon/TypePokemon.kt
@@ -0,0 +1,11 @@
+package entities.pokemon
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import entities.common.NamedApiResource
+
+data class TypePokemon(
+    @JsonProperty("slot")
+    val slot: Number,
+    @JsonProperty("pokemon")
+    val pokemon: NamedApiResource<Pokemon>
+)
diff --git a/src/main/kotlin/entity/pokemon/TypeRelations.kt b/src/main/kotlin/entities/pokemon/TypeRelations.kt
similarity index 86%
rename from src/main/kotlin/entity/pokemon/TypeRelations.kt
rename to src/main/kotlin/entities/pokemon/TypeRelations.kt
index 9570409..3267e07 100644
--- a/src/main/kotlin/entity/pokemon/TypeRelations.kt
+++ b/src/main/kotlin/entities/pokemon/TypeRelations.kt
@@ -1,9 +1,9 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
+import entities.common.NamedApiResource
 
-class TypeRelations(
+data class TypeRelations(
     @JsonProperty("no_damage_to") val noDamageTo: Array<NamedApiResource<Type>>,
     @JsonProperty("half_damage_to") val halfDamageTo: Array<NamedApiResource<Type>>,
     @JsonProperty("double_damage_to") val doubleDamageTo: Array<NamedApiResource<Type>>,
diff --git a/src/main/kotlin/entity/pokemon/TypeRelationsPast.kt b/src/main/kotlin/entities/pokemon/TypeRelationsPast.kt
similarity index 62%
rename from src/main/kotlin/entity/pokemon/TypeRelationsPast.kt
rename to src/main/kotlin/entities/pokemon/TypeRelationsPast.kt
index 83d81bd..0c0960d 100644
--- a/src/main/kotlin/entity/pokemon/TypeRelationsPast.kt
+++ b/src/main/kotlin/entities/pokemon/TypeRelationsPast.kt
@@ -1,10 +1,9 @@
-package entity.pokemon
+package entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-
-class TypeRelationsPast(
+import entities.common.NamedApiResource
 
+data class TypeRelationsPast(
     /**
      * A list of details of how effective this type was toward others and vice versa in previous generations
      * @see NamedApiResource
@@ -12,11 +11,6 @@ class TypeRelationsPast(
      */
     @JsonProperty("no_damage_to")
     val generation: NamedApiResource<Type>,
-
     @JsonProperty("damage_relations")
     val damageRelations: TypeRelations
-) {
-    override fun toString(): String {
-        return "TypeRelationsPast(generation=$generation, damageRelations=$damageRelations)"
-    }
-}
+)
diff --git a/src/main/kotlin/entity/utility/Language.kt b/src/main/kotlin/entities/utility/Language.kt
similarity index 80%
rename from src/main/kotlin/entity/utility/Language.kt
rename to src/main/kotlin/entities/utility/Language.kt
index 806eaea..a0f4494 100644
--- a/src/main/kotlin/entity/utility/Language.kt
+++ b/src/main/kotlin/entities/utility/Language.kt
@@ -1,7 +1,7 @@
-package entity.utility
+package entities.utility
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.Name
+import entities.common.Name
 
 /**
  * Languages for translations of API resource information.
@@ -10,47 +10,36 @@ import entity.common.Name
  * @version 1.0.0
  * @since 2022-07-27
  */
-class Language(
-
+data class Language(
     /**
      * The identifier for this resource
      */
     @JsonProperty("id")
     val id: Number,
-
     /**
      * The name for this resource.
      */
     @JsonProperty("name")
     val name: String,
-
     /**
      * Whether the games are published in this language.
      */
     @JsonProperty("official")
     val official: Boolean,
-
     /**
      * The two-letter code of the country where this language is spoken. Note that it is not unique.
      */
     @JsonProperty("iso639")
     val iso639: String,
-
     /**
      * The two-letter code of the language. Note that it is not unique.
      */
     @JsonProperty("iso3166")
     val iso3166: String,
-
     /**
      * The name of this resource listed in different languages.
      * @see Name
      */
     @JsonProperty("names")
     val names: Array<Name>
-
-) {
-    override fun toString() =
-        "Language(id=$id, name=$name, official=$official, iso639=$iso639, iso3166=$iso3166, " +
-            "names=${names.contentToString()})"
-}
+)
diff --git a/src/main/kotlin/entity/pokemon/PokemonLocationArea.kt b/src/main/kotlin/entity/pokemon/PokemonLocationArea.kt
deleted file mode 100644
index 941b8fc..0000000
--- a/src/main/kotlin/entity/pokemon/PokemonLocationArea.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package entity.pokemon
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-import entity.common.VersionEncounterDetail
-import entity.locations.LocationArea
-
-class PokemonLocationArea(
-    @JsonProperty("location_area")
-    val locationArea: NamedApiResource<LocationArea>,
-
-    @JsonProperty("version_details")
-    val versionDetails: List<VersionEncounterDetail>
-) {
-    override fun toString(): String {
-        return "PokemonLocationArea(locationArea=$locationArea, versionDetails=$versionDetails)"
-    }
-}
diff --git a/src/main/kotlin/entity/pokemon/TypePokemon.kt b/src/main/kotlin/entity/pokemon/TypePokemon.kt
deleted file mode 100644
index f4ca27f..0000000
--- a/src/main/kotlin/entity/pokemon/TypePokemon.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package entity.pokemon
-
-import com.fasterxml.jackson.annotation.JsonProperty
-import entity.common.NamedApiResource
-
-class TypePokemon(
-
-    @JsonProperty("slot")
-    val slot: Number,
-
-    @JsonProperty("pokemon")
-    val pokemon: NamedApiResource<Pokemon>
-) {
-    override fun toString(): String {
-        return "TypePokemon(slot=$slot, pokemon=$pokemon)"
-    }
-}
diff --git a/src/main/kotlin/exception/HttpBodyResponseException.kt b/src/main/kotlin/exception/HttpBodyResponseException.kt
deleted file mode 100644
index 0cb549f..0000000
--- a/src/main/kotlin/exception/HttpBodyResponseException.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package exception
-
-class HttpBodyResponseException(T: Any) : PokeApiException(
-    message = "Cannot parse response body for ${T::class.simpleName}"
-)
diff --git a/src/main/kotlin/exception/PokeApiException.kt b/src/main/kotlin/exception/PokeApiException.kt
index ba0b412..35d8dd2 100644
--- a/src/main/kotlin/exception/PokeApiException.kt
+++ b/src/main/kotlin/exception/PokeApiException.kt
@@ -2,4 +2,6 @@ package exception
 
 import java.lang.Exception
 
-abstract class PokeApiException(message: String) : Exception(message)
+abstract class PokeApiException(
+    message: String
+) : Exception(message)
diff --git a/src/main/kotlin/exception/UnknownEndpointException.kt b/src/main/kotlin/exception/UnknownEndpointException.kt
index 114a8a8..48562fe 100644
--- a/src/main/kotlin/exception/UnknownEndpointException.kt
+++ b/src/main/kotlin/exception/UnknownEndpointException.kt
@@ -1,5 +1,7 @@
 package exception
 
-class UnknownEndpointException(className: String) : PokeApiException(
-    "Unknown endpoint: ${PokeApi.BASE_URL}/$className"
-)
+import PokeApi
+
+class UnknownEndpointException(
+    className: String
+) : PokeApiException("Unknown endpoint: ${PokeApi.BASE_URL}/$className")
diff --git a/src/main/kotlin/http/EndpointReference.kt b/src/main/kotlin/http/EndpointReference.kt
index bb69afd..6ba7a7c 100644
--- a/src/main/kotlin/http/EndpointReference.kt
+++ b/src/main/kotlin/http/EndpointReference.kt
@@ -1,147 +1,148 @@
 package http
 
-import entity.berries.Berry
-import entity.berries.BerryFirmness
-import entity.berries.BerryFlavor
-import entity.contests.ContestEffect
-import entity.contests.ContestType
-import entity.contests.SuperContestEffects
-import entity.encounters.EncounterCondition
-import entity.encounters.EncounterConditionValue
-import entity.encounters.EncounterMethod
-import entity.evolution.EvolutionChain
-import entity.evolution.EvolutionTrigger
-import entity.games.Generation
-import entity.games.Pokedex
-import entity.games.Version
-import entity.games.VersionGroup
-import entity.items.Item
-import entity.items.ItemAttribute
-import entity.items.ItemCategory
-import entity.items.ItemFlingEffect
-import entity.items.ItemPocket
-import entity.locations.Location
-import entity.locations.LocationArea
-import entity.locations.PalParkArea
-import entity.locations.Region
-import entity.machines.Machine
-import entity.moves.Move
-import entity.moves.MoveAilment
-import entity.moves.MoveBattleStyle
-import entity.moves.MoveCategory
-import entity.moves.MoveDamageClass
-import entity.moves.MoveLearnMethod
-import entity.moves.MoveTarget
-import entity.pokemon.Ability
-import entity.pokemon.Characteristic
-import entity.pokemon.EggGroup
-import entity.pokemon.Gender
-import entity.pokemon.GrowthRate
-import entity.pokemon.Nature
-import entity.pokemon.PokeathlonStat
-import entity.pokemon.Pokemon
-import entity.pokemon.PokemonColor
-import entity.pokemon.PokemonForm
-import entity.pokemon.PokemonHabitat
-import entity.pokemon.PokemonLocationArea
-import entity.pokemon.PokemonShape
-import entity.pokemon.PokemonSpecies
-import entity.pokemon.Stat
-import entity.pokemon.Type
+import entities.berries.Berry
+import entities.berries.BerryFirmness
+import entities.berries.BerryFlavor
+import entities.contests.ContestEffect
+import entities.contests.ContestType
+import entities.contests.SuperContestEffects
+import entities.encounters.EncounterCondition
+import entities.encounters.EncounterConditionValue
+import entities.encounters.EncounterMethod
+import entities.evolution.EvolutionChain
+import entities.evolution.EvolutionTrigger
+import entities.games.Generation
+import entities.games.Pokedex
+import entities.games.Version
+import entities.games.VersionGroup
+import entities.items.Item
+import entities.items.ItemAttribute
+import entities.items.ItemCategory
+import entities.items.ItemFlingEffect
+import entities.items.ItemPocket
+import entities.locations.Location
+import entities.locations.LocationArea
+import entities.locations.PalParkArea
+import entities.locations.Region
+import entities.machines.Machine
+import entities.moves.Move
+import entities.moves.MoveAilment
+import entities.moves.MoveBattleStyle
+import entities.moves.MoveCategory
+import entities.moves.MoveDamageClass
+import entities.moves.MoveLearnMethod
+import entities.moves.MoveTarget
+import entities.pokemon.Ability
+import entities.pokemon.Characteristic
+import entities.pokemon.EggGroup
+import entities.pokemon.Gender
+import entities.pokemon.GrowthRate
+import entities.pokemon.Nature
+import entities.pokemon.PokeathlonStat
+import entities.pokemon.Pokemon
+import entities.pokemon.PokemonColor
+import entities.pokemon.PokemonForm
+import entities.pokemon.PokemonHabitat
+import entities.pokemon.PokemonLocationArea
+import entities.pokemon.PokemonShape
+import entities.pokemon.PokemonSpecies
+import entities.pokemon.Stat
+import entities.pokemon.Type
 import exception.UnknownEndpointException
 
 inline fun <reified T : Any> getEndpoint(): String {
-    val elementType = when (T::class) {
-        /**
-         * Berries
-         */
-        Berry::class -> "berry"
-        BerryFirmness::class -> "berry-firmness"
-        BerryFlavor::class -> "berry-flavor"
+    val elementType =
+        when (T::class) {
+            /**
+             * Berries
+             */
+            Berry::class -> "berry"
+            BerryFirmness::class -> "berry-firmness"
+            BerryFlavor::class -> "berry-flavor"
 
-        /**
-         * Contests
-         */
-        ContestType::class -> "contest-type"
-        ContestEffect::class -> "contest-effect"
-        SuperContestEffects::class -> "super-contest-effect"
+            /**
+             * Contests
+             */
+            ContestType::class -> "contest-type"
+            ContestEffect::class -> "contest-effect"
+            SuperContestEffects::class -> "super-contest-effect"
 
-        /**
-         * Encounter
-         */
-        EncounterMethod::class -> "encounter-method"
-        EncounterCondition::class -> "encounter-condition"
-        EncounterConditionValue::class -> "encounter-condition-value"
+            /**
+             * Encounter
+             */
+            EncounterMethod::class -> "encounter-method"
+            EncounterCondition::class -> "encounter-condition"
+            EncounterConditionValue::class -> "encounter-condition-value"
 
-        /**
-         * Evolution
-         */
-        EvolutionChain::class -> "evolution-chain"
-        EvolutionTrigger::class -> "evolution-trigger"
+            /**
+             * Evolution
+             */
+            EvolutionChain::class -> "evolution-chain"
+            EvolutionTrigger::class -> "evolution-trigger"
 
-        /**
-         * Games
-         */
-        Generation::class -> "generation"
-        Pokedex::class -> "pokedex"
-        Version::class -> "version"
-        VersionGroup::class -> "version-group"
+            /**
+             * Games
+             */
+            Generation::class -> "generation"
+            Pokedex::class -> "pokedex"
+            Version::class -> "version"
+            VersionGroup::class -> "version-group"
 
-        /**
-         * Item
-         */
-        Item::class -> "item"
-        ItemAttribute::class -> "item-attribute"
-        ItemCategory::class -> "item-category"
-        ItemFlingEffect::class -> "item-fling-effect"
-        ItemPocket::class -> "item-pocket"
+            /**
+             * Item
+             */
+            Item::class -> "item"
+            ItemAttribute::class -> "item-attribute"
+            ItemCategory::class -> "item-category"
+            ItemFlingEffect::class -> "item-fling-effect"
+            ItemPocket::class -> "item-pocket"
 
-        /**
-         *Locations
-         */
-        Location::class -> "location"
-        LocationArea::class -> "location-area"
-        PalParkArea::class -> "pal-park-area"
-        Region::class -> "region"
+            /**
+             *Locations
+             */
+            Location::class -> "location"
+            LocationArea::class -> "location-area"
+            PalParkArea::class -> "pal-park-area"
+            Region::class -> "region"
 
-        /**
-         * Machine
-         */
-        Machine::class -> "machine"
+            /**
+             * Machine
+             */
+            Machine::class -> "machine"
 
-        /**
-         * Moves
-         */
-        Move::class -> "move"
-        MoveAilment::class -> "move-ailment"
-        MoveBattleStyle::class -> "move-battle-style"
-        MoveCategory::class -> "move-category"
-        MoveDamageClass::class -> "move-damage-class"
-        MoveLearnMethod::class -> "move-learn-method"
-        MoveTarget::class -> "move-target"
+            /**
+             * Moves
+             */
+            Move::class -> "move"
+            MoveAilment::class -> "move-ailment"
+            MoveBattleStyle::class -> "move-battle-style"
+            MoveCategory::class -> "move-category"
+            MoveDamageClass::class -> "move-damage-class"
+            MoveLearnMethod::class -> "move-learn-method"
+            MoveTarget::class -> "move-target"
 
-        /**
-         * Pokemon
-         */
-        Pokemon::class -> "pokemon"
-        Ability::class -> "ability"
-        Characteristic::class -> "characteristic"
-        EggGroup::class -> "egg-group"
-        Gender::class -> "gender"
-        GrowthRate::class -> "growth-rate"
-        Nature::class -> "nature"
-        PokeathlonStat::class -> "pokeathlon-stat"
-        PokemonLocationArea::class -> "pokemon-location-area"
-        PokemonColor::class -> "pokemon-color"
-        PokemonForm::class -> "pokemon-form"
-        PokemonHabitat::class -> "pokemon-habitat"
-        PokemonShape::class -> "pokemon-shape"
-        PokemonSpecies::class -> "pokemon-species"
-        Stat::class -> "stat"
-        Type::class -> "type"
+            /**
+             * Pokemon
+             */
+            Pokemon::class -> "pokemon"
+            Ability::class -> "ability"
+            Characteristic::class -> "characteristic"
+            EggGroup::class -> "egg-group"
+            Gender::class -> "gender"
+            GrowthRate::class -> "growth-rate"
+            Nature::class -> "nature"
+            PokeathlonStat::class -> "pokeathlon-stat"
+            PokemonLocationArea::class -> "pokemon-location-area"
+            PokemonColor::class -> "pokemon-color"
+            PokemonForm::class -> "pokemon-form"
+            PokemonHabitat::class -> "pokemon-habitat"
+            PokemonShape::class -> "pokemon-shape"
+            PokemonSpecies::class -> "pokemon-species"
+            Stat::class -> "stat"
+            Type::class -> "type"
 
-        else -> throw UnknownEndpointException(className = T::class.simpleName!!)
-    }
+            else -> throw UnknownEndpointException(className = T::class.simpleName!!)
+        }
 
     return elementType
 }
diff --git a/src/test/kotlin/Berry.kt b/src/test/kotlin/Berry.kt
new file mode 100644
index 0000000..a1b0ece
--- /dev/null
+++ b/src/test/kotlin/Berry.kt
@@ -0,0 +1 @@
+class Berry
diff --git a/src/test/kotlin/PokeApiTest.kt b/src/test/kotlin/PokeApiTest.kt
deleted file mode 100644
index 87ecf94..0000000
--- a/src/test/kotlin/PokeApiTest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-import entity.common.NamedApiResources
-import entity.pokemon.Pokemon
-import exception.HttpBodyResponseException
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-
-class PokeApiTest {
-
-    @Test
-    fun `When try to get a Pokemon by existing id, should return the Pokemon`() {
-        val actual = PokeApi.get<Pokemon>(id = 1)
-        assertEquals("bulbasaur", actual.name)
-        assertTrue(actual.javaClass == Pokemon::class.java)
-    }
-
-    @Test
-    fun `When try to get a Pokemon by existing name, should return the Pokemon`() {
-        val actual = PokeApi.get<Pokemon>(name = "bulbasaur")
-        assertTrue(actual.javaClass == Pokemon::class.java)
-    }
-
-    @Test
-    fun `When try to get a Pokemon by non-existing name, should throw an exception`() {
-        assertThrows<HttpBodyResponseException> { PokeApi.get<Pokemon>(name = "MissingNo") }
-    }
-
-    @Test
-    fun `When try to get a Pokemon by non-existing id, should throw an exception`() {
-        assertThrows<HttpBodyResponseException> { PokeApi.get<Pokemon>(id = -1) }
-    }
-
-    @Test
-    fun `When try to get a list of Pokemon, should return a list of Pokemon`() {
-        val actual = PokeApi.get<Pokemon>(limit = 10, offset = 0)
-        assertEquals(10, actual.results.size)
-        assertTrue(actual.javaClass == NamedApiResources::class.java)
-    }
-}

From 7c9de2c5fe80c1f9c231bea44ff843e1e59393dd Mon Sep 17 00:00:00 2001
From: Tykok <treportelie12@gmail.com>
Date: Sat, 26 Oct 2024 15:54:23 +0200
Subject: [PATCH 2/2] [Clean] Update of the project

---
 .github/workflows/create-release.yml          |  29 +----
 .github/workflows/publish_maven_central.yml   |  31 ++++++
 .idea/kotlinc.xml                             |   6 +-
 build.gradle.kts                              | 100 +++++++++++-------
 gradle.properties                             |   3 +
 gradle/libs.versions.toml                     |  24 +++++
 src/main/kotlin/entities/PokeApiObject.kt     |   3 -
 .../kotlin/{ => fr/tykok/pokeapi}/PokeApi.kt  |  19 ++--
 .../tykok/pokeapi/entities/PokeApiObject.kt   |   3 +
 .../tykok/pokeapi}/entities/berries/Berry.kt  |  10 +-
 .../entities/berries/BerryFirmness.kt         |   8 +-
 .../pokeapi}/entities/berries/BerryFlavor.kt  |  10 +-
 .../entities/berries/BerryFlavorMap.kt        |   4 +-
 .../entities/berries/FlavorBerryMap.kt        |   4 +-
 .../pokeapi}/entities/common/APIResource.kt   |   2 +-
 .../pokeapi}/entities/common/Description.kt   |   4 +-
 .../tykok/pokeapi}/entities/common/Effect.kt  |   4 +-
 .../pokeapi}/entities/common/Encounter.kt     |   6 +-
 .../pokeapi}/entities/common/FlavorText.kt    |   6 +-
 .../entities/common/GenerationGameIndex.kt    |   4 +-
 .../entities/common/MachineVersionDetail.kt   |   6 +-
 .../tykok/pokeapi}/entities/common/Name.kt    |   4 +-
 .../entities/common/NamedApiResource.kt       |   2 +-
 .../entities/common/NamedApiResources.kt      |   2 +-
 .../pokeapi}/entities/common/VerboseEffect.kt |   4 +-
 .../entities/common/VersionEncounterDetail.kt |   4 +-
 .../entities/common/VersionGameIndex.kt       |   4 +-
 .../entities/common/VersionGroupFlavorText.kt |   6 +-
 .../entities/contests/ContestEffect.kt        |   8 +-
 .../pokeapi}/entities/contests/ContestName.kt |   6 +-
 .../pokeapi}/entities/contests/ContestType.kt |   8 +-
 .../entities/contests/SuperContestEffects.kt  |  10 +-
 .../entities/encounters/EncounterCondition.kt |   8 +-
 .../encounters/EncounterConditionValue.kt     |   8 +-
 .../entities/encounters/EncounterMethod.kt    |   6 +-
 .../pokeapi}/entities/evolution/ChainLink.kt  |   6 +-
 .../entities/evolution/EvolutionChain.kt      |   8 +-
 .../entities/evolution/EvolutionDetail.kt     |  14 +--
 .../entities/evolution/EvolutionTrigger.kt    |  10 +-
 .../pokeapi}/entities/games/Generation.kt     |  18 ++--
 .../tykok/pokeapi}/entities/games/Pokedex.kt  |  12 +--
 .../pokeapi}/entities/games/PokemonEntry.kt   |   6 +-
 .../tykok/pokeapi}/entities/games/Version.kt  |   8 +-
 .../pokeapi}/entities/games/VersionGroup.kt   |  10 +-
 .../tykok/pokeapi}/entities/items/Item.kt     |  20 ++--
 .../pokeapi}/entities/items/ItemAttribute.kt  |  10 +-
 .../pokeapi}/entities/items/ItemCategory.kt   |   8 +-
 .../entities/items/ItemFlingEffect.kt         |   8 +-
 .../entities/items/ItemHolderPokemon.kt       |   6 +-
 .../items/ItemHolderPokemonVersionDetail.kt   |   6 +-
 .../pokeapi}/entities/items/ItemPocket.kt     |   8 +-
 .../pokeapi}/entities/items/ItemSprites.kt    |   2 +-
 .../entities/locations/EncounterMethodRate.kt |   6 +-
 .../locations/EncounterVersionDetails.kt      |   6 +-
 .../pokeapi}/entities/locations/Location.kt   |  10 +-
 .../entities/locations/LocationArea.kt        |   8 +-
 .../entities/locations/PalParkArea.kt         |   6 +-
 .../locations/PalParkEncounterSpecies.kt      |   6 +-
 .../entities/locations/PokemonEncounter.kt    |   8 +-
 .../pokeapi}/entities/locations/Region.kt     |  14 +--
 .../pokeapi}/entities/machines/Machine.kt     |  12 +--
 .../entities/moves/ContestComboDetail.kt      |   4 +-
 .../entities/moves/ContestComboSets.kt        |   2 +-
 .../tykok/pokeapi}/entities/moves/Move.kt     |  24 ++---
 .../pokeapi}/entities/moves/MoveAilment.kt    |   8 +-
 .../entities/moves/MoveBattleStyle.kt         |   6 +-
 .../pokeapi}/entities/moves/MoveCategory.kt   |   8 +-
 .../entities/moves/MoveDamageClass.kt         |  10 +-
 .../pokeapi}/entities/moves/MoveFlavorText.kt |   8 +-
 .../entities/moves/MoveLearnMethod.kt         |  12 +--
 .../pokeapi}/entities/moves/MoveMetaData.kt   |   4 +-
 .../pokeapi}/entities/moves/MoveStatChange.kt |   6 +-
 .../pokeapi}/entities/moves/MoveTarget.kt     |  10 +-
 .../entities/moves/PastMoveStatValues.kt      |  10 +-
 .../pokeapi}/entities/pokemon/Ability.kt      |  14 +--
 .../entities/pokemon/AbilityFlavorText.kt     |   8 +-
 .../entities/pokemon/AbilityPokemon.kt        |   4 +-
 .../pokeapi}/entities/pokemon/AwesomeName.kt  |   6 +-
 .../entities/pokemon/Characteristic.kt        |   8 +-
 .../pokeapi}/entities/pokemon/EggGroup.kt     |   8 +-
 .../tykok/pokeapi}/entities/pokemon/Gender.kt |   6 +-
 .../tykok/pokeapi}/entities/pokemon/Genus.kt  |   6 +-
 .../pokeapi}/entities/pokemon/GrowthRate.kt   |   8 +-
 .../pokemon/GrowthRateExperienceLevel.kt      |   2 +-
 .../pokemon/MoveBattleStylePreference.kt      |   6 +-
 .../entities/pokemon/MoveStatAffect.kt        |   6 +-
 .../entities/pokemon/MoveStatAffectSets.kt    |   2 +-
 .../tykok/pokeapi}/entities/pokemon/Nature.kt |  10 +-
 .../pokemon/NaturePokeathlonStatAffect.kt     |   4 +-
 .../pokemon/NaturePokeathlonStatAffectSets.kt |   2 +-
 .../entities/pokemon/NatureStatAffectSets.kt  |   4 +-
 .../entities/pokemon/NatureStatChange.kt      |   4 +-
 .../entities/pokemon/PalParkEncounterArea.kt  |   4 +-
 .../entities/pokemon/PokeathlonStat.kt        |   6 +-
 .../pokeapi}/entities/pokemon/Pokemon.kt      |   8 +-
 .../entities/pokemon/PokemonAbility.kt        |   4 +-
 .../pokeapi}/entities/pokemon/PokemonColor.kt |   8 +-
 .../entities/pokemon/PokemonEncounter.kt      |   8 +-
 .../pokeapi}/entities/pokemon/PokemonForm.kt  |  10 +-
 .../entities/pokemon/PokemonFormSprites.kt    |   2 +-
 .../entities/pokemon/PokemonFormType.kt       |   4 +-
 .../entities/pokemon/PokemonHabitat.kt        |   8 +-
 .../entities/pokemon/PokemonHeldItem.kt       |   6 +-
 .../pokemon/PokemonHeldItemVersion.kt         |   6 +-
 .../entities/pokemon/PokemonLocationArea.kt   |  10 +-
 .../pokeapi}/entities/pokemon/PokemonMove.kt  |   6 +-
 .../entities/pokemon/PokemonMoveVersion.kt    |   8 +-
 .../pokeapi}/entities/pokemon/PokemonShape.kt |   8 +-
 .../entities/pokemon/PokemonSpecies.kt        |  16 +--
 .../pokemon/PokemonSpeciesDexEntry.kt         |   6 +-
 .../entities/pokemon/PokemonSpeciesGender.kt  |   4 +-
 .../entities/pokemon/PokemonSpeciesVariety.kt |   4 +-
 .../entities/pokemon/PokemonSprites.kt        |   2 +-
 .../pokeapi}/entities/pokemon/PokemonStat.kt  |   4 +-
 .../pokeapi}/entities/pokemon/PokemonType.kt  |   4 +-
 .../entities/pokemon/PokemonTypePast.kt       |   6 +-
 .../tykok/pokeapi}/entities/pokemon/Stat.kt   |  12 +--
 .../tykok/pokeapi}/entities/pokemon/Type.kt   |  16 +--
 .../pokeapi}/entities/pokemon/TypePokemon.kt  |   4 +-
 .../entities/pokemon/TypeRelations.kt         |   4 +-
 .../entities/pokemon/TypeRelationsPast.kt     |   4 +-
 .../pokeapi}/entities/utility/Language.kt     |   4 +-
 .../pokeapi}/exception/PokeApiException.kt    |   2 +-
 .../exception/UnknownEndpointException.kt     |   4 +-
 .../tykok/pokeapi}/http/EndpointReference.kt  | 100 +++++++++---------
 src/test/kotlin/Berry.kt                      |   1 -
 src/test/kotlin/fr/tykok/pokeapi/BerryTest.kt |  60 +++++++++++
 127 files changed, 654 insertions(+), 531 deletions(-)
 create mode 100644 .github/workflows/publish_maven_central.yml
 create mode 100644 gradle/libs.versions.toml
 delete mode 100644 src/main/kotlin/entities/PokeApiObject.kt
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/PokeApi.kt (79%)
 create mode 100644 src/main/kotlin/fr/tykok/pokeapi/entities/PokeApiObject.kt
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/berries/Berry.kt (91%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/berries/BerryFirmness.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/berries/BerryFlavor.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/berries/BerryFlavorMap.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/berries/FlavorBerryMap.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/APIResource.kt (89%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/Description.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/Effect.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/Encounter.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/FlavorText.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/GenerationGameIndex.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/MachineVersionDetail.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/Name.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/NamedApiResource.kt (96%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/NamedApiResources.kt (91%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/VerboseEffect.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/VersionEncounterDetail.kt (89%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/VersionGameIndex.kt (78%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/common/VersionGroupFlavorText.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/contests/ContestEffect.kt (87%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/contests/ContestName.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/contests/ContestType.kt (87%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/contests/SuperContestEffects.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/encounters/EncounterCondition.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/encounters/EncounterConditionValue.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/encounters/EncounterMethod.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/evolution/ChainLink.kt (89%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/evolution/EvolutionChain.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/evolution/EvolutionDetail.kt (92%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/evolution/EvolutionTrigger.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/games/Generation.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/games/Pokedex.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/games/PokemonEntry.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/games/Version.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/games/VersionGroup.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/Item.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemAttribute.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemCategory.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemFlingEffect.kt (82%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemHolderPokemon.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemHolderPokemonVersionDetail.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemPocket.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/items/ItemSprites.kt (93%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/EncounterMethodRate.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/EncounterVersionDetails.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/Location.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/LocationArea.kt (90%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/PalParkArea.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/PalParkEncounterSpecies.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/PokemonEncounter.kt (75%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/locations/Region.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/machines/Machine.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/ContestComboDetail.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/ContestComboSets.kt (94%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/Move.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveAilment.kt (78%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveBattleStyle.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveCategory.kt (74%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveDamageClass.kt (78%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveFlavorText.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveLearnMethod.kt (76%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveMetaData.kt (95%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveStatChange.kt (73%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/MoveTarget.kt (78%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/moves/PastMoveStatValues.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Ability.kt (82%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/AbilityFlavorText.kt (75%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/AbilityPokemon.kt (86%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/AwesomeName.kt (72%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Characteristic.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/EggGroup.kt (78%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Gender.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Genus.kt (69%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/GrowthRate.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/GrowthRateExperienceLevel.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/MoveBattleStylePreference.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/MoveStatAffect.kt (60%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/MoveStatAffectSets.kt (90%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Nature.kt (88%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/NaturePokeathlonStatAffect.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/NaturePokeathlonStatAffectSets.kt (91%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/NatureStatAffectSets.kt (80%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/NatureStatChange.kt (79%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PalParkEncounterArea.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokeathlonStat.kt (82%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Pokemon.kt (93%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonAbility.kt (83%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonColor.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonEncounter.kt (71%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonForm.kt (90%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonFormSprites.kt (93%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonFormType.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonHabitat.kt (64%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonHeldItem.kt (66%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonHeldItemVersion.kt (60%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonLocationArea.kt (51%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonMove.kt (68%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonMoveVersion.kt (75%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonShape.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonSpecies.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonSpeciesDexEntry.kt (72%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonSpeciesGender.kt (82%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonSpeciesVariety.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonSprites.kt (97%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonStat.kt (81%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonType.kt (77%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/PokemonTypePast.kt (68%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Stat.kt (84%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/Type.kt (66%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/TypePokemon.kt (67%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/TypeRelations.kt (85%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/pokemon/TypeRelationsPast.kt (80%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/entities/utility/Language.kt (92%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/exception/PokeApiException.kt (75%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/exception/UnknownEndpointException.kt (65%)
 rename src/main/kotlin/{ => fr/tykok/pokeapi}/http/EndpointReference.kt (54%)
 delete mode 100644 src/test/kotlin/Berry.kt
 create mode 100644 src/test/kotlin/fr/tykok/pokeapi/BerryTest.kt

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index b1838ce..df3ff67 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -1,9 +1,5 @@
 name: Release PokeAPI
 
-env:
-  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-
 on:
   push:
     tags:
@@ -48,7 +44,7 @@ jobs:
 
       - name: Build .jar
         run: sh gradlew build
-        
+
       - name: Create Release
         if: ${{ success() }}
         id: create_release
@@ -60,26 +56,3 @@ jobs:
           body: ${{steps.build_changelog.outputs.changelog}}
           artifacts: "${{ github.workspace }}/build/libs/pokeapi-${{ env.PROJECT_VERSION }}.jar"
           makeLatest: "latest"
-
-  publish:
-    name: Publish PokeAPI
-    runs-on: ubuntu-latest
-    needs:
-      - release
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-
-      - name: Publish PokeAPI
-        run: sh gradlew build
-
-      - name: Publish PokeAPI
-        if: ${{ success() }}
-        run: sh gradlew publish
diff --git a/.github/workflows/publish_maven_central.yml b/.github/workflows/publish_maven_central.yml
new file mode 100644
index 0000000..73ee147
--- /dev/null
+++ b/.github/workflows/publish_maven_central.yml
@@ -0,0 +1,31 @@
+name : Publish PokeAPI
+
+env:
+  OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+  OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish:
+    name: Publish PokeAPI
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Publish PokeAPI
+        run: sh gradlew build
+
+      - name: Publish PokeAPI
+        if: ${{ success() }}
+        run: sh gradlew publish
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index d6504c9..fdfef61 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -3,7 +3,11 @@
   <component name="Kotlin2JvmCompilerArguments">
     <option name="jvmTarget" value="1.8" />
   </component>
+  <component name="KotlinCommonCompilerArguments">
+    <option name="apiVersion" value="2.0" />
+    <option name="languageVersion" value="2.0" />
+  </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.7.10" />
+    <option name="version" value="2.0.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ced5106..8cbc8f9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,32 +1,26 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val artifact = "pokeapi"
 val projectName = "PokeApi"
 val projectDocUrl = "https://tykok.github.io/PokeAPI-Kotlin/"
-val sonarSnapshotUri = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-val sonarReleaseUri = "https://s01.oss.sonatype.org/content/repositories/releases/"
+val projectUrl = "https://github.com/Tykok/PokeAPI-Kotlin"
+val mavenCentralPublishURI = uri("https://central.sonatype.com/api/v1/publisher/deployments/download/")
 
 description = "PokeApi is a simple library you can use to make request to get data about Pokémon."
 group = "fr.tykok"
 version = "1.0.0"
 
-fun getUriSonar(): String =
-    if (version.toString().endsWith("SNAPSHOT")) {
-        sonarSnapshotUri
-    } else {
-        sonarReleaseUri
-    }
-
 plugins {
+    alias(libs.plugins.netResearchgateRelease)
+    alias(libs.plugins.dokka)
+    alias(libs.plugins.ktlint)
     `java-library`
     `maven-publish`
+    signing
     java
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "2.0.0"
     application
-    signing
-    id("net.researchgate.release") version "3.0.2"
-    id("org.jetbrains.dokka") version "1.9.0"
-    id("org.jlleitschuh.gradle.ktlint") version "11.6.0"
+    jacoco
 }
 
 repositories {
@@ -43,19 +37,35 @@ java {
 
 dependencies {
     testImplementation(kotlin("test"))
-    implementation("com.squareup.okhttp3:okhttp:4.10.0")
-    // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.0.1")
-    // https://mvnrepository.com/artifact/com.google.code.gson/gson
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation(libs.okhttp)
+    implementation(libs.jackson)
+    implementation(libs.gson)
+
+    testImplementation(platform(libs.junitBom))
+    testImplementation(libs.junitJupiter)
+    testRuntimeOnly(libs.junitPlatform)
+    testImplementation(libs.mockk)
 }
 
 tasks.test {
     useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+    }
+}
+
+tasks.test {
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+tasks.jacocoTestReport {
+    dependsOn(tasks.test) // tests are required to run before generating the report
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
 }
 
 tasks.create("getProjectVersion") {
@@ -63,6 +73,7 @@ tasks.create("getProjectVersion") {
         logger.quiet("VERSION: $version")
     }
 }
+
 tasks.register<Jar>("dokkaHtmlJar") {
     dependsOn(tasks.dokkaHtml)
     from(tasks.dokkaHtml.flatMap { it.outputDirectory })
@@ -88,7 +99,15 @@ task<Exec>("mkdocs-build") {
 }
 
 application {
-    mainClass.set("PokeApi")
+    mainClass.set("fr.tykok.pokeapi.PokeApi")
+}
+
+sourceSets {
+    test {
+        kotlin {
+            srcDir("src/test/kotlin")
+        }
+    }
 }
 
 signing {
@@ -97,35 +116,40 @@ signing {
 
 publishing {
     publications {
-        create<MavenPublication>("library") {
-            from(components["java"])
-        }
         create<MavenPublication>("mavenJava") {
+            from(components["kotlin"])
+
+            groupId = groupId
+            artifactId = artifactId
+            version = version
+
             pom {
                 name.set(projectName)
-                description.set(description)
-                url.set(projectDocUrl)
+                url.set(projectUrl)
+
                 licenses {
                     license {
                         name.set("MIT License")
-                        url.set("https://github.com/Tykok/PokeAPI-Kotlin/blob/main/LICENSE")
+                    }
+                }
+
+                developers {
+                    developer {
+                        name.set("Tykok")
                     }
                 }
             }
         }
     }
+
     repositories {
         maven {
-            url = uri(getUriSonar())
-            name = projectName
-            group = group
-            version = version.toString()
-            description = description
+            name = "sonatype"
+            url = mavenCentralPublishURI
+
             credentials {
-                username = project.findProperty("ossrh.username") as String?
-                    ?: System.getenv("OSSRH_USERNAME")
-                password = project.findProperty("ossrh.password") as String?
-                    ?: System.getenv("OSSRH_PASSWORD")
+                username = project.findProperty("ossrhUsername") as String? ?: System.getenv("OSSRH_USERNAME")
+                password = project.findProperty("ossrhPassword") as String? ?: System.getenv("OSSRH_PASSWORD")
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 7fc6f1f..e9631a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,4 @@
 kotlin.code.style=official
+ossrhUsername=22ri/I/7
+ossrhPassword=FEeq/1eCi6y4Pz2StJ/+fi0poZPkevIeBpIHdpbeATxa
+#12-Soleil&GPG
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..ab4fac9
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,24 @@
+[versions]
+mockk = "1.13.11"
+gson = "2.10"
+jackson = "2.17.0"
+okhttp = "4.10.0"
+junitBom = "5.11.0-M1"
+
+[plugins]
+netResearchgateRelease = { id = "net.researchgate.release", version = "3.0.2" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.0" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.6.0" }
+
+[libraries]
+junitBom = { module = "org.junit:junit-bom", version.ref = "junitBom" }
+junitJupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junitPlatform = { module = "org.junit.platform:junit-platform-launcher" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
+# https://mvnrepository.com/artifact/com.google.code.gson/gson
+gson = { module = "com.google.code.gson:gson" , version.ref = "gson"}
+# https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
+jackson = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp"}
+
+[bundles]
diff --git a/src/main/kotlin/entities/PokeApiObject.kt b/src/main/kotlin/entities/PokeApiObject.kt
deleted file mode 100644
index a5b364d..0000000
--- a/src/main/kotlin/entities/PokeApiObject.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package entities
-
-interface PokeApiObject
diff --git a/src/main/kotlin/PokeApi.kt b/src/main/kotlin/fr/tykok/pokeapi/PokeApi.kt
similarity index 79%
rename from src/main/kotlin/PokeApi.kt
rename to src/main/kotlin/fr/tykok/pokeapi/PokeApi.kt
index 9c1d3b6..2e48ad5 100644
--- a/src/main/kotlin/PokeApi.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/PokeApi.kt
@@ -1,8 +1,10 @@
+package fr.tykok.pokeapi
+
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import entities.PokeApiObject
-import entities.common.NamedApiResources
-import http.getEndpoint
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResources
+import fr.tykok.pokeapi.http.getEndpoint
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
@@ -21,7 +23,7 @@ abstract class PokeApi {
         /**
          * Get a resource by its id.
          */
-        inline fun <reified T : PokeApiObject> get(id: Int): PokeApiObject =
+        inline fun <reified T : PokeApiObject> get(id: Int): T =
             "$BASE_URL/${getEndpoint<T>()}/$id"
                 .let {
                     Request.Builder().url(it).build()
@@ -34,7 +36,7 @@ abstract class PokeApi {
         /**
          * Get a resource by its name.
          */
-        inline fun <reified T : PokeApiObject> get(name: String): PokeApiObject =
+        inline fun <reified T : PokeApiObject> get(name: String): T =
             "$BASE_URL/${getEndpoint<T>()}/$name"
                 .let {
                     Request.Builder().url(it).build()
@@ -50,14 +52,17 @@ abstract class PokeApi {
         inline fun <reified T : PokeApiObject> get(
             limit: Int = 20,
             offset: Int = 20
-        ): NamedApiResources<PokeApiObject> =
+        ): NamedApiResources<T> =
             "$BASE_URL/${getEndpoint<T>()}?offset=$offset&limit=$limit"
                 .let {
                     Request.Builder().url(it).build()
                 }.let {
                     OkHttpClient().newCall(it).execute()
                 }.let {
-                    Gson().fromJson(it.body?.string(), object : TypeToken<NamedApiResources<T>>() {}.type)
+                    Gson().fromJson(
+                        it.body?.string(),
+                        object : TypeToken<NamedApiResources<T>>() {}.type
+                    )
                 }
     }
 }
diff --git a/src/main/kotlin/fr/tykok/pokeapi/entities/PokeApiObject.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/PokeApiObject.kt
new file mode 100644
index 0000000..ad945eb
--- /dev/null
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/PokeApiObject.kt
@@ -0,0 +1,3 @@
+package fr.tykok.pokeapi.entities
+
+interface PokeApiObject
diff --git a/src/main/kotlin/entities/berries/Berry.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/Berry.kt
similarity index 91%
rename from src/main/kotlin/entities/berries/Berry.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/berries/Berry.kt
index 49edb71..f7e12de 100644
--- a/src/main/kotlin/entities/berries/Berry.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/Berry.kt
@@ -1,10 +1,10 @@
-package entities.berries
+package fr.tykok.pokeapi.entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.items.Item
-import entities.pokemon.Type
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.items.Item
+import fr.tykok.pokeapi.entities.pokemon.Type
 
 /**
  * Berries (Japanese: きのみ Tree Fruit) are small, juicy, fleshy fruit.
diff --git a/src/main/kotlin/entities/berries/BerryFirmness.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFirmness.kt
similarity index 77%
rename from src/main/kotlin/entities/berries/BerryFirmness.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFirmness.kt
index dfdc3ba..20a15c2 100644
--- a/src/main/kotlin/entities/berries/BerryFirmness.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFirmness.kt
@@ -1,9 +1,9 @@
-package entities.berries
+package fr.tykok.pokeapi.entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-firmnesses
diff --git a/src/main/kotlin/entities/berries/BerryFlavor.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavor.kt
similarity index 79%
rename from src/main/kotlin/entities/berries/BerryFlavor.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavor.kt
index ec03b3a..3a07609 100644
--- a/src/main/kotlin/entities/berries/BerryFlavor.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavor.kt
@@ -1,10 +1,10 @@
-package entities.berries
+package fr.tykok.pokeapi.entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.contests.ContestType
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.contests.ContestType
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-flavors
diff --git a/src/main/kotlin/entities/berries/BerryFlavorMap.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavorMap.kt
similarity index 85%
rename from src/main/kotlin/entities/berries/BerryFlavorMap.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavorMap.kt
index 36c2232..e93acdc 100644
--- a/src/main/kotlin/entities/berries/BerryFlavorMap.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/BerryFlavorMap.kt
@@ -1,7 +1,7 @@
-package entities.berries
+package fr.tykok.pokeapi.entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berries
diff --git a/src/main/kotlin/entities/berries/FlavorBerryMap.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/FlavorBerryMap.kt
similarity index 84%
rename from src/main/kotlin/entities/berries/FlavorBerryMap.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/berries/FlavorBerryMap.kt
index d4a2f3c..1407206 100644
--- a/src/main/kotlin/entities/berries/FlavorBerryMap.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/berries/FlavorBerryMap.kt
@@ -1,7 +1,7 @@
-package entities.berries
+package fr.tykok.pokeapi.entities.berries
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @link https://pokeapi.co/docs/v2#berry-flavors
diff --git a/src/main/kotlin/entities/common/APIResource.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/APIResource.kt
similarity index 89%
rename from src/main/kotlin/entities/common/APIResource.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/APIResource.kt
index 0c006e6..5f50e60 100644
--- a/src/main/kotlin/entities/common/APIResource.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/APIResource.kt
@@ -1,4 +1,4 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/common/Description.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Description.kt
similarity index 86%
rename from src/main/kotlin/entities/common/Description.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/Description.kt
index befc359..1aec25e 100644
--- a/src/main/kotlin/entities/common/Description.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Description.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#description">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/Effect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Effect.kt
similarity index 84%
rename from src/main/kotlin/entities/common/Effect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/Effect.kt
index 59b5ccb..4efdb84 100644
--- a/src/main/kotlin/entities/common/Effect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Effect.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#common-models">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/Encounter.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Encounter.kt
similarity index 86%
rename from src/main/kotlin/entities/common/Encounter.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/Encounter.kt
index 80aab0a..40d8a54 100644
--- a/src/main/kotlin/entities/common/Encounter.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Encounter.kt
@@ -1,8 +1,8 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.encounters.EncounterConditionValue
-import entities.encounters.EncounterMethod
+import fr.tykok.pokeapi.entities.encounters.EncounterConditionValue
+import fr.tykok.pokeapi.entities.encounters.EncounterMethod
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encounter">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/FlavorText.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/FlavorText.kt
similarity index 83%
rename from src/main/kotlin/entities/common/FlavorText.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/FlavorText.kt
index 6e8a2fc..ba96160 100644
--- a/src/main/kotlin/entities/common/FlavorText.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/FlavorText.kt
@@ -1,8 +1,8 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.Version
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.games.Version
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#common-models">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/GenerationGameIndex.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/GenerationGameIndex.kt
similarity index 86%
rename from src/main/kotlin/entities/common/GenerationGameIndex.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/GenerationGameIndex.kt
index 10d654b..2418c52 100644
--- a/src/main/kotlin/entities/common/GenerationGameIndex.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/GenerationGameIndex.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.Generation
+import fr.tykok.pokeapi.entities.games.Generation
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#generationgameindex">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/MachineVersionDetail.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/MachineVersionDetail.kt
similarity index 81%
rename from src/main/kotlin/entities/common/MachineVersionDetail.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/MachineVersionDetail.kt
index c08e3b3..9abe5c1 100644
--- a/src/main/kotlin/entities/common/MachineVersionDetail.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/MachineVersionDetail.kt
@@ -1,8 +1,8 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.VersionGroup
-import entities.machines.Machine
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.machines.Machine
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#machineversiondetail">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/Name.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Name.kt
similarity index 84%
rename from src/main/kotlin/entities/common/Name.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/Name.kt
index fec0f95..858262a 100644
--- a/src/main/kotlin/entities/common/Name.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/Name.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @link https://pokeapi.co/docs/v2#common-models
diff --git a/src/main/kotlin/entities/common/NamedApiResource.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResource.kt
similarity index 96%
rename from src/main/kotlin/entities/common/NamedApiResource.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResource.kt
index 9e6d299..97d6dc3 100644
--- a/src/main/kotlin/entities/common/NamedApiResource.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResource.kt
@@ -1,4 +1,4 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.google.gson.Gson
diff --git a/src/main/kotlin/entities/common/NamedApiResources.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResources.kt
similarity index 91%
rename from src/main/kotlin/entities/common/NamedApiResources.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResources.kt
index 7d53a9f..6c35714 100644
--- a/src/main/kotlin/entities/common/NamedApiResources.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/NamedApiResources.kt
@@ -1,4 +1,4 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/common/VerboseEffect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VerboseEffect.kt
similarity index 88%
rename from src/main/kotlin/entities/common/VerboseEffect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/VerboseEffect.kt
index 933c7a6..f42af6e 100644
--- a/src/main/kotlin/entities/common/VerboseEffect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VerboseEffect.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#verboseeffect">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/VersionEncounterDetail.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionEncounterDetail.kt
similarity index 89%
rename from src/main/kotlin/entities/common/VersionEncounterDetail.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionEncounterDetail.kt
index c793451..123b1e3 100644
--- a/src/main/kotlin/entities/common/VersionEncounterDetail.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionEncounterDetail.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.Version
+import fr.tykok.pokeapi.entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#versionencounterdetail">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/common/VersionGameIndex.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGameIndex.kt
similarity index 78%
rename from src/main/kotlin/entities/common/VersionGameIndex.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGameIndex.kt
index 836d744..c1e0087 100644
--- a/src/main/kotlin/entities/common/VersionGameIndex.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGameIndex.kt
@@ -1,7 +1,7 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.Version
+import fr.tykok.pokeapi.entities.games.Version
 
 data class VersionGameIndex(
     @JsonProperty("game_index")
diff --git a/src/main/kotlin/entities/common/VersionGroupFlavorText.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGroupFlavorText.kt
similarity index 84%
rename from src/main/kotlin/entities/common/VersionGroupFlavorText.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGroupFlavorText.kt
index 906c24c..3e397c3 100644
--- a/src/main/kotlin/entities/common/VersionGroupFlavorText.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/common/VersionGroupFlavorText.kt
@@ -1,8 +1,8 @@
-package entities.common
+package fr.tykok.pokeapi.entities.common
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.games.VersionGroup
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#versiongroupflavortext">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/contests/ContestEffect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestEffect.kt
similarity index 87%
rename from src/main/kotlin/entities/contests/ContestEffect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestEffect.kt
index d0282d8..27533ee 100644
--- a/src/main/kotlin/entities/contests/ContestEffect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestEffect.kt
@@ -1,9 +1,9 @@
-package entities.contests
+package fr.tykok.pokeapi.entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Effect
-import entities.common.FlavorText
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Effect
+import fr.tykok.pokeapi.entities.common.FlavorText
 
 /**
  * `ContestEffects` class refers to the effects of move on the public when used in contests.
diff --git a/src/main/kotlin/entities/contests/ContestName.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestName.kt
similarity index 86%
rename from src/main/kotlin/entities/contests/ContestName.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestName.kt
index 09c860e..bc39c3c 100644
--- a/src/main/kotlin/entities/contests/ContestName.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestName.kt
@@ -1,8 +1,8 @@
-package entities.contests
+package fr.tykok.pokeapi.entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * ContestName classe used to refer to a specific categories according to the color of the berry.
diff --git a/src/main/kotlin/entities/contests/ContestType.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestType.kt
similarity index 87%
rename from src/main/kotlin/entities/contests/ContestType.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestType.kt
index f9727c1..e42b124 100644
--- a/src/main/kotlin/entities/contests/ContestType.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/ContestType.kt
@@ -1,9 +1,9 @@
-package entities.contests
+package fr.tykok.pokeapi.entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.berries.BerryFlavor
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.berries.BerryFlavor
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * The types given to Pokémon in the contest are categories that judges use to evaluate the condition of a Pokémon in Pokémon contests.
diff --git a/src/main/kotlin/entities/contests/SuperContestEffects.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/SuperContestEffects.kt
similarity index 84%
rename from src/main/kotlin/entities/contests/SuperContestEffects.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/contests/SuperContestEffects.kt
index 9f4ed85..b2f61df 100644
--- a/src/main/kotlin/entities/contests/SuperContestEffects.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/contests/SuperContestEffects.kt
@@ -1,10 +1,10 @@
-package entities.contests
+package fr.tykok.pokeapi.entities.contests
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.FlavorText
-import entities.common.NamedApiResource
-import entities.moves.Move
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.FlavorText
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.moves.Move
 
 /**
  * `SuperContestEffects` class refers to the effects of move on the public when used in super contests.
diff --git a/src/main/kotlin/entities/encounters/EncounterCondition.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterCondition.kt
similarity index 84%
rename from src/main/kotlin/entities/encounters/EncounterCondition.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterCondition.kt
index 3c0e8a8..b0a2600 100644
--- a/src/main/kotlin/entities/encounters/EncounterCondition.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterCondition.kt
@@ -1,9 +1,9 @@
-package entities.encounters
+package fr.tykok.pokeapi.entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Conditions which affect what Pokemon might appear in the wild.
diff --git a/src/main/kotlin/entities/encounters/EncounterConditionValue.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterConditionValue.kt
similarity index 84%
rename from src/main/kotlin/entities/encounters/EncounterConditionValue.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterConditionValue.kt
index e6d311a..609a093 100644
--- a/src/main/kotlin/entities/encounters/EncounterConditionValue.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterConditionValue.kt
@@ -1,9 +1,9 @@
-package entities.encounters
+package fr.tykok.pokeapi.entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Encounter condition values are the various states that an encounter condition can have, i.e., time of day can be either day or night.
diff --git a/src/main/kotlin/entities/encounters/EncounterMethod.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterMethod.kt
similarity index 88%
rename from src/main/kotlin/entities/encounters/EncounterMethod.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterMethod.kt
index b526709..29374a6 100644
--- a/src/main/kotlin/entities/encounters/EncounterMethod.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/encounters/EncounterMethod.kt
@@ -1,8 +1,8 @@
-package entities.encounters
+package fr.tykok.pokeapi.entities.encounters
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
 
 /**
  * EncounterMethod define how you can encounter a Pokemon.
diff --git a/src/main/kotlin/entities/evolution/ChainLink.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/ChainLink.kt
similarity index 89%
rename from src/main/kotlin/entities/evolution/ChainLink.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/evolution/ChainLink.kt
index 0a2e30d..9bf963e 100644
--- a/src/main/kotlin/entities/evolution/ChainLink.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/ChainLink.kt
@@ -1,8 +1,8 @@
-package entities.evolution
+package fr.tykok.pokeapi.entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
 
 /**
  * ChainLink, used to link a Pokemon with this evolution. With this classe you can have
diff --git a/src/main/kotlin/entities/evolution/EvolutionChain.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionChain.kt
similarity index 86%
rename from src/main/kotlin/entities/evolution/EvolutionChain.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionChain.kt
index fec1562..f6a65c0 100644
--- a/src/main/kotlin/entities/evolution/EvolutionChain.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionChain.kt
@@ -1,9 +1,9 @@
-package entities.evolution
+package fr.tykok.pokeapi.entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.items.Item
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.items.Item
 
 /**
  * Evolution chains are essentially family trees.
diff --git a/src/main/kotlin/entities/evolution/EvolutionDetail.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionDetail.kt
similarity index 92%
rename from src/main/kotlin/entities/evolution/EvolutionDetail.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionDetail.kt
index ec1b733..ef2856a 100644
--- a/src/main/kotlin/entities/evolution/EvolutionDetail.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionDetail.kt
@@ -1,12 +1,12 @@
-package entities.evolution
+package fr.tykok.pokeapi.entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.items.Item
-import entities.locations.Location
-import entities.moves.Move
-import entities.pokemon.PokemonSpecies
-import entities.pokemon.Type
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.items.Item
+import fr.tykok.pokeapi.entities.locations.Location
+import fr.tykok.pokeapi.entities.moves.Move
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.pokemon.Type
 
 /**
  * EvolutionDetail define all possibility to make possible the evolution of the Pokemon.
diff --git a/src/main/kotlin/entities/evolution/EvolutionTrigger.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionTrigger.kt
similarity index 81%
rename from src/main/kotlin/entities/evolution/EvolutionTrigger.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionTrigger.kt
index df25d3a..55c59ab 100644
--- a/src/main/kotlin/entities/evolution/EvolutionTrigger.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/evolution/EvolutionTrigger.kt
@@ -1,10 +1,10 @@
-package entities.evolution
+package fr.tykok.pokeapi.entities.evolution
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
 
 /**
  * Evolution triggers are the events and conditions that cause a Pokémon to evolve.
diff --git a/src/main/kotlin/entities/games/Generation.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Generation.kt
similarity index 79%
rename from src/main/kotlin/entities/games/Generation.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/games/Generation.kt
index 0d64948..e17ea17 100644
--- a/src/main/kotlin/entities/games/Generation.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Generation.kt
@@ -1,14 +1,14 @@
-package entities.games
+package fr.tykok.pokeapi.entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.locations.Region
-import entities.moves.Move
-import entities.pokemon.Ability
-import entities.pokemon.PokemonSpecies
-import entities.pokemon.Type
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.locations.Region
+import fr.tykok.pokeapi.entities.moves.Move
+import fr.tykok.pokeapi.entities.pokemon.Ability
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.pokemon.Type
 
 /**
  * A generation is a grouping of the Pokémon games that separates them based on the Pokémon they include.
diff --git a/src/main/kotlin/entities/games/Pokedex.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Pokedex.kt
similarity index 86%
rename from src/main/kotlin/entities/games/Pokedex.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/games/Pokedex.kt
index 4f5314a..44fa6da 100644
--- a/src/main/kotlin/entities/games/Pokedex.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Pokedex.kt
@@ -1,11 +1,11 @@
-package entities.games
+package fr.tykok.pokeapi.entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.locations.Region
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.locations.Region
 
 /**
  * A Pokédex is a handheld electronic encyclopedia device; one which is capable of recording and retaining information
diff --git a/src/main/kotlin/entities/games/PokemonEntry.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/games/PokemonEntry.kt
similarity index 79%
rename from src/main/kotlin/entities/games/PokemonEntry.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/games/PokemonEntry.kt
index e035f40..df7821c 100644
--- a/src/main/kotlin/entities/games/PokemonEntry.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/games/PokemonEntry.kt
@@ -1,8 +1,8 @@
-package entities.games
+package fr.tykok.pokeapi.entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pokedexes">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/games/Version.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Version.kt
similarity index 83%
rename from src/main/kotlin/entities/games/Version.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/games/Version.kt
index 6c1c1fe..a20a3fd 100644
--- a/src/main/kotlin/entities/games/Version.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/games/Version.kt
@@ -1,9 +1,9 @@
-package entities.games
+package fr.tykok.pokeapi.entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Versions of the games, e.g., Red, Blue or Yellow.
diff --git a/src/main/kotlin/entities/games/VersionGroup.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/games/VersionGroup.kt
similarity index 88%
rename from src/main/kotlin/entities/games/VersionGroup.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/games/VersionGroup.kt
index f50f901..566cc62 100644
--- a/src/main/kotlin/entities/games/VersionGroup.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/games/VersionGroup.kt
@@ -1,10 +1,10 @@
-package entities.games
+package fr.tykok.pokeapi.entities.games
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.locations.Region
-import entities.moves.MoveLearnMethod
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.locations.Region
+import fr.tykok.pokeapi.entities.moves.MoveLearnMethod
 
 /**
  * Version groups categorize highly similar versions of the games.
diff --git a/src/main/kotlin/entities/items/Item.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/Item.kt
similarity index 85%
rename from src/main/kotlin/entities/items/Item.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/Item.kt
index 7b24c47..c37aec4 100644
--- a/src/main/kotlin/entities/items/Item.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/Item.kt
@@ -1,15 +1,15 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.APIResource
-import entities.common.GenerationGameIndex
-import entities.common.MachineVersionDetail
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.common.VerboseEffect
-import entities.common.VersionGroupFlavorText
-import entities.evolution.EvolutionChain
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.APIResource
+import fr.tykok.pokeapi.entities.common.GenerationGameIndex
+import fr.tykok.pokeapi.entities.common.MachineVersionDetail
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VerboseEffect
+import fr.tykok.pokeapi.entities.common.VersionGroupFlavorText
+import fr.tykok.pokeapi.entities.evolution.EvolutionChain
 
 /**
  * An item is an object in the games which the player can pick up, keep in their bag, and use in some manner.
diff --git a/src/main/kotlin/entities/items/ItemAttribute.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemAttribute.kt
similarity index 83%
rename from src/main/kotlin/entities/items/ItemAttribute.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemAttribute.kt
index b8f98a2..424ecfb 100644
--- a/src/main/kotlin/entities/items/ItemAttribute.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemAttribute.kt
@@ -1,10 +1,10 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Item attributes define particular aspects of items, e.g. "usable in battle" or "consumable".
diff --git a/src/main/kotlin/entities/items/ItemCategory.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemCategory.kt
similarity index 86%
rename from src/main/kotlin/entities/items/ItemCategory.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemCategory.kt
index 797d45b..d34708b 100644
--- a/src/main/kotlin/entities/items/ItemCategory.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemCategory.kt
@@ -1,9 +1,9 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Item categories determine where items will be placed in the players bag.
diff --git a/src/main/kotlin/entities/items/ItemFlingEffect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemFlingEffect.kt
similarity index 82%
rename from src/main/kotlin/entities/items/ItemFlingEffect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemFlingEffect.kt
index ba6f52f..6ed7e47 100644
--- a/src/main/kotlin/entities/items/ItemFlingEffect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemFlingEffect.kt
@@ -1,9 +1,9 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Effect
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Effect
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * The various effects of the move "Fling" when used with different items.
diff --git a/src/main/kotlin/entities/items/ItemHolderPokemon.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemon.kt
similarity index 81%
rename from src/main/kotlin/entities/items/ItemHolderPokemon.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemon.kt
index 6af1522..e1d2597 100644
--- a/src/main/kotlin/entities/items/ItemHolderPokemon.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemon.kt
@@ -1,8 +1,8 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.pokemon.Pokemon
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.Pokemon
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#itemholderpokemon">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemonVersionDetail.kt
similarity index 77%
rename from src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemonVersionDetail.kt
index faca1a4..dd136e1 100644
--- a/src/main/kotlin/entities/items/ItemHolderPokemonVersionDetail.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemHolderPokemonVersionDetail.kt
@@ -1,7 +1,7 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
-import entities.common.NamedApiResource
-import entities.games.Version
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#itemholderpokemondetail">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/items/ItemPocket.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemPocket.kt
similarity index 84%
rename from src/main/kotlin/entities/items/ItemPocket.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemPocket.kt
index bebbb53..e491599 100644
--- a/src/main/kotlin/entities/items/ItemPocket.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemPocket.kt
@@ -1,9 +1,9 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Pockets within the players bag used for storing items by category.
diff --git a/src/main/kotlin/entities/items/ItemSprites.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemSprites.kt
similarity index 93%
rename from src/main/kotlin/entities/items/ItemSprites.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemSprites.kt
index c9affff..f0d8bd8 100644
--- a/src/main/kotlin/entities/items/ItemSprites.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/items/ItemSprites.kt
@@ -1,4 +1,4 @@
-package entities.items
+package fr.tykok.pokeapi.entities.items
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/locations/EncounterMethodRate.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterMethodRate.kt
similarity index 81%
rename from src/main/kotlin/entities/locations/EncounterMethodRate.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterMethodRate.kt
index 976ddee..d2495c8 100644
--- a/src/main/kotlin/entities/locations/EncounterMethodRate.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterMethodRate.kt
@@ -1,8 +1,8 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.encounters.EncounterMethod
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.encounters.EncounterMethod
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encountermethodrate">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/locations/EncounterVersionDetails.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterVersionDetails.kt
similarity index 79%
rename from src/main/kotlin/entities/locations/EncounterVersionDetails.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterVersionDetails.kt
index 8e4b027..dd9db25 100644
--- a/src/main/kotlin/entities/locations/EncounterVersionDetails.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/EncounterVersionDetails.kt
@@ -1,8 +1,8 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.games.Version
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Version
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#encounterversiondetails">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/locations/Location.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/Location.kt
similarity index 84%
rename from src/main/kotlin/entities/locations/Location.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/Location.kt
index 23b042c..d74bb45 100644
--- a/src/main/kotlin/entities/locations/Location.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/Location.kt
@@ -1,10 +1,10 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.GenerationGameIndex
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.GenerationGameIndex
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Locations that can be visited within the games. Locations make up sizable portions of regions, like cities or routes.
diff --git a/src/main/kotlin/entities/locations/LocationArea.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/LocationArea.kt
similarity index 90%
rename from src/main/kotlin/entities/locations/LocationArea.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/LocationArea.kt
index 0d3bc0b..46f568a 100644
--- a/src/main/kotlin/entities/locations/LocationArea.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/LocationArea.kt
@@ -1,9 +1,9 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Location areas are sections of areas, such as floors in a building or cave.
diff --git a/src/main/kotlin/entities/locations/PalParkArea.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkArea.kt
similarity index 85%
rename from src/main/kotlin/entities/locations/PalParkArea.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkArea.kt
index 39e46da..7713ab7 100644
--- a/src/main/kotlin/entities/locations/PalParkArea.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkArea.kt
@@ -1,8 +1,8 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pal-park-areas">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkEncounterSpecies.kt
similarity index 83%
rename from src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkEncounterSpecies.kt
index 6deefb9..2956e33 100644
--- a/src/main/kotlin/entities/locations/PalParkEncounterSpecies.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PalParkEncounterSpecies.kt
@@ -1,8 +1,8 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#palparkencounterspecies">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/locations/PokemonEncounter.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PokemonEncounter.kt
similarity index 75%
rename from src/main/kotlin/entities/locations/PokemonEncounter.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/PokemonEncounter.kt
index 4882f05..55ba681 100644
--- a/src/main/kotlin/entities/locations/PokemonEncounter.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/PokemonEncounter.kt
@@ -1,9 +1,9 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.common.VersionEncounterDetail
-import entities.pokemon.Pokemon
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VersionEncounterDetail
+import fr.tykok.pokeapi.entities.pokemon.Pokemon
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#pokemonencounter">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/locations/Region.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/Region.kt
similarity index 83%
rename from src/main/kotlin/entities/locations/Region.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/locations/Region.kt
index 9c121dd..8c6d330 100644
--- a/src/main/kotlin/entities/locations/Region.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/locations/Region.kt
@@ -1,12 +1,12 @@
-package entities.locations
+package fr.tykok.pokeapi.entities.locations
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.games.Generation
-import entities.games.Pokedex
-import entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Generation
+import fr.tykok.pokeapi.entities.games.Pokedex
+import fr.tykok.pokeapi.entities.games.VersionGroup
 
 /**
  * A region is an organized area of the Pokémon world. Most often, the main difference between regions is the
diff --git a/src/main/kotlin/entities/machines/Machine.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/machines/Machine.kt
similarity index 79%
rename from src/main/kotlin/entities/machines/Machine.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/machines/Machine.kt
index abdf9f4..e021a02 100644
--- a/src/main/kotlin/entities/machines/Machine.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/machines/Machine.kt
@@ -1,11 +1,11 @@
-package entities.machines
+package fr.tykok.pokeapi.entities.machines
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
-import entities.items.Item
-import entities.moves.Move
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.items.Item
+import fr.tykok.pokeapi.entities.moves.Move
 
 /**
  * Machines are the representation of items that teach moves to Pokémon.
diff --git a/src/main/kotlin/entities/moves/ContestComboDetail.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboDetail.kt
similarity index 86%
rename from src/main/kotlin/entities/moves/ContestComboDetail.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboDetail.kt
index 62598df..694afd6 100644
--- a/src/main/kotlin/entities/moves/ContestComboDetail.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboDetail.kt
@@ -1,7 +1,7 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @see <a href="https://pokeapi.co/docs/v2#contestcombodetail">Documentation of PokeApi</a>
diff --git a/src/main/kotlin/entities/moves/ContestComboSets.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboSets.kt
similarity index 94%
rename from src/main/kotlin/entities/moves/ContestComboSets.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboSets.kt
index 9def88e..e02f1b7 100644
--- a/src/main/kotlin/entities/moves/ContestComboSets.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/ContestComboSets.kt
@@ -1,4 +1,4 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/moves/Move.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/Move.kt
similarity index 88%
rename from src/main/kotlin/entities/moves/Move.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/Move.kt
index 2b115b3..52ca610 100644
--- a/src/main/kotlin/entities/moves/Move.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/Move.kt
@@ -1,17 +1,17 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.APIResource
-import entities.common.MachineVersionDetail
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.common.VerboseEffect
-import entities.contests.ContestType
-import entities.contests.SuperContestEffects
-import entities.games.Generation
-import entities.pokemon.Pokemon
-import entities.pokemon.Type
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.APIResource
+import fr.tykok.pokeapi.entities.common.MachineVersionDetail
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VerboseEffect
+import fr.tykok.pokeapi.entities.contests.ContestType
+import fr.tykok.pokeapi.entities.contests.SuperContestEffects
+import fr.tykok.pokeapi.entities.games.Generation
+import fr.tykok.pokeapi.entities.pokemon.Pokemon
+import fr.tykok.pokeapi.entities.pokemon.Type
 
 /**
  * Moves are the skills of Pokémon in battle. In battle, a Pokémon uses one move each turn.
diff --git a/src/main/kotlin/entities/moves/MoveAilment.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveAilment.kt
similarity index 78%
rename from src/main/kotlin/entities/moves/MoveAilment.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveAilment.kt
index f26fc4d..d69c57b 100644
--- a/src/main/kotlin/entities/moves/MoveAilment.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveAilment.kt
@@ -1,9 +1,9 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveBattleStyle.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveBattleStyle.kt
similarity index 79%
rename from src/main/kotlin/entities/moves/MoveBattleStyle.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveBattleStyle.kt
index 9e65bb6..6d7a847 100644
--- a/src/main/kotlin/entities/moves/MoveBattleStyle.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveBattleStyle.kt
@@ -1,8 +1,8 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveCategory.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveCategory.kt
similarity index 74%
rename from src/main/kotlin/entities/moves/MoveCategory.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveCategory.kt
index 5c820d9..015c19f 100644
--- a/src/main/kotlin/entities/moves/MoveCategory.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveCategory.kt
@@ -1,8 +1,8 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveDamageClass.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveDamageClass.kt
similarity index 78%
rename from src/main/kotlin/entities/moves/MoveDamageClass.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveDamageClass.kt
index 5bb014d..6bea97c 100644
--- a/src/main/kotlin/entities/moves/MoveDamageClass.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveDamageClass.kt
@@ -1,10 +1,10 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveFlavorText.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveFlavorText.kt
similarity index 77%
rename from src/main/kotlin/entities/moves/MoveFlavorText.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveFlavorText.kt
index a255449..8e943bf 100644
--- a/src/main/kotlin/entities/moves/MoveFlavorText.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveFlavorText.kt
@@ -1,9 +1,9 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveLearnMethod.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveLearnMethod.kt
similarity index 76%
rename from src/main/kotlin/entities/moves/MoveLearnMethod.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveLearnMethod.kt
index b793756..e7ca904 100644
--- a/src/main/kotlin/entities/moves/MoveLearnMethod.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveLearnMethod.kt
@@ -1,11 +1,11 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveMetaData.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveMetaData.kt
similarity index 95%
rename from src/main/kotlin/entities/moves/MoveMetaData.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveMetaData.kt
index ee6b18f..5c4b608 100644
--- a/src/main/kotlin/entities/moves/MoveMetaData.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveMetaData.kt
@@ -1,7 +1,7 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveStatChange.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveStatChange.kt
similarity index 73%
rename from src/main/kotlin/entities/moves/MoveStatChange.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveStatChange.kt
index 399258a..305ee0f 100644
--- a/src/main/kotlin/entities/moves/MoveStatChange.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveStatChange.kt
@@ -1,8 +1,8 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.pokemon.Stat
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.pokemon.Stat
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/MoveTarget.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveTarget.kt
similarity index 78%
rename from src/main/kotlin/entities/moves/MoveTarget.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveTarget.kt
index 0ad12a9..4f817d4 100644
--- a/src/main/kotlin/entities/moves/MoveTarget.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/MoveTarget.kt
@@ -1,10 +1,10 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/moves/PastMoveStatValues.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/PastMoveStatValues.kt
similarity index 84%
rename from src/main/kotlin/entities/moves/PastMoveStatValues.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/moves/PastMoveStatValues.kt
index ce84556..94335c6 100644
--- a/src/main/kotlin/entities/moves/PastMoveStatValues.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/moves/PastMoveStatValues.kt
@@ -1,10 +1,10 @@
-package entities.moves
+package fr.tykok.pokeapi.entities.moves
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.common.VerboseEffect
-import entities.games.VersionGroup
-import entities.pokemon.Type
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VerboseEffect
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.pokemon.Type
 
 /**
  * @author Tykok
diff --git a/src/main/kotlin/entities/pokemon/Ability.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Ability.kt
similarity index 82%
rename from src/main/kotlin/entities/pokemon/Ability.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Ability.kt
index fc0d97c..e4b4310 100644
--- a/src/main/kotlin/entities/pokemon/Ability.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Ability.kt
@@ -1,13 +1,13 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.common.VerboseEffect
-import entities.contests.SuperContestEffects
-import entities.games.Generation
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VerboseEffect
+import fr.tykok.pokeapi.entities.contests.SuperContestEffects
+import fr.tykok.pokeapi.entities.games.Generation
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class Ability(
diff --git a/src/main/kotlin/entities/pokemon/AbilityFlavorText.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityFlavorText.kt
similarity index 75%
rename from src/main/kotlin/entities/pokemon/AbilityFlavorText.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityFlavorText.kt
index e7e8c54..a9794ea 100644
--- a/src/main/kotlin/entities/pokemon/AbilityFlavorText.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityFlavorText.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.utility.Language
 
 data class AbilityFlavorText(
     /**
diff --git a/src/main/kotlin/entities/pokemon/AbilityPokemon.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityPokemon.kt
similarity index 86%
rename from src/main/kotlin/entities/pokemon/AbilityPokemon.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityPokemon.kt
index 74a5bec..3cd3334 100644
--- a/src/main/kotlin/entities/pokemon/AbilityPokemon.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AbilityPokemon.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class AbilityPokemon(
     /**
diff --git a/src/main/kotlin/entities/pokemon/AwesomeName.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AwesomeName.kt
similarity index 72%
rename from src/main/kotlin/entities/pokemon/AwesomeName.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AwesomeName.kt
index 9cda11d..26aef69 100644
--- a/src/main/kotlin/entities/pokemon/AwesomeName.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/AwesomeName.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @property awesomeName The localized "scientific" name for an API resource in a specific language.
diff --git a/src/main/kotlin/entities/pokemon/Characteristic.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Characteristic.kt
similarity index 79%
rename from src/main/kotlin/entities/pokemon/Characteristic.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Characteristic.kt
index 51b6f15..ca2611b 100644
--- a/src/main/kotlin/entities/pokemon/Characteristic.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Characteristic.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class Characteristic(
     /**
diff --git a/src/main/kotlin/entities/pokemon/EggGroup.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/EggGroup.kt
similarity index 78%
rename from src/main/kotlin/entities/pokemon/EggGroup.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/EggGroup.kt
index 6a4c5bd..015eede 100644
--- a/src/main/kotlin/entities/pokemon/EggGroup.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/EggGroup.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class EggGroup(
     /**
diff --git a/src/main/kotlin/entities/pokemon/Gender.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Gender.kt
similarity index 85%
rename from src/main/kotlin/entities/pokemon/Gender.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Gender.kt
index 8c0073a..5f21b68 100644
--- a/src/main/kotlin/entities/pokemon/Gender.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Gender.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class Gender(
     /**
diff --git a/src/main/kotlin/entities/pokemon/Genus.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Genus.kt
similarity index 69%
rename from src/main/kotlin/entities/pokemon/Genus.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Genus.kt
index 0a56513..e93b0f5 100644
--- a/src/main/kotlin/entities/pokemon/Genus.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Genus.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.utility.Language
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.utility.Language
 
 /**
  * @property genus The localized genus for the referenced Pokémon species
diff --git a/src/main/kotlin/entities/pokemon/GrowthRate.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRate.kt
similarity index 83%
rename from src/main/kotlin/entities/pokemon/GrowthRate.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRate.kt
index f4be0e4..55e4272 100644
--- a/src/main/kotlin/entities/pokemon/GrowthRate.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRate.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Description
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class GrowthRate(
     /**
diff --git a/src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRateExperienceLevel.kt
similarity index 88%
rename from src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRateExperienceLevel.kt
index ec44ca4..b6bbf4e 100644
--- a/src/main/kotlin/entities/pokemon/GrowthRateExperienceLevel.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/GrowthRateExperienceLevel.kt
@@ -1,4 +1,4 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveBattleStylePreference.kt
similarity index 79%
rename from src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveBattleStylePreference.kt
index 4f1a01a..f90f7c2 100644
--- a/src/main/kotlin/entities/pokemon/MoveBattleStylePreference.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveBattleStylePreference.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.moves.MoveBattleStyle
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.moves.MoveBattleStyle
 
 data class MoveBattleStylePreference(
     /**
diff --git a/src/main/kotlin/entities/pokemon/MoveStatAffect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffect.kt
similarity index 60%
rename from src/main/kotlin/entities/pokemon/MoveStatAffect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffect.kt
index 403e310..b344be3 100644
--- a/src/main/kotlin/entities/pokemon/MoveStatAffect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffect.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
-import entities.common.NamedApiResource
-import entities.moves.Move
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.moves.Move
 
 /**
  * @property change The maximum amount of change to the referenced stat.
diff --git a/src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffectSets.kt
similarity index 90%
rename from src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffectSets.kt
index ca236f9..7109e18 100644
--- a/src/main/kotlin/entities/pokemon/MoveStatAffectSets.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/MoveStatAffectSets.kt
@@ -1,4 +1,4 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/pokemon/Nature.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Nature.kt
similarity index 88%
rename from src/main/kotlin/entities/pokemon/Nature.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Nature.kt
index 6da9cd5..70414e8 100644
--- a/src/main/kotlin/entities/pokemon/Nature.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Nature.kt
@@ -1,10 +1,10 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.berries.BerryFlavor
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.berries.BerryFlavor
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class Nature(
     /**
diff --git a/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffect.kt
similarity index 79%
rename from src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffect.kt
index b3b33ba..4ee7d59 100644
--- a/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffect.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffect.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class NaturePokeathlonStatAffect(
     /**
diff --git a/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffectSets.kt
similarity index 91%
rename from src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffectSets.kt
index 4e80c6c..99a84cd 100644
--- a/src/main/kotlin/entities/pokemon/NaturePokeathlonStatAffectSets.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NaturePokeathlonStatAffectSets.kt
@@ -1,4 +1,4 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatAffectSets.kt
similarity index 80%
rename from src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatAffectSets.kt
index 3bb60a7..8cf5a43 100644
--- a/src/main/kotlin/entities/pokemon/NatureStatAffectSets.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatAffectSets.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @property increase A list of natures and how they change the referenced stat.
diff --git a/src/main/kotlin/entities/pokemon/NatureStatChange.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatChange.kt
similarity index 79%
rename from src/main/kotlin/entities/pokemon/NatureStatChange.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatChange.kt
index 3071077..a651888 100644
--- a/src/main/kotlin/entities/pokemon/NatureStatChange.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/NatureStatChange.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class NatureStatChange(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PalParkEncounterArea.kt
similarity index 85%
rename from src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PalParkEncounterArea.kt
index 0cc095e..93989e2 100644
--- a/src/main/kotlin/entities/pokemon/PalParkEncounterArea.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PalParkEncounterArea.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @property baseScore The base score given to the player when the referenced Pokémon is caught during a pal park run.
diff --git a/src/main/kotlin/entities/pokemon/PokeathlonStat.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokeathlonStat.kt
similarity index 82%
rename from src/main/kotlin/entities/pokemon/PokeathlonStat.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokeathlonStat.kt
index a51fedd..dedddce 100644
--- a/src/main/kotlin/entities/pokemon/PokeathlonStat.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokeathlonStat.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
 
 data class PokeathlonStat(
     /**
diff --git a/src/main/kotlin/entities/pokemon/Pokemon.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Pokemon.kt
similarity index 93%
rename from src/main/kotlin/entities/pokemon/Pokemon.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Pokemon.kt
index 8cef4ba..78a4e5d 100644
--- a/src/main/kotlin/entities/pokemon/Pokemon.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Pokemon.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.common.VersionGameIndex
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VersionGameIndex
 
 data class Pokemon(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonAbility.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonAbility.kt
similarity index 83%
rename from src/main/kotlin/entities/pokemon/PokemonAbility.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonAbility.kt
index 0c4ee69..2458e96 100644
--- a/src/main/kotlin/entities/pokemon/PokemonAbility.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonAbility.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonAbility(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonColor.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonColor.kt
similarity index 77%
rename from src/main/kotlin/entities/pokemon/PokemonColor.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonColor.kt
index 9e84514..208886a 100644
--- a/src/main/kotlin/entities/pokemon/PokemonColor.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonColor.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * A class representing the details of a Pokémon color.
diff --git a/src/main/kotlin/entities/pokemon/PokemonEncounter.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonEncounter.kt
similarity index 71%
rename from src/main/kotlin/entities/pokemon/PokemonEncounter.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonEncounter.kt
index 9d08427..7f19833 100644
--- a/src/main/kotlin/entities/pokemon/PokemonEncounter.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonEncounter.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.common.VersionEncounterDetail
-import entities.locations.LocationArea
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VersionEncounterDetail
+import fr.tykok.pokeapi.entities.locations.LocationArea
 
 /**
  * A class representing the encounter details of a Pokémon.
diff --git a/src/main/kotlin/entities/pokemon/PokemonForm.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonForm.kt
similarity index 90%
rename from src/main/kotlin/entities/pokemon/PokemonForm.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonForm.kt
index f843c12..8c7d7cb 100644
--- a/src/main/kotlin/entities/pokemon/PokemonForm.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonForm.kt
@@ -1,10 +1,10 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
 
 /**
  * A class representing the details of a Pokémon form.
diff --git a/src/main/kotlin/entities/pokemon/PokemonFormSprites.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormSprites.kt
similarity index 93%
rename from src/main/kotlin/entities/pokemon/PokemonFormSprites.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormSprites.kt
index 4b712d5..403c789 100644
--- a/src/main/kotlin/entities/pokemon/PokemonFormSprites.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormSprites.kt
@@ -1,4 +1,4 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/pokemon/PokemonFormType.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormType.kt
similarity index 77%
rename from src/main/kotlin/entities/pokemon/PokemonFormType.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormType.kt
index f1a1dbd..c712fc0 100644
--- a/src/main/kotlin/entities/pokemon/PokemonFormType.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonFormType.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonFormType(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonHabitat.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHabitat.kt
similarity index 64%
rename from src/main/kotlin/entities/pokemon/PokemonHabitat.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHabitat.kt
index 5dcf721..383598a 100644
--- a/src/main/kotlin/entities/pokemon/PokemonHabitat.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHabitat.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonHabitat(
     @JsonProperty("id")
diff --git a/src/main/kotlin/entities/pokemon/PokemonHeldItem.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItem.kt
similarity index 66%
rename from src/main/kotlin/entities/pokemon/PokemonHeldItem.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItem.kt
index 4e3cce2..4daff9a 100644
--- a/src/main/kotlin/entities/pokemon/PokemonHeldItem.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItem.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
-import entities.common.NamedApiResource
-import entities.items.Item
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.items.Item
 
 data class PokemonHeldItem(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItemVersion.kt
similarity index 60%
rename from src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItemVersion.kt
index 46a8c45..b195db5 100644
--- a/src/main/kotlin/entities/pokemon/PokemonHeldItemVersion.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonHeldItemVersion.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
-import entities.common.NamedApiResource
-import entities.games.Version
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Version
 
 data class PokemonHeldItemVersion(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonLocationArea.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonLocationArea.kt
similarity index 51%
rename from src/main/kotlin/entities/pokemon/PokemonLocationArea.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonLocationArea.kt
index 372f053..e27dcc6 100644
--- a/src/main/kotlin/entities/pokemon/PokemonLocationArea.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonLocationArea.kt
@@ -1,10 +1,10 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.NamedApiResource
-import entities.common.VersionEncounterDetail
-import entities.locations.LocationArea
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.VersionEncounterDetail
+import fr.tykok.pokeapi.entities.locations.LocationArea
 
 data class PokemonLocationArea(
     @JsonProperty("location_area")
diff --git a/src/main/kotlin/entities/pokemon/PokemonMove.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMove.kt
similarity index 68%
rename from src/main/kotlin/entities/pokemon/PokemonMove.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMove.kt
index 6cba9e8..39dc0c2 100644
--- a/src/main/kotlin/entities/pokemon/PokemonMove.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMove.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.moves.Move
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.moves.Move
 
 data class PokemonMove(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMoveVersion.kt
similarity index 75%
rename from src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMoveVersion.kt
index 183c79a..86f6e67 100644
--- a/src/main/kotlin/entities/pokemon/PokemonMoveVersion.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonMoveVersion.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.games.VersionGroup
-import entities.moves.MoveLearnMethod
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.moves.MoveLearnMethod
 
 data class PokemonMoveVersion(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonShape.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonShape.kt
similarity index 81%
rename from src/main/kotlin/entities/pokemon/PokemonShape.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonShape.kt
index 410a7b5..c8de86a 100644
--- a/src/main/kotlin/entities/pokemon/PokemonShape.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonShape.kt
@@ -1,9 +1,9 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.Name
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * Represents a shape that a Pokémon species can take on.
diff --git a/src/main/kotlin/entities/pokemon/PokemonSpecies.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpecies.kt
similarity index 84%
rename from src/main/kotlin/entities/pokemon/PokemonSpecies.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpecies.kt
index e7153d4..9b9fbdb 100644
--- a/src/main/kotlin/entities/pokemon/PokemonSpecies.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpecies.kt
@@ -1,13 +1,13 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.APIResource
-import entities.common.Description
-import entities.common.FlavorText
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.games.Generation
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.APIResource
+import fr.tykok.pokeapi.entities.common.Description
+import fr.tykok.pokeapi.entities.common.FlavorText
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Generation
 
 /**
  * Represents a Pokémon species.
diff --git a/src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesDexEntry.kt
similarity index 72%
rename from src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesDexEntry.kt
index 81f4800..6664f26 100644
--- a/src/main/kotlin/entities/pokemon/PokemonSpeciesDexEntry.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesDexEntry.kt
@@ -1,8 +1,8 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
-import entities.games.Pokedex
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Pokedex
 
 /**
  * @property entryNumber The index number within the Pokédex.
diff --git a/src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesGender.kt
similarity index 82%
rename from src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesGender.kt
index 4fb1c34..11662e3 100644
--- a/src/main/kotlin/entities/pokemon/PokemonSpeciesGender.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesGender.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonSpeciesGender(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesVariety.kt
similarity index 77%
rename from src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesVariety.kt
index 5c926f2..bd9db87 100644
--- a/src/main/kotlin/entities/pokemon/PokemonSpeciesVariety.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSpeciesVariety.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 /**
  * @property isDefault Whether this variety is the default variety.
diff --git a/src/main/kotlin/entities/pokemon/PokemonSprites.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSprites.kt
similarity index 97%
rename from src/main/kotlin/entities/pokemon/PokemonSprites.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSprites.kt
index c5bfdde..e43ceb0 100644
--- a/src/main/kotlin/entities/pokemon/PokemonSprites.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonSprites.kt
@@ -1,4 +1,4 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/src/main/kotlin/entities/pokemon/PokemonStat.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonStat.kt
similarity index 81%
rename from src/main/kotlin/entities/pokemon/PokemonStat.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonStat.kt
index 5dd1808..0a32d44 100644
--- a/src/main/kotlin/entities/pokemon/PokemonStat.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonStat.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonStat(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonType.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonType.kt
similarity index 77%
rename from src/main/kotlin/entities/pokemon/PokemonType.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonType.kt
index 6ade101..3cc21a7 100644
--- a/src/main/kotlin/entities/pokemon/PokemonType.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonType.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class PokemonType(
     /**
diff --git a/src/main/kotlin/entities/pokemon/PokemonTypePast.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonTypePast.kt
similarity index 68%
rename from src/main/kotlin/entities/pokemon/PokemonTypePast.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonTypePast.kt
index 74137e4..d93352f 100644
--- a/src/main/kotlin/entities/pokemon/PokemonTypePast.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/PokemonTypePast.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
-import entities.common.NamedApiResource
-import entities.games.Generation
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Generation
 
 data class PokemonTypePast(
     /**
diff --git a/src/main/kotlin/entities/pokemon/Stat.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Stat.kt
similarity index 84%
rename from src/main/kotlin/entities/pokemon/Stat.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Stat.kt
index 61ecc9b..79860f7 100644
--- a/src/main/kotlin/entities/pokemon/Stat.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Stat.kt
@@ -1,11 +1,11 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.APIResource
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.moves.MoveDamageClass
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.APIResource
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.moves.MoveDamageClass
 
 /**
  * A stat refers to an aspect of a Pokémon that is used to represent its strengths and weaknesses. Each Pokémon has
diff --git a/src/main/kotlin/entities/pokemon/Type.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Type.kt
similarity index 66%
rename from src/main/kotlin/entities/pokemon/Type.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Type.kt
index 37c3a79..540b5fa 100644
--- a/src/main/kotlin/entities/pokemon/Type.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/Type.kt
@@ -1,13 +1,13 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.PokeApiObject
-import entities.common.GenerationGameIndex
-import entities.common.Name
-import entities.common.NamedApiResource
-import entities.games.Generation
-import entities.moves.Move
-import entities.moves.MoveDamageClass
+import fr.tykok.pokeapi.entities.PokeApiObject
+import fr.tykok.pokeapi.entities.common.GenerationGameIndex
+import fr.tykok.pokeapi.entities.common.Name
+import fr.tykok.pokeapi.entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.games.Generation
+import fr.tykok.pokeapi.entities.moves.Move
+import fr.tykok.pokeapi.entities.moves.MoveDamageClass
 
 data class Type(
     @JsonProperty("id")
diff --git a/src/main/kotlin/entities/pokemon/TypePokemon.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypePokemon.kt
similarity index 67%
rename from src/main/kotlin/entities/pokemon/TypePokemon.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypePokemon.kt
index d9f2f78..c5a2f74 100644
--- a/src/main/kotlin/entities/pokemon/TypePokemon.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypePokemon.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class TypePokemon(
     @JsonProperty("slot")
diff --git a/src/main/kotlin/entities/pokemon/TypeRelations.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelations.kt
similarity index 85%
rename from src/main/kotlin/entities/pokemon/TypeRelations.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelations.kt
index 3267e07..0a97bae 100644
--- a/src/main/kotlin/entities/pokemon/TypeRelations.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelations.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class TypeRelations(
     @JsonProperty("no_damage_to") val noDamageTo: Array<NamedApiResource<Type>>,
diff --git a/src/main/kotlin/entities/pokemon/TypeRelationsPast.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelationsPast.kt
similarity index 80%
rename from src/main/kotlin/entities/pokemon/TypeRelationsPast.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelationsPast.kt
index 0c0960d..75d67a8 100644
--- a/src/main/kotlin/entities/pokemon/TypeRelationsPast.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/pokemon/TypeRelationsPast.kt
@@ -1,7 +1,7 @@
-package entities.pokemon
+package fr.tykok.pokeapi.entities.pokemon
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.NamedApiResource
+import fr.tykok.pokeapi.entities.common.NamedApiResource
 
 data class TypeRelationsPast(
     /**
diff --git a/src/main/kotlin/entities/utility/Language.kt b/src/main/kotlin/fr/tykok/pokeapi/entities/utility/Language.kt
similarity index 92%
rename from src/main/kotlin/entities/utility/Language.kt
rename to src/main/kotlin/fr/tykok/pokeapi/entities/utility/Language.kt
index a0f4494..ae8d0d5 100644
--- a/src/main/kotlin/entities/utility/Language.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/entities/utility/Language.kt
@@ -1,7 +1,7 @@
-package entities.utility
+package fr.tykok.pokeapi.entities.utility
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import entities.common.Name
+import fr.tykok.pokeapi.entities.common.Name
 
 /**
  * Languages for translations of API resource information.
diff --git a/src/main/kotlin/exception/PokeApiException.kt b/src/main/kotlin/fr/tykok/pokeapi/exception/PokeApiException.kt
similarity index 75%
rename from src/main/kotlin/exception/PokeApiException.kt
rename to src/main/kotlin/fr/tykok/pokeapi/exception/PokeApiException.kt
index 35d8dd2..dcb0fd9 100644
--- a/src/main/kotlin/exception/PokeApiException.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/exception/PokeApiException.kt
@@ -1,4 +1,4 @@
-package exception
+package fr.tykok.pokeapi.exception
 
 import java.lang.Exception
 
diff --git a/src/main/kotlin/exception/UnknownEndpointException.kt b/src/main/kotlin/fr/tykok/pokeapi/exception/UnknownEndpointException.kt
similarity index 65%
rename from src/main/kotlin/exception/UnknownEndpointException.kt
rename to src/main/kotlin/fr/tykok/pokeapi/exception/UnknownEndpointException.kt
index 48562fe..d842478 100644
--- a/src/main/kotlin/exception/UnknownEndpointException.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/exception/UnknownEndpointException.kt
@@ -1,6 +1,6 @@
-package exception
+package fr.tykok.pokeapi.exception
 
-import PokeApi
+import fr.tykok.pokeapi.PokeApi
 
 class UnknownEndpointException(
     className: String
diff --git a/src/main/kotlin/http/EndpointReference.kt b/src/main/kotlin/fr/tykok/pokeapi/http/EndpointReference.kt
similarity index 54%
rename from src/main/kotlin/http/EndpointReference.kt
rename to src/main/kotlin/fr/tykok/pokeapi/http/EndpointReference.kt
index 6ba7a7c..b7e7b40 100644
--- a/src/main/kotlin/http/EndpointReference.kt
+++ b/src/main/kotlin/fr/tykok/pokeapi/http/EndpointReference.kt
@@ -1,54 +1,54 @@
-package http
+package fr.tykok.pokeapi.http
 
-import entities.berries.Berry
-import entities.berries.BerryFirmness
-import entities.berries.BerryFlavor
-import entities.contests.ContestEffect
-import entities.contests.ContestType
-import entities.contests.SuperContestEffects
-import entities.encounters.EncounterCondition
-import entities.encounters.EncounterConditionValue
-import entities.encounters.EncounterMethod
-import entities.evolution.EvolutionChain
-import entities.evolution.EvolutionTrigger
-import entities.games.Generation
-import entities.games.Pokedex
-import entities.games.Version
-import entities.games.VersionGroup
-import entities.items.Item
-import entities.items.ItemAttribute
-import entities.items.ItemCategory
-import entities.items.ItemFlingEffect
-import entities.items.ItemPocket
-import entities.locations.Location
-import entities.locations.LocationArea
-import entities.locations.PalParkArea
-import entities.locations.Region
-import entities.machines.Machine
-import entities.moves.Move
-import entities.moves.MoveAilment
-import entities.moves.MoveBattleStyle
-import entities.moves.MoveCategory
-import entities.moves.MoveDamageClass
-import entities.moves.MoveLearnMethod
-import entities.moves.MoveTarget
-import entities.pokemon.Ability
-import entities.pokemon.Characteristic
-import entities.pokemon.EggGroup
-import entities.pokemon.Gender
-import entities.pokemon.GrowthRate
-import entities.pokemon.Nature
-import entities.pokemon.PokeathlonStat
-import entities.pokemon.Pokemon
-import entities.pokemon.PokemonColor
-import entities.pokemon.PokemonForm
-import entities.pokemon.PokemonHabitat
-import entities.pokemon.PokemonLocationArea
-import entities.pokemon.PokemonShape
-import entities.pokemon.PokemonSpecies
-import entities.pokemon.Stat
-import entities.pokemon.Type
-import exception.UnknownEndpointException
+import fr.tykok.pokeapi.entities.berries.Berry
+import fr.tykok.pokeapi.entities.berries.BerryFirmness
+import fr.tykok.pokeapi.entities.berries.BerryFlavor
+import fr.tykok.pokeapi.entities.contests.ContestEffect
+import fr.tykok.pokeapi.entities.contests.ContestType
+import fr.tykok.pokeapi.entities.contests.SuperContestEffects
+import fr.tykok.pokeapi.entities.encounters.EncounterCondition
+import fr.tykok.pokeapi.entities.encounters.EncounterConditionValue
+import fr.tykok.pokeapi.entities.encounters.EncounterMethod
+import fr.tykok.pokeapi.entities.evolution.EvolutionChain
+import fr.tykok.pokeapi.entities.evolution.EvolutionTrigger
+import fr.tykok.pokeapi.entities.games.Generation
+import fr.tykok.pokeapi.entities.games.Pokedex
+import fr.tykok.pokeapi.entities.games.Version
+import fr.tykok.pokeapi.entities.games.VersionGroup
+import fr.tykok.pokeapi.entities.items.Item
+import fr.tykok.pokeapi.entities.items.ItemAttribute
+import fr.tykok.pokeapi.entities.items.ItemCategory
+import fr.tykok.pokeapi.entities.items.ItemFlingEffect
+import fr.tykok.pokeapi.entities.items.ItemPocket
+import fr.tykok.pokeapi.entities.locations.Location
+import fr.tykok.pokeapi.entities.locations.LocationArea
+import fr.tykok.pokeapi.entities.locations.PalParkArea
+import fr.tykok.pokeapi.entities.locations.Region
+import fr.tykok.pokeapi.entities.machines.Machine
+import fr.tykok.pokeapi.entities.moves.Move
+import fr.tykok.pokeapi.entities.moves.MoveAilment
+import fr.tykok.pokeapi.entities.moves.MoveBattleStyle
+import fr.tykok.pokeapi.entities.moves.MoveCategory
+import fr.tykok.pokeapi.entities.moves.MoveDamageClass
+import fr.tykok.pokeapi.entities.moves.MoveLearnMethod
+import fr.tykok.pokeapi.entities.moves.MoveTarget
+import fr.tykok.pokeapi.entities.pokemon.Ability
+import fr.tykok.pokeapi.entities.pokemon.Characteristic
+import fr.tykok.pokeapi.entities.pokemon.EggGroup
+import fr.tykok.pokeapi.entities.pokemon.Gender
+import fr.tykok.pokeapi.entities.pokemon.GrowthRate
+import fr.tykok.pokeapi.entities.pokemon.Nature
+import fr.tykok.pokeapi.entities.pokemon.PokeathlonStat
+import fr.tykok.pokeapi.entities.pokemon.Pokemon
+import fr.tykok.pokeapi.entities.pokemon.PokemonColor
+import fr.tykok.pokeapi.entities.pokemon.PokemonForm
+import fr.tykok.pokeapi.entities.pokemon.PokemonHabitat
+import fr.tykok.pokeapi.entities.pokemon.PokemonLocationArea
+import fr.tykok.pokeapi.entities.pokemon.PokemonShape
+import fr.tykok.pokeapi.entities.pokemon.PokemonSpecies
+import fr.tykok.pokeapi.entities.pokemon.Stat
+import fr.tykok.pokeapi.entities.pokemon.Type
+import fr.tykok.pokeapi.exception.UnknownEndpointException
 
 inline fun <reified T : Any> getEndpoint(): String {
     val elementType =
diff --git a/src/test/kotlin/Berry.kt b/src/test/kotlin/Berry.kt
deleted file mode 100644
index a1b0ece..0000000
--- a/src/test/kotlin/Berry.kt
+++ /dev/null
@@ -1 +0,0 @@
-class Berry
diff --git a/src/test/kotlin/fr/tykok/pokeapi/BerryTest.kt b/src/test/kotlin/fr/tykok/pokeapi/BerryTest.kt
new file mode 100644
index 0000000..af872ed
--- /dev/null
+++ b/src/test/kotlin/fr/tykok/pokeapi/BerryTest.kt
@@ -0,0 +1,60 @@
+import fr.tykok.pokeapi.PokeApi
+import fr.tykok.pokeapi.entities.berries.Berry
+import io.mockk.every
+import io.mockk.mockk
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Response
+import okhttp3.ResponseBody.Companion.toResponseBody
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertInstanceOf
+import org.junit.jupiter.api.Test
+
+class BerryTest {
+
+    @Test
+    fun `When try to get a berry with an existing id, then should return a berry `() {
+        // Given
+        val id = 1
+        val responseMock = mockk<Response>()
+        every { OkHttpClient().newCall(any()).execute() } returns responseMock
+        every { responseMock.body } returns ("{\n" +
+            "  \"id\": 1,\n" +
+            "  \"name\": \"cheri\",\n" +
+            "  \"growth_time\": 3,\n" +
+            "  \"max_harvest\": 5,\n" +
+            "  \"natural_gift_power\": 60,\n" +
+            "  \"size\": 20,\n" +
+            "  \"smoothness\": 25,\n" +
+            "  \"soil_dryness\": 15,\n" +
+            "  \"firmness\": {\n" +
+            "    \"name\": \"soft\",\n" +
+            "    \"url\": \"https://pokeapi.co/api/v2/berry-firmness/2/\"\n" +
+            "  },\n" +
+            "  \"flavors\": [\n" +
+            "    {\n" +
+            "      \"potency\": 10,\n" +
+            "      \"flavor\": {\n" +
+            "        \"name\": \"spicy\",\n" +
+            "        \"url\": \"https://pokeapi.co/api/v2/berry-flavor/1/\"\n" +
+            "      }\n" +
+            "    }\n" +
+            "  ],\n" +
+            "  \"item\": {\n" +
+            "    \"name\": \"cheri-berry\",\n" +
+            "    \"url\": \"https://pokeapi.co/api/v2/item/126/\"\n" +
+            "  },\n" +
+            "  \"natural_gift_type\": {\n" +
+            "    \"name\": \"fire\",\n" +
+            "    \"url\": \"https://pokeapi.co/api/v2/type/10/\"\n" +
+            "  }\n" +
+            "}"
+            ).toResponseBody("application/json".toMediaType())
+
+        // When
+        val berry = PokeApi.get<Berry>(1)
+        // Then
+        assertInstanceOf(Berry::class.java, berry)
+        assertEquals(id, berry.id)
+    }
+}