diff --git a/src/main/java/fr/uca/iut/codecs/move/MoveCodec.java b/src/main/java/fr/uca/iut/codecs/move/MoveCodec.java
index 13b7ec8..0728262 100644
--- a/src/main/java/fr/uca/iut/codecs/move/MoveCodec.java
+++ b/src/main/java/fr/uca/iut/codecs/move/MoveCodec.java
@@ -4,7 +4,7 @@ import com.mongodb.MongoClientSettings;
 import fr.uca.iut.codecs.GenericCodec;
 import fr.uca.iut.codecs.type.TypeCodecUtil;
 import fr.uca.iut.entities.Move;
-import fr.uca.iut.entities.Type;
+import fr.uca.iut.entities.embedded.Type;
 import fr.uca.iut.utils.enums.MoveCategoryName;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
diff --git a/src/main/java/fr/uca/iut/codecs/pokemong/PokemongCodec.java b/src/main/java/fr/uca/iut/codecs/pokemong/PokemongCodec.java
index 4d65c23..b74f044 100644
--- a/src/main/java/fr/uca/iut/codecs/pokemong/PokemongCodec.java
+++ b/src/main/java/fr/uca/iut/codecs/pokemong/PokemongCodec.java
@@ -4,8 +4,8 @@ import com.mongodb.MongoClientSettings;
 import fr.uca.iut.codecs.GenericCodec;
 import fr.uca.iut.codecs.type.TypeCodecUtil;
 import fr.uca.iut.entities.Pokemong;
-import fr.uca.iut.entities.PokemongMove;
-import fr.uca.iut.entities.Type;
+import fr.uca.iut.entities.denormalized.PokemongMove;
+import fr.uca.iut.entities.embedded.Type;
 import fr.uca.iut.utils.enums.PokemongName;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
diff --git a/src/main/java/fr/uca/iut/codecs/trainer/TrainerCodec.java b/src/main/java/fr/uca/iut/codecs/trainer/TrainerCodec.java
index f9c0041..3ca1807 100644
--- a/src/main/java/fr/uca/iut/codecs/trainer/TrainerCodec.java
+++ b/src/main/java/fr/uca/iut/codecs/trainer/TrainerCodec.java
@@ -3,7 +3,7 @@ package fr.uca.iut.codecs.trainer;
 import com.mongodb.MongoClientSettings;
 import fr.uca.iut.codecs.GenericCodec;
 import fr.uca.iut.entities.Trainer;
-import fr.uca.iut.entities.TrainerPokemong;
+import fr.uca.iut.entities.denormalized.TrainerPokemong;
 import fr.uca.iut.utils.enums.PokemongName;
 import org.bson.BsonReader;
 import org.bson.BsonWriter;
diff --git a/src/main/java/fr/uca/iut/codecs/type/TypeCodecUtil.java b/src/main/java/fr/uca/iut/codecs/type/TypeCodecUtil.java
index bd45965..89cd1e8 100644
--- a/src/main/java/fr/uca/iut/codecs/type/TypeCodecUtil.java
+++ b/src/main/java/fr/uca/iut/codecs/type/TypeCodecUtil.java
@@ -1,6 +1,6 @@
 package fr.uca.iut.codecs.type;
 
-import fr.uca.iut.entities.Type;
+import fr.uca.iut.entities.embedded.Type;
 import fr.uca.iut.utils.enums.TypeName;
 import org.bson.Document;
 
diff --git a/src/main/java/fr/uca/iut/entities/Move.java b/src/main/java/fr/uca/iut/entities/Move.java
index da98c37..b25cd45 100644
--- a/src/main/java/fr/uca/iut/entities/Move.java
+++ b/src/main/java/fr/uca/iut/entities/Move.java
@@ -1,55 +1,56 @@
-package fr.uca.iut.entities;
-
-import fr.uca.iut.utils.enums.MoveCategoryName;
-
-public class Move extends GenericEntity {
-    public static final String COLLECTION_NAME = "moves";
-
-    private String name;
-    private MoveCategoryName category;
-    private Integer power;
-    private Integer accuracy;
-    private Type type;
-
-    public Move() {}
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public MoveCategoryName getCategory() {
-        return category;
-    }
-
-    public void setCategory(MoveCategoryName category) {
-        this.category = category;
-    }
-
-    public Integer getPower() {
-        return power;
-    }
-
-    public void setPower(Integer power) {
-        this.power = power;
-    }
-
-    public Integer getAccuracy() {
-        return accuracy;
-    }
-
-    public void setAccuracy(Integer accuracy) {
-        this.accuracy = accuracy;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setType(Type type) {
-        this.type = type;
-    }
+package fr.uca.iut.entities;
+
+import fr.uca.iut.entities.embedded.Type;
+import fr.uca.iut.utils.enums.MoveCategoryName;
+
+public class Move extends GenericEntity {
+    public static final String COLLECTION_NAME = "moves";
+
+    private String name;
+    private MoveCategoryName category;
+    private Integer power;
+    private Integer accuracy;
+    private Type type;
+
+    public Move() {}
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public MoveCategoryName getCategory() {
+        return category;
+    }
+
+    public void setCategory(MoveCategoryName category) {
+        this.category = category;
+    }
+
+    public Integer getPower() {
+        return power;
+    }
+
+    public void setPower(Integer power) {
+        this.power = power;
+    }
+
+    public Integer getAccuracy() {
+        return accuracy;
+    }
+
+    public void setAccuracy(Integer accuracy) {
+        this.accuracy = accuracy;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/fr/uca/iut/entities/Pokemong.java b/src/main/java/fr/uca/iut/entities/Pokemong.java
index 1acd9e4..3645a6e 100644
--- a/src/main/java/fr/uca/iut/entities/Pokemong.java
+++ b/src/main/java/fr/uca/iut/entities/Pokemong.java
@@ -1,6 +1,8 @@
 package fr.uca.iut.entities;
 
 import com.mongodb.lang.Nullable;
+import fr.uca.iut.entities.denormalized.PokemongMove;
+import fr.uca.iut.entities.embedded.Type;
 import fr.uca.iut.utils.enums.PokemongName;
 
 import java.time.LocalDate;
diff --git a/src/main/java/fr/uca/iut/entities/Trainer.java b/src/main/java/fr/uca/iut/entities/Trainer.java
index 6586349..ea2fef7 100644
--- a/src/main/java/fr/uca/iut/entities/Trainer.java
+++ b/src/main/java/fr/uca/iut/entities/Trainer.java
@@ -1,5 +1,7 @@
 package fr.uca.iut.entities;
 
+import fr.uca.iut.entities.denormalized.TrainerPokemong;
+
 import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/main/java/fr/uca/iut/entities/PokemongMove.java b/src/main/java/fr/uca/iut/entities/denormalized/PokemongMove.java
similarity index 73%
rename from src/main/java/fr/uca/iut/entities/PokemongMove.java
rename to src/main/java/fr/uca/iut/entities/denormalized/PokemongMove.java
index 13c4c31..a9da590 100644
--- a/src/main/java/fr/uca/iut/entities/PokemongMove.java
+++ b/src/main/java/fr/uca/iut/entities/denormalized/PokemongMove.java
@@ -1,16 +1,18 @@
-package fr.uca.iut.entities;
-
-public class PokemongMove extends GenericEntity {
-
-    private String name;
-
-    public PokemongMove() {}
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
+package fr.uca.iut.entities.denormalized;
+
+import fr.uca.iut.entities.GenericEntity;
+
+public class PokemongMove extends GenericEntity {
+
+    private String name;
+
+    public PokemongMove() {}
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/src/main/java/fr/uca/iut/entities/TrainerPokemong.java b/src/main/java/fr/uca/iut/entities/denormalized/TrainerPokemong.java
similarity index 87%
rename from src/main/java/fr/uca/iut/entities/TrainerPokemong.java
rename to src/main/java/fr/uca/iut/entities/denormalized/TrainerPokemong.java
index f63fcb5..b44bb88 100644
--- a/src/main/java/fr/uca/iut/entities/TrainerPokemong.java
+++ b/src/main/java/fr/uca/iut/entities/denormalized/TrainerPokemong.java
@@ -1,6 +1,7 @@
-package fr.uca.iut.entities;
+package fr.uca.iut.entities.denormalized;
 
 import com.mongodb.lang.Nullable;
+import fr.uca.iut.entities.GenericEntity;
 import fr.uca.iut.utils.enums.PokemongName;
 
 public class TrainerPokemong extends GenericEntity {
diff --git a/src/main/java/fr/uca/iut/entities/Type.java b/src/main/java/fr/uca/iut/entities/embedded/Type.java
similarity index 94%
rename from src/main/java/fr/uca/iut/entities/Type.java
rename to src/main/java/fr/uca/iut/entities/embedded/Type.java
index f9e3022..5af9d0d 100644
--- a/src/main/java/fr/uca/iut/entities/Type.java
+++ b/src/main/java/fr/uca/iut/entities/embedded/Type.java
@@ -1,56 +1,56 @@
-package fr.uca.iut.entities;
-
-import fr.uca.iut.utils.enums.TypeName;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-public class Type {
-
-    private TypeName name;
-    private List<TypeName> weakAgainst;
-    private List<TypeName> effectiveAgainst;
-
-    public Type() {}
-
-    public TypeName getName() {
-        return name;
-    }
-
-    public void setName(TypeName name) {
-        this.name = name;
-    }
-
-    public List<TypeName> getWeakAgainst() {
-        return Collections.unmodifiableList(weakAgainst);
-    }
-
-    public void setWeakAgainst(List<TypeName> weakAgainst) {
-        this.weakAgainst = weakAgainst;
-    }
-
-    public List<TypeName> getEffectiveAgainst() {
-        return Collections.unmodifiableList(effectiveAgainst);
-    }
-
-    public void setEffectiveAgainst(List<TypeName> effectiveAgainst) {
-        this.effectiveAgainst = effectiveAgainst;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, weakAgainst, effectiveAgainst);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Type type = (Type) o;
-        return Objects.equals(name, type.name) &&
-               Objects.equals(weakAgainst, type.weakAgainst) &&
-               Objects.equals(effectiveAgainst, type.effectiveAgainst);
-    }
-
+package fr.uca.iut.entities.embedded;
+
+import fr.uca.iut.utils.enums.TypeName;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+public class Type {
+
+    private TypeName name;
+    private List<TypeName> weakAgainst;
+    private List<TypeName> effectiveAgainst;
+
+    public Type() {}
+
+    public TypeName getName() {
+        return name;
+    }
+
+    public void setName(TypeName name) {
+        this.name = name;
+    }
+
+    public List<TypeName> getWeakAgainst() {
+        return Collections.unmodifiableList(weakAgainst);
+    }
+
+    public void setWeakAgainst(List<TypeName> weakAgainst) {
+        this.weakAgainst = weakAgainst;
+    }
+
+    public List<TypeName> getEffectiveAgainst() {
+        return Collections.unmodifiableList(effectiveAgainst);
+    }
+
+    public void setEffectiveAgainst(List<TypeName> effectiveAgainst) {
+        this.effectiveAgainst = effectiveAgainst;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, weakAgainst, effectiveAgainst);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Type type = (Type) o;
+        return Objects.equals(name, type.name) &&
+               Objects.equals(weakAgainst, type.weakAgainst) &&
+               Objects.equals(effectiveAgainst, type.effectiveAgainst);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/fr/uca/iut/services/PokemongService.java b/src/main/java/fr/uca/iut/services/PokemongService.java
index ae9afd9..42c6d31 100644
--- a/src/main/java/fr/uca/iut/services/PokemongService.java
+++ b/src/main/java/fr/uca/iut/services/PokemongService.java
@@ -2,6 +2,9 @@ package fr.uca.iut.services;
 
 import com.mongodb.lang.Nullable;
 import fr.uca.iut.entities.*;
+import fr.uca.iut.entities.denormalized.PokemongMove;
+import fr.uca.iut.entities.denormalized.TrainerPokemong;
+import fr.uca.iut.entities.embedded.Type;
 import fr.uca.iut.repositories.PokemongRepository;
 import fr.uca.iut.utils.StringUtils;
 import fr.uca.iut.utils.enums.PokemongName;
diff --git a/src/main/java/fr/uca/iut/services/TrainerService.java b/src/main/java/fr/uca/iut/services/TrainerService.java
index 65d8a88..5817a99 100644
--- a/src/main/java/fr/uca/iut/services/TrainerService.java
+++ b/src/main/java/fr/uca/iut/services/TrainerService.java
@@ -3,7 +3,7 @@ package fr.uca.iut.services;
 import com.mongodb.lang.Nullable;
 import fr.uca.iut.entities.Pokemong;
 import fr.uca.iut.entities.Trainer;
-import fr.uca.iut.entities.TrainerPokemong;
+import fr.uca.iut.entities.denormalized.TrainerPokemong;
 import fr.uca.iut.repositories.TrainerRepository;
 import fr.uca.iut.utils.StringUtils;
 import fr.uca.iut.utils.exceptions.NonValidEntityException;