diff --git a/DB_MIGRATION.md b/DB_MIGRATION.md
index 6f36c94af..1c1584dc3 100644
--- a/DB_MIGRATION.md
+++ b/DB_MIGRATION.md
@@ -1,6 +1,6 @@
 # DB Migration 🔀
 
-By using the Java Persistence API (JPA), classed annotated by `@Entity` (in the [`model`](src/main/java/ai/elimu/model) package) get mapped automatically to database tables/columns: [`src/main/resources/META-INF/jpa-persistence.xml`](https://github.com/elimu-ai/webapp/blob/main/src/main/resources/META-INF/jpa-persistence.xml)
+By using the Java Persistence API (JPA), classed annotated by `@Entity` (in the [`model`](src/main/java/ai/elimu/entity) package) get mapped automatically to database tables/columns: [`src/main/resources/META-INF/jpa-persistence.xml`](https://github.com/elimu-ai/webapp/blob/main/src/main/resources/META-INF/jpa-persistence.xml)
 
 > [!IMPORTANT]
 > However, when _deleting, modifying or renaming_ an entity class/attribute, we have to manually update the underlying database structure.
diff --git a/src/main/java/ai/elimu/dao/ApplicationDao.java b/src/main/java/ai/elimu/dao/ApplicationDao.java
index 8adb1b58b..d4de53a84 100644
--- a/src/main/java/ai/elimu/dao/ApplicationDao.java
+++ b/src/main/java/ai/elimu/dao/ApplicationDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 
diff --git a/src/main/java/ai/elimu/dao/ApplicationVersionDao.java b/src/main/java/ai/elimu/dao/ApplicationVersionDao.java
index fa3a5916b..6a4e6fa31 100644
--- a/src/main/java/ai/elimu/dao/ApplicationVersionDao.java
+++ b/src/main/java/ai/elimu/dao/ApplicationVersionDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/AudioContributionEventDao.java b/src/main/java/ai/elimu/dao/AudioContributionEventDao.java
index b7fbe6e33..a2f91525b 100644
--- a/src/main/java/ai/elimu/dao/AudioContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/AudioContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.AudioContributionEvent;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.AudioContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/AudioDao.java b/src/main/java/ai/elimu/dao/AudioDao.java
index d3dc5494b..2211ade91 100644
--- a/src/main/java/ai/elimu/dao/AudioDao.java
+++ b/src/main/java/ai/elimu/dao/AudioDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import java.util.List;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java
index 25a65c5c3..de536e206 100644
--- a/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java
+++ b/src/main/java/ai/elimu/dao/AudioPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.AudioPeerReviewEvent;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.AudioPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/ContributorDao.java b/src/main/java/ai/elimu/dao/ContributorDao.java
index 67623e3a8..af40fda38 100644
--- a/src/main/java/ai/elimu/dao/ContributorDao.java
+++ b/src/main/java/ai/elimu/dao/ContributorDao.java
@@ -5,7 +5,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 
 public interface ContributorDao extends GenericDao<Contributor> {
 	
diff --git a/src/main/java/ai/elimu/dao/DbMigrationDao.java b/src/main/java/ai/elimu/dao/DbMigrationDao.java
index 84ae77cc7..74b5b552e 100644
--- a/src/main/java/ai/elimu/dao/DbMigrationDao.java
+++ b/src/main/java/ai/elimu/dao/DbMigrationDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.DbMigration;
+import ai.elimu.entity.DbMigration;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/DeviceDao.java b/src/main/java/ai/elimu/dao/DeviceDao.java
index 482c2543c..ad79cf1d6 100644
--- a/src/main/java/ai/elimu/dao/DeviceDao.java
+++ b/src/main/java/ai/elimu/dao/DeviceDao.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.Device;
+import ai.elimu.entity.Device;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/EmojiDao.java b/src/main/java/ai/elimu/dao/EmojiDao.java
index 087454345..f714c094c 100644
--- a/src/main/java/ai/elimu/dao/EmojiDao.java
+++ b/src/main/java/ai/elimu/dao/EmojiDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/ImageContributionEventDao.java b/src/main/java/ai/elimu/dao/ImageContributionEventDao.java
index abe403d44..1d3f9b958 100644
--- a/src/main/java/ai/elimu/dao/ImageContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/ImageContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/ImageDao.java b/src/main/java/ai/elimu/dao/ImageDao.java
index 5638ae9fc..a0a8d25fd 100644
--- a/src/main/java/ai/elimu/dao/ImageDao.java
+++ b/src/main/java/ai/elimu/dao/ImageDao.java
@@ -1,11 +1,11 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 
 public interface ImageDao extends GenericDao<Image> {
 	
diff --git a/src/main/java/ai/elimu/dao/LetterContributionEventDao.java b/src/main/java/ai/elimu/dao/LetterContributionEventDao.java
index 6d22f0c20..e8164ff4c 100644
--- a/src/main/java/ai/elimu/dao/LetterContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/LetterContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterContributionEvent;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/LetterDao.java b/src/main/java/ai/elimu/dao/LetterDao.java
index 1da19c6b5..19d12c49e 100644
--- a/src/main/java/ai/elimu/dao/LetterDao.java
+++ b/src/main/java/ai/elimu/dao/LetterDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/LetterLearningEventDao.java b/src/main/java/ai/elimu/dao/LetterLearningEventDao.java
index 5e5790856..d6cb8f4be 100644
--- a/src/main/java/ai/elimu/dao/LetterLearningEventDao.java
+++ b/src/main/java/ai/elimu/dao/LetterLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.LetterLearningEvent;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.LetterLearningEvent;
+import ai.elimu.entity.content.Letter;
 import java.util.Calendar;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java b/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java
index 088558de9..d9ea6aad2 100644
--- a/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/LetterSoundContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/LetterSoundDao.java b/src/main/java/ai/elimu/dao/LetterSoundDao.java
index 7c60bffab..e5c29378d 100644
--- a/src/main/java/ai/elimu/dao/LetterSoundDao.java
+++ b/src/main/java/ai/elimu/dao/LetterSoundDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import java.util.List;
 
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java
index 196e4aee6..15a56c205 100644
--- a/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java
+++ b/src/main/java/ai/elimu/dao/LetterSoundPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondencePeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/NumberContributionEventDao.java b/src/main/java/ai/elimu/dao/NumberContributionEventDao.java
index 8e19f1602..6cb7ff0cc 100644
--- a/src/main/java/ai/elimu/dao/NumberContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/NumberContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/NumberDao.java b/src/main/java/ai/elimu/dao/NumberDao.java
index 612ec0ddd..5f964991b 100644
--- a/src/main/java/ai/elimu/dao/NumberDao.java
+++ b/src/main/java/ai/elimu/dao/NumberDao.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java
index 083cb8f56..addccb0d7 100644
--- a/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java
+++ b/src/main/java/ai/elimu/dao/NumberPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/SoundContributionEventDao.java b/src/main/java/ai/elimu/dao/SoundContributionEventDao.java
index c1349c80c..c21955dfd 100644
--- a/src/main/java/ai/elimu/dao/SoundContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/SoundContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.SoundContributionEvent;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.SoundContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/SoundDao.java b/src/main/java/ai/elimu/dao/SoundDao.java
index e31fa5bd1..f01540dfb 100644
--- a/src/main/java/ai/elimu/dao/SoundDao.java
+++ b/src/main/java/ai/elimu/dao/SoundDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/StoryBookChapterDao.java b/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
index def6ea6c2..68cf7449f 100644
--- a/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java b/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java
index acbddd3e4..0af40d9b6 100644
--- a/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/StoryBookDao.java b/src/main/java/ai/elimu/dao/StoryBookDao.java
index 53b00aa57..77d710ed8 100644
--- a/src/main/java/ai/elimu/dao/StoryBookDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.content.StoryBook;
 
 import ai.elimu.model.v2.enums.ReadingLevel;
 
diff --git a/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java b/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java
index b2f252cc9..119c14424 100644
--- a/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.StoryBook;
 import java.util.Calendar;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java b/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
index 5dbb99731..ba5e1d922 100644
--- a/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java
index 6a6582b12..266230af9 100644
--- a/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/SyllableDao.java b/src/main/java/ai/elimu/dao/SyllableDao.java
index c07b027fa..265784a7c 100644
--- a/src/main/java/ai/elimu/dao/SyllableDao.java
+++ b/src/main/java/ai/elimu/dao/SyllableDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.Syllable;
+import ai.elimu.entity.content.Syllable;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/VideoDao.java b/src/main/java/ai/elimu/dao/VideoDao.java
index 75e630b2e..6941fb0f8 100644
--- a/src/main/java/ai/elimu/dao/VideoDao.java
+++ b/src/main/java/ai/elimu/dao/VideoDao.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
 import java.util.List;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/WordContributionEventDao.java b/src/main/java/ai/elimu/dao/WordContributionEventDao.java
index dce673839..3a26a1c6c 100644
--- a/src/main/java/ai/elimu/dao/WordContributionEventDao.java
+++ b/src/main/java/ai/elimu/dao/WordContributionEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/WordDao.java b/src/main/java/ai/elimu/dao/WordDao.java
index 4b9f0f2e7..491caf26b 100644
--- a/src/main/java/ai/elimu/dao/WordDao.java
+++ b/src/main/java/ai/elimu/dao/WordDao.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 import ai.elimu.model.v2.enums.content.WordType;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/WordLearningEventDao.java b/src/main/java/ai/elimu/dao/WordLearningEventDao.java
index add068d9b..46ce04ea2 100644
--- a/src/main/java/ai/elimu/dao/WordLearningEventDao.java
+++ b/src/main/java/ai/elimu/dao/WordLearningEventDao.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.WordLearningEvent;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.WordLearningEvent;
+import ai.elimu.entity.content.Word;
 import java.util.Calendar;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java b/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java
index 2617a31d6..86890e0de 100644
--- a/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java
+++ b/src/main/java/ai/elimu/dao/WordPeerReviewEventDao.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java
index 2f42f5e80..8b13366f2 100644
--- a/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/ApplicationDaoJpa.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import javax.persistence.NoResultException;
 import ai.elimu.dao.ApplicationDao;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java
index 5e9a48b57..6cc43f586 100644
--- a/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/ApplicationVersionDaoJpa.java
@@ -3,8 +3,8 @@
 import java.util.List;
 import javax.persistence.NoResultException;
 import ai.elimu.dao.ApplicationVersionDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java
index 96fa37d05..9d3d44584 100644
--- a/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/AudioContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.AudioContributionEvent;
 import ai.elimu.dao.AudioContributionEventDao;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java
index 7cf3ef27f..1521bf5e8 100644
--- a/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/AudioDaoJpa.java
@@ -4,12 +4,12 @@
 
 import javax.persistence.NoResultException;
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 
 public class AudioDaoJpa extends GenericDaoJpa<Audio> implements AudioDao {
     
diff --git a/src/main/java/ai/elimu/dao/jpa/AudioPeerReviewEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/AudioPeerReviewEventDaoJpa.java
index 1ddebcf1d..d0cb794be 100644
--- a/src/main/java/ai/elimu/dao/jpa/AudioPeerReviewEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/AudioPeerReviewEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.AudioPeerReviewEventDao;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.AudioPeerReviewEvent;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.AudioPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import javax.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java
index 098249a03..7331b95d5 100644
--- a/src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/ContributorDaoJpa.java
@@ -7,7 +7,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 
 public class ContributorDaoJpa extends GenericDaoJpa<Contributor> implements ContributorDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/DbMigrationDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/DbMigrationDaoJpa.java
index 26f28efb0..3ba645db7 100644
--- a/src/main/java/ai/elimu/dao/jpa/DbMigrationDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/DbMigrationDaoJpa.java
@@ -6,7 +6,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.DbMigration;
+import ai.elimu.entity.DbMigration;
 
 public class DbMigrationDaoJpa extends GenericDaoJpa<DbMigration> implements DbMigrationDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/DeviceDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/DeviceDaoJpa.java
index 7a22d872e..18acd0ad1 100644
--- a/src/main/java/ai/elimu/dao/jpa/DeviceDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/DeviceDaoJpa.java
@@ -5,7 +5,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.Device;
+import ai.elimu.entity.Device;
 
 public class DeviceDaoJpa extends GenericDaoJpa<Device> implements DeviceDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/EmojiDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/EmojiDaoJpa.java
index be58c4aca..18e2f3c1e 100644
--- a/src/main/java/ai/elimu/dao/jpa/EmojiDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/EmojiDaoJpa.java
@@ -6,8 +6,8 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 
 public class EmojiDaoJpa extends GenericDaoJpa<Emoji> implements EmojiDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/ImageContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ImageContributionEventDaoJpa.java
index a079e09c2..744104c60 100644
--- a/src/main/java/ai/elimu/dao/jpa/ImageContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/ImageContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.ImageContributionEvent;
+import ai.elimu.entity.contributor.ImageContributionEvent;
 import ai.elimu.dao.ImageContributionEventDao;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/ImageDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/ImageDaoJpa.java
index 8c3a5cba7..d9386b6d2 100644
--- a/src/main/java/ai/elimu/dao/jpa/ImageDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/ImageDaoJpa.java
@@ -6,9 +6,9 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import ai.elimu.dao.ImageDao;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 public class ImageDaoJpa extends GenericDaoJpa<Image> implements ImageDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterContributionEventDaoJpa.java
index fffc7596e..60cd19fe5 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.LetterContributionEvent;
+import ai.elimu.entity.contributor.LetterContributionEvent;
 import ai.elimu.dao.LetterContributionEventDao;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterDaoJpa.java
index db391ef9e..16be04ebb 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterDaoJpa.java
@@ -6,7 +6,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 
 public class LetterDaoJpa extends GenericDaoJpa<Letter> implements LetterDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterLearningEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterLearningEventDaoJpa.java
index cfd7fc876..af9edca12 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterLearningEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterLearningEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.LetterLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.LetterLearningEvent;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.LetterLearningEvent;
+import ai.elimu.entity.content.Letter;
 import java.util.Calendar;
 import javax.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterSoundContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterSoundContributionEventDaoJpa.java
index 142ada98d..c5b48b4ea 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterSoundContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterSoundContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
 import ai.elimu.dao.LetterSoundContributionEventDao;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterSoundDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterSoundDaoJpa.java
index 7d0dbc941..d10e5eacb 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterSoundDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterSoundDaoJpa.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/jpa/LetterSoundPeerReviewEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/LetterSoundPeerReviewEventDaoJpa.java
index 4bf88d2ed..78f13ccf8 100644
--- a/src/main/java/ai/elimu/dao/jpa/LetterSoundPeerReviewEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/LetterSoundPeerReviewEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.LetterSoundPeerReviewEventDao;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondencePeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/NumberContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/NumberContributionEventDaoJpa.java
index cd5bf4212..61067874b 100644
--- a/src/main/java/ai/elimu/dao/jpa/NumberContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/NumberContributionEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberContributionEvent;
 import ai.elimu.dao.NumberContributionEventDao;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/NumberDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/NumberDaoJpa.java
index efca11db8..e30c9f4fb 100644
--- a/src/main/java/ai/elimu/dao/jpa/NumberDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/NumberDaoJpa.java
@@ -5,7 +5,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 import ai.elimu.dao.NumberDao;
 
 public class NumberDaoJpa extends GenericDaoJpa<Number> implements NumberDao {
diff --git a/src/main/java/ai/elimu/dao/jpa/NumberPeerReviewEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/NumberPeerReviewEventDaoJpa.java
index 25d620352..0234f7c9d 100644
--- a/src/main/java/ai/elimu/dao/jpa/NumberPeerReviewEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/NumberPeerReviewEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.NumberPeerReviewEventDao;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/SoundContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/SoundContributionEventDaoJpa.java
index 26a183fa6..ed39bda54 100644
--- a/src/main/java/ai/elimu/dao/jpa/SoundContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/SoundContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.SoundContributionEvent;
+import ai.elimu.entity.contributor.SoundContributionEvent;
 import ai.elimu.dao.SoundContributionEventDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/SoundDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/SoundDaoJpa.java
index cbd7bb172..65859692c 100644
--- a/src/main/java/ai/elimu/dao/jpa/SoundDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/SoundDaoJpa.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import javax.persistence.NoResultException;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 
 import org.springframework.dao.DataAccessException;
 import ai.elimu.dao.SoundDao;
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookChapterDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookChapterDaoJpa.java
index ac4f71af5..c49a7a8d2 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookChapterDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookChapterDaoJpa.java
@@ -5,8 +5,8 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
 
 public class StoryBookChapterDaoJpa extends GenericDaoJpa<StoryBookChapter> implements StoryBookChapterDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookContributionEventDaoJpa.java
index ca3f6d906..f5d67ae28 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
 import ai.elimu.dao.StoryBookContributionEventDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java
index 96fd8d67b..e9622d58c 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookDaoJpa.java
@@ -6,7 +6,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.content.StoryBook;
 import ai.elimu.model.v2.enums.ReadingLevel;
 
 public class StoryBookDaoJpa extends GenericDaoJpa<StoryBook> implements StoryBookDao {
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookLearningEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookLearningEventDaoJpa.java
index 8d9e5c434..f660ef372 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookLearningEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookLearningEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.StoryBookLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.StoryBook;
 import java.util.Calendar;
 import java.util.List;
 import javax.persistence.NoResultException;
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookParagraphDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookParagraphDaoJpa.java
index 600786035..d65afeb52 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookParagraphDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookParagraphDaoJpa.java
@@ -6,8 +6,8 @@
 import org.apache.commons.lang.StringEscapeUtils;
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 
 public class StoryBookParagraphDaoJpa extends GenericDaoJpa<StoryBookParagraph> implements StoryBookParagraphDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/StoryBookPeerReviewEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/StoryBookPeerReviewEventDaoJpa.java
index 7006d8e5b..8d1dbea49 100644
--- a/src/main/java/ai/elimu/dao/jpa/StoryBookPeerReviewEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/StoryBookPeerReviewEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.StoryBookPeerReviewEventDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/SyllableDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/SyllableDaoJpa.java
index c3a72e4db..093118be2 100644
--- a/src/main/java/ai/elimu/dao/jpa/SyllableDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/SyllableDaoJpa.java
@@ -6,7 +6,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.Syllable;
+import ai.elimu.entity.content.Syllable;
 
 public class SyllableDaoJpa extends GenericDaoJpa<Syllable> implements SyllableDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java
index 1d0f7cf64..d067924e1 100644
--- a/src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/VideoDaoJpa.java
@@ -7,7 +7,7 @@
 
 import org.springframework.dao.DataAccessException;
 
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 
 public class VideoDaoJpa extends GenericDaoJpa<Video> implements VideoDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/WordContributionEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/WordContributionEventDaoJpa.java
index 033c4c1d7..4ef24b459 100644
--- a/src/main/java/ai/elimu/dao/jpa/WordContributionEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/WordContributionEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import ai.elimu.dao.WordContributionEventDao;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/dao/jpa/WordDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/WordDaoJpa.java
index 23065df71..425d87678 100644
--- a/src/main/java/ai/elimu/dao/jpa/WordDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/WordDaoJpa.java
@@ -8,7 +8,7 @@
 import org.springframework.dao.DataAccessException;
 
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 
 public class WordDaoJpa extends GenericDaoJpa<Word> implements WordDao {
 
diff --git a/src/main/java/ai/elimu/dao/jpa/WordLearningEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/WordLearningEventDaoJpa.java
index d83945d58..c06d0f097 100644
--- a/src/main/java/ai/elimu/dao/jpa/WordLearningEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/WordLearningEventDaoJpa.java
@@ -1,9 +1,9 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.WordLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.WordLearningEvent;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.WordLearningEvent;
+import ai.elimu.entity.content.Word;
 import java.util.Calendar;
 import javax.persistence.NoResultException;
 import org.springframework.dao.DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/jpa/WordPeerReviewEventDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/WordPeerReviewEventDaoJpa.java
index fd59d904f..f48f7754f 100644
--- a/src/main/java/ai/elimu/dao/jpa/WordPeerReviewEventDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/WordPeerReviewEventDaoJpa.java
@@ -1,10 +1,10 @@
 package ai.elimu.dao.jpa;
 
 import ai.elimu.dao.WordPeerReviewEventDao;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
 import java.util.List;
 import org.springframework.dao.DataAccessException;
 
diff --git a/src/main/java/ai/elimu/model/BaseEntity.java b/src/main/java/ai/elimu/entity/BaseEntity.java
similarity index 95%
rename from src/main/java/ai/elimu/model/BaseEntity.java
rename to src/main/java/ai/elimu/entity/BaseEntity.java
index 437a55a89..bcf9ef7c1 100644
--- a/src/main/java/ai/elimu/model/BaseEntity.java
+++ b/src/main/java/ai/elimu/entity/BaseEntity.java
@@ -1,4 +1,4 @@
-package ai.elimu.model;
+package ai.elimu.entity;
 
 import java.io.Serializable;
 import javax.persistence.GeneratedValue;
diff --git a/src/main/java/ai/elimu/model/DbMigration.java b/src/main/java/ai/elimu/entity/DbMigration.java
similarity index 97%
rename from src/main/java/ai/elimu/model/DbMigration.java
rename to src/main/java/ai/elimu/entity/DbMigration.java
index 69cdd7f55..1e37c30ff 100644
--- a/src/main/java/ai/elimu/model/DbMigration.java
+++ b/src/main/java/ai/elimu/entity/DbMigration.java
@@ -1,4 +1,4 @@
-package ai.elimu.model;
+package ai.elimu.entity;
 
 import java.util.Calendar;
 import javax.persistence.Column;
diff --git a/src/main/java/ai/elimu/model/Device.java b/src/main/java/ai/elimu/entity/Device.java
similarity index 98%
rename from src/main/java/ai/elimu/model/Device.java
rename to src/main/java/ai/elimu/entity/Device.java
index 90a526fe4..893e29d46 100644
--- a/src/main/java/ai/elimu/model/Device.java
+++ b/src/main/java/ai/elimu/entity/Device.java
@@ -1,4 +1,4 @@
-package ai.elimu.model;
+package ai.elimu.entity;
 
 import java.util.Calendar;
 import javax.persistence.Column;
diff --git a/src/main/java/ai/elimu/model/admin/Application.java b/src/main/java/ai/elimu/entity/admin/Application.java
similarity index 95%
rename from src/main/java/ai/elimu/model/admin/Application.java
rename to src/main/java/ai/elimu/entity/admin/Application.java
index 36b59002a..745f706c5 100644
--- a/src/main/java/ai/elimu/model/admin/Application.java
+++ b/src/main/java/ai/elimu/entity/admin/Application.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.admin;
+package ai.elimu.entity.admin;
 
 import java.util.Set;
 import javax.persistence.ElementCollection;
@@ -8,8 +8,9 @@
 import javax.persistence.FetchType;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.contributor.Contributor;
+
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
diff --git a/src/main/java/ai/elimu/model/admin/ApplicationVersion.java b/src/main/java/ai/elimu/entity/admin/ApplicationVersion.java
similarity index 96%
rename from src/main/java/ai/elimu/model/admin/ApplicationVersion.java
rename to src/main/java/ai/elimu/entity/admin/ApplicationVersion.java
index 51591c41a..0b821480e 100644
--- a/src/main/java/ai/elimu/model/admin/ApplicationVersion.java
+++ b/src/main/java/ai/elimu/entity/admin/ApplicationVersion.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.admin;
+package ai.elimu.entity.admin;
 
 import java.util.Calendar;
 import javax.persistence.Column;
@@ -8,8 +8,9 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.contributor.Contributor;
+
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.contributor.Contributor;
 
 @Entity
 public class ApplicationVersion extends BaseEntity {
diff --git a/src/main/java/ai/elimu/model/analytics/LearningEvent.java b/src/main/java/ai/elimu/entity/analytics/LearningEvent.java
similarity index 94%
rename from src/main/java/ai/elimu/model/analytics/LearningEvent.java
rename to src/main/java/ai/elimu/entity/analytics/LearningEvent.java
index a37f29438..04391019a 100644
--- a/src/main/java/ai/elimu/model/analytics/LearningEvent.java
+++ b/src/main/java/ai/elimu/entity/analytics/LearningEvent.java
@@ -1,7 +1,7 @@
-package ai.elimu.model.analytics;
+package ai.elimu.entity.analytics;
 
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.admin.Application;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import java.util.Calendar;
 import javax.persistence.EnumType;
diff --git a/src/main/java/ai/elimu/model/analytics/LetterLearningEvent.java b/src/main/java/ai/elimu/entity/analytics/LetterLearningEvent.java
similarity index 92%
rename from src/main/java/ai/elimu/model/analytics/LetterLearningEvent.java
rename to src/main/java/ai/elimu/entity/analytics/LetterLearningEvent.java
index 7ce06e07f..b98f70ddd 100644
--- a/src/main/java/ai/elimu/model/analytics/LetterLearningEvent.java
+++ b/src/main/java/ai/elimu/entity/analytics/LetterLearningEvent.java
@@ -1,6 +1,7 @@
-package ai.elimu.model.analytics;
+package ai.elimu.entity.analytics;
+
+import ai.elimu.entity.content.Letter;
 
-import ai.elimu.model.content.Letter;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/analytics/StoryBookLearningEvent.java b/src/main/java/ai/elimu/entity/analytics/StoryBookLearningEvent.java
similarity index 93%
rename from src/main/java/ai/elimu/model/analytics/StoryBookLearningEvent.java
rename to src/main/java/ai/elimu/entity/analytics/StoryBookLearningEvent.java
index c6a6d00ca..5dfaf762e 100644
--- a/src/main/java/ai/elimu/model/analytics/StoryBookLearningEvent.java
+++ b/src/main/java/ai/elimu/entity/analytics/StoryBookLearningEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.analytics;
+package ai.elimu.entity.analytics;
 
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.content.StoryBook;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/analytics/WordLearningEvent.java b/src/main/java/ai/elimu/entity/analytics/WordLearningEvent.java
similarity index 89%
rename from src/main/java/ai/elimu/model/analytics/WordLearningEvent.java
rename to src/main/java/ai/elimu/entity/analytics/WordLearningEvent.java
index 8757b3332..8cde1e88f 100644
--- a/src/main/java/ai/elimu/model/analytics/WordLearningEvent.java
+++ b/src/main/java/ai/elimu/entity/analytics/WordLearningEvent.java
@@ -1,6 +1,7 @@
-package ai.elimu.model.analytics;
+package ai.elimu.entity.analytics;
+
+import ai.elimu.entity.content.Word;
 
-import ai.elimu.model.content.Word;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
diff --git a/src/main/java/ai/elimu/model/content/Content.java b/src/main/java/ai/elimu/entity/content/Content.java
similarity index 94%
rename from src/main/java/ai/elimu/model/content/Content.java
rename to src/main/java/ai/elimu/entity/content/Content.java
index 0005d2b01..9bb465fdb 100644
--- a/src/main/java/ai/elimu/model/content/Content.java
+++ b/src/main/java/ai/elimu/entity/content/Content.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.Calendar;
 import javax.persistence.EnumType;
@@ -7,9 +7,10 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
-import ai.elimu.model.BaseEntity;
+
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.enums.PeerReviewStatus;
 import ai.elimu.model.v2.enums.content.ContentStatus;
-import ai.elimu.model.enums.PeerReviewStatus;
 
 /**
  * Parent class for different types of educational content.
diff --git a/src/main/java/ai/elimu/model/content/Emoji.java b/src/main/java/ai/elimu/entity/content/Emoji.java
similarity index 98%
rename from src/main/java/ai/elimu/model/content/Emoji.java
rename to src/main/java/ai/elimu/entity/content/Emoji.java
index dd826de45..9c5b8c74b 100644
--- a/src/main/java/ai/elimu/model/content/Emoji.java
+++ b/src/main/java/ai/elimu/entity/content/Emoji.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.Set;
 import javax.persistence.Column;
diff --git a/src/main/java/ai/elimu/model/content/Letter.java b/src/main/java/ai/elimu/entity/content/Letter.java
similarity index 94%
rename from src/main/java/ai/elimu/model/content/Letter.java
rename to src/main/java/ai/elimu/entity/content/Letter.java
index e89a2f70b..3faec95cc 100644
--- a/src/main/java/ai/elimu/model/content/Letter.java
+++ b/src/main/java/ai/elimu/entity/content/Letter.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/content/LetterSoundCorrespondence.java b/src/main/java/ai/elimu/entity/content/LetterSoundCorrespondence.java
similarity index 91%
rename from src/main/java/ai/elimu/model/content/LetterSoundCorrespondence.java
rename to src/main/java/ai/elimu/entity/content/LetterSoundCorrespondence.java
index eeae3d70c..693b7eac6 100644
--- a/src/main/java/ai/elimu/model/content/LetterSoundCorrespondence.java
+++ b/src/main/java/ai/elimu/entity/content/LetterSoundCorrespondence.java
@@ -1,11 +1,10 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.List;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.ManyToMany;
 import javax.persistence.OrderColumn;
-import org.hibernate.validator.constraints.NotEmpty;
 
 /**
  * Contains information about the various sounds a letter (or letter combination) can represent.
diff --git a/src/main/java/ai/elimu/model/content/Number.java b/src/main/java/ai/elimu/entity/content/Number.java
similarity index 96%
rename from src/main/java/ai/elimu/model/content/Number.java
rename to src/main/java/ai/elimu/entity/content/Number.java
index 9876f25e3..bd14d84f6 100644
--- a/src/main/java/ai/elimu/model/content/Number.java
+++ b/src/main/java/ai/elimu/entity/content/Number.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.List;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/content/Sound.java b/src/main/java/ai/elimu/entity/content/Sound.java
similarity index 98%
rename from src/main/java/ai/elimu/model/content/Sound.java
rename to src/main/java/ai/elimu/entity/content/Sound.java
index e1165a120..0b5e5e616 100644
--- a/src/main/java/ai/elimu/model/content/Sound.java
+++ b/src/main/java/ai/elimu/entity/content/Sound.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -6,8 +6,9 @@
 import javax.persistence.Enumerated;
 import javax.persistence.OneToOne;
 import javax.validation.constraints.NotNull;
+
+import ai.elimu.entity.content.multimedia.Audio;
 import org.hibernate.validator.constraints.Length;
-import ai.elimu.model.content.multimedia.Audio;
 import ai.elimu.model.v2.enums.content.sound.ConsonantPlace;
 import ai.elimu.model.v2.enums.content.sound.ConsonantType;
 import ai.elimu.model.v2.enums.content.sound.ConsonantVoicing;
diff --git a/src/main/java/ai/elimu/model/content/StoryBook.java b/src/main/java/ai/elimu/entity/content/StoryBook.java
similarity index 93%
rename from src/main/java/ai/elimu/model/content/StoryBook.java
rename to src/main/java/ai/elimu/entity/content/StoryBook.java
index 8cbfc0cec..c0d51f134 100644
--- a/src/main/java/ai/elimu/model/content/StoryBook.java
+++ b/src/main/java/ai/elimu/entity/content/StoryBook.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -6,9 +6,10 @@
 import javax.persistence.Enumerated;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
+
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.enums.ContentLicense;
 import org.hibernate.validator.constraints.Length;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.enums.ContentLicense;
 import ai.elimu.model.v2.enums.ReadingLevel;
 
 @Entity
diff --git a/src/main/java/ai/elimu/model/content/StoryBookChapter.java b/src/main/java/ai/elimu/entity/content/StoryBookChapter.java
similarity index 87%
rename from src/main/java/ai/elimu/model/content/StoryBookChapter.java
rename to src/main/java/ai/elimu/entity/content/StoryBookChapter.java
index 89d39ef88..a010871e3 100644
--- a/src/main/java/ai/elimu/model/content/StoryBookChapter.java
+++ b/src/main/java/ai/elimu/entity/content/StoryBookChapter.java
@@ -1,8 +1,10 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import javax.persistence.Entity;
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.content.multimedia.Image;
+
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.content.multimedia.Image;
+
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/ai/elimu/model/content/StoryBookParagraph.java b/src/main/java/ai/elimu/entity/content/StoryBookParagraph.java
similarity index 95%
rename from src/main/java/ai/elimu/model/content/StoryBookParagraph.java
rename to src/main/java/ai/elimu/entity/content/StoryBookParagraph.java
index d9faff128..7a4522b5f 100644
--- a/src/main/java/ai/elimu/model/content/StoryBookParagraph.java
+++ b/src/main/java/ai/elimu/entity/content/StoryBookParagraph.java
@@ -1,7 +1,9 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import javax.persistence.Entity;
-import ai.elimu.model.BaseEntity;
+
+import ai.elimu.entity.BaseEntity;
+
 import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.FetchType;
diff --git a/src/main/java/ai/elimu/model/content/Syllable.java b/src/main/java/ai/elimu/entity/content/Syllable.java
similarity index 95%
rename from src/main/java/ai/elimu/model/content/Syllable.java
rename to src/main/java/ai/elimu/entity/content/Syllable.java
index b655ba1a6..d5a3d0e32 100644
--- a/src/main/java/ai/elimu/model/content/Syllable.java
+++ b/src/main/java/ai/elimu/entity/content/Syllable.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.List;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/content/Word.java b/src/main/java/ai/elimu/entity/content/Word.java
similarity index 98%
rename from src/main/java/ai/elimu/model/content/Word.java
rename to src/main/java/ai/elimu/entity/content/Word.java
index c85e95bcb..f33915caf 100644
--- a/src/main/java/ai/elimu/model/content/Word.java
+++ b/src/main/java/ai/elimu/entity/content/Word.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content;
+package ai.elimu.entity.content;
 
 import java.util.List;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/content/multimedia/Audio.java b/src/main/java/ai/elimu/entity/content/multimedia/Audio.java
similarity index 94%
rename from src/main/java/ai/elimu/model/content/multimedia/Audio.java
rename to src/main/java/ai/elimu/entity/content/multimedia/Audio.java
index 283f6193e..f31e41f00 100644
--- a/src/main/java/ai/elimu/model/content/multimedia/Audio.java
+++ b/src/main/java/ai/elimu/entity/content/multimedia/Audio.java
@@ -1,7 +1,7 @@
-package ai.elimu.model.content.multimedia;
+package ai.elimu.entity.content.multimedia;
 
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
diff --git a/src/main/java/ai/elimu/model/content/multimedia/Image.java b/src/main/java/ai/elimu/entity/content/multimedia/Image.java
similarity index 96%
rename from src/main/java/ai/elimu/model/content/multimedia/Image.java
rename to src/main/java/ai/elimu/entity/content/multimedia/Image.java
index 9f3d5f3a8..f087a5da4 100644
--- a/src/main/java/ai/elimu/model/content/multimedia/Image.java
+++ b/src/main/java/ai/elimu/entity/content/multimedia/Image.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content.multimedia;
+package ai.elimu.entity.content.multimedia;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/content/multimedia/Multimedia.java b/src/main/java/ai/elimu/entity/content/multimedia/Multimedia.java
similarity index 93%
rename from src/main/java/ai/elimu/model/content/multimedia/Multimedia.java
rename to src/main/java/ai/elimu/entity/content/multimedia/Multimedia.java
index 8adc2d17c..801560174 100644
--- a/src/main/java/ai/elimu/model/content/multimedia/Multimedia.java
+++ b/src/main/java/ai/elimu/entity/content/multimedia/Multimedia.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content.multimedia;
+package ai.elimu.entity.content.multimedia;
 
 import java.util.Set;
 import javax.persistence.Column;
@@ -12,11 +12,11 @@
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;
-import ai.elimu.model.content.Content;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.enums.ContentLicense;
+import ai.elimu.entity.content.Content;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.enums.ContentLicense;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
 
diff --git a/src/main/java/ai/elimu/model/content/multimedia/Video.java b/src/main/java/ai/elimu/entity/content/multimedia/Video.java
similarity index 96%
rename from src/main/java/ai/elimu/model/content/multimedia/Video.java
rename to src/main/java/ai/elimu/entity/content/multimedia/Video.java
index 3ed9c1517..147d6bd1f 100644
--- a/src/main/java/ai/elimu/model/content/multimedia/Video.java
+++ b/src/main/java/ai/elimu/entity/content/multimedia/Video.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.content.multimedia;
+package ai.elimu.entity.content.multimedia;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/src/main/java/ai/elimu/model/contributor/AudioContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/AudioContributionEvent.java
similarity index 79%
rename from src/main/java/ai/elimu/model/contributor/AudioContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/AudioContributionEvent.java
index e60ea56b4..002330d59 100644
--- a/src/main/java/ai/elimu/model/contributor/AudioContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/AudioContributionEvent.java
@@ -1,6 +1,7 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
+
+import ai.elimu.entity.content.multimedia.Audio;
 
-import ai.elimu.model.content.multimedia.Audio;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/ai/elimu/model/contributor/AudioPeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/AudioPeerReviewEvent.java
similarity index 95%
rename from src/main/java/ai/elimu/model/contributor/AudioPeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/AudioPeerReviewEvent.java
index 1c633f7e7..dbadc5756 100644
--- a/src/main/java/ai/elimu/model/contributor/AudioPeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/AudioPeerReviewEvent.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/ContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/ContributionEvent.java
similarity index 94%
rename from src/main/java/ai/elimu/model/contributor/ContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/ContributionEvent.java
index 2b1a2dade..b31bfa2c3 100644
--- a/src/main/java/ai/elimu/model/contributor/ContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/ContributionEvent.java
@@ -1,7 +1,8 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
+
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.enums.Platform;
 
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.enums.Platform;
 import java.util.Calendar;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/Contributor.java b/src/main/java/ai/elimu/entity/contributor/Contributor.java
similarity index 97%
rename from src/main/java/ai/elimu/model/contributor/Contributor.java
rename to src/main/java/ai/elimu/entity/contributor/Contributor.java
index 02adebf14..d08d2738a 100644
--- a/src/main/java/ai/elimu/model/contributor/Contributor.java
+++ b/src/main/java/ai/elimu/entity/contributor/Contributor.java
@@ -1,6 +1,7 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
+
+import ai.elimu.entity.BaseEntity;
 
-import ai.elimu.model.BaseEntity;
 import java.util.Calendar;
 import java.util.Set;
 import javax.persistence.Column;
@@ -13,7 +14,7 @@
 import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.enums.Role;
 
 @Entity
 public class Contributor extends BaseEntity {
diff --git a/src/main/java/ai/elimu/model/contributor/ImageContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/ImageContributionEvent.java
similarity index 79%
rename from src/main/java/ai/elimu/model/contributor/ImageContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/ImageContributionEvent.java
index adaf5e383..e7901ae34 100644
--- a/src/main/java/ai/elimu/model/contributor/ImageContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/ImageContributionEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/ai/elimu/model/contributor/LetterContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/LetterContributionEvent.java
similarity index 83%
rename from src/main/java/ai/elimu/model/contributor/LetterContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/LetterContributionEvent.java
index 36c7300f5..08cc0b2c2 100644
--- a/src/main/java/ai/elimu/model/contributor/LetterContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/LetterContributionEvent.java
@@ -1,6 +1,7 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
+
+import ai.elimu.entity.content.Letter;
 
-import ai.elimu.model.content.Letter;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondenceContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondenceContributionEvent.java
similarity index 86%
rename from src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondenceContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondenceContributionEvent.java
index 2be0186d0..fd81288f1 100644
--- a/src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondenceContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondenceContributionEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondencePeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondencePeerReviewEvent.java
similarity index 96%
rename from src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondencePeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondencePeerReviewEvent.java
index 71e4115ae..52d16dcfd 100644
--- a/src/main/java/ai/elimu/model/contributor/LetterSoundCorrespondencePeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/LetterSoundCorrespondencePeerReviewEvent.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/NumberContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/NumberContributionEvent.java
similarity index 82%
rename from src/main/java/ai/elimu/model/contributor/NumberContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/NumberContributionEvent.java
index 1f39110c2..8ec4dc043 100644
--- a/src/main/java/ai/elimu/model/contributor/NumberContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/NumberContributionEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/ai/elimu/model/contributor/NumberPeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/NumberPeerReviewEvent.java
similarity index 95%
rename from src/main/java/ai/elimu/model/contributor/NumberPeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/NumberPeerReviewEvent.java
index 324c9a266..bea16d087 100644
--- a/src/main/java/ai/elimu/model/contributor/NumberPeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/NumberPeerReviewEvent.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/PeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/PeerReviewEvent.java
similarity index 93%
rename from src/main/java/ai/elimu/model/contributor/PeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/PeerReviewEvent.java
index 3df866897..0ecb0a38b 100644
--- a/src/main/java/ai/elimu/model/contributor/PeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/PeerReviewEvent.java
@@ -1,10 +1,9 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.BaseEntity;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.BaseEntity;
+import ai.elimu.entity.enums.Platform;
 import java.util.Calendar;
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.ManyToOne;
diff --git a/src/main/java/ai/elimu/model/contributor/SoundContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/SoundContributionEvent.java
similarity index 83%
rename from src/main/java/ai/elimu/model/contributor/SoundContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/SoundContributionEvent.java
index 83199795c..2863f8ced 100644
--- a/src/main/java/ai/elimu/model/contributor/SoundContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/SoundContributionEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/StoryBookContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/StoryBookContributionEvent.java
similarity index 90%
rename from src/main/java/ai/elimu/model/contributor/StoryBookContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/StoryBookContributionEvent.java
index bed606b62..c2601961b 100644
--- a/src/main/java/ai/elimu/model/contributor/StoryBookContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/StoryBookContributionEvent.java
@@ -1,7 +1,7 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookParagraph;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
diff --git a/src/main/java/ai/elimu/model/contributor/StoryBookPeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/StoryBookPeerReviewEvent.java
similarity index 95%
rename from src/main/java/ai/elimu/model/contributor/StoryBookPeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/StoryBookPeerReviewEvent.java
index 776afc835..41fa644fc 100644
--- a/src/main/java/ai/elimu/model/contributor/StoryBookPeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/StoryBookPeerReviewEvent.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
diff --git a/src/main/java/ai/elimu/model/contributor/WordContributionEvent.java b/src/main/java/ai/elimu/entity/contributor/WordContributionEvent.java
similarity index 83%
rename from src/main/java/ai/elimu/model/contributor/WordContributionEvent.java
rename to src/main/java/ai/elimu/entity/contributor/WordContributionEvent.java
index 049fad573..5e43d06a2 100644
--- a/src/main/java/ai/elimu/model/contributor/WordContributionEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/WordContributionEvent.java
@@ -1,6 +1,6 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/model/contributor/WordPeerReviewEvent.java b/src/main/java/ai/elimu/entity/contributor/WordPeerReviewEvent.java
similarity index 95%
rename from src/main/java/ai/elimu/model/contributor/WordPeerReviewEvent.java
rename to src/main/java/ai/elimu/entity/contributor/WordPeerReviewEvent.java
index 505adb7e0..5144bb890 100644
--- a/src/main/java/ai/elimu/model/contributor/WordPeerReviewEvent.java
+++ b/src/main/java/ai/elimu/entity/contributor/WordPeerReviewEvent.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.contributor;
+package ai.elimu.entity.contributor;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/ai/elimu/entity/enums/CodeLicense.java b/src/main/java/ai/elimu/entity/enums/CodeLicense.java
new file mode 100644
index 000000000..5ffb504a5
--- /dev/null
+++ b/src/main/java/ai/elimu/entity/enums/CodeLicense.java
@@ -0,0 +1,5 @@
+package ai.elimu.entity.enums;
+
+public enum CodeLicense {
+
+}
diff --git a/src/main/java/ai/elimu/model/enums/ContentLicense.java b/src/main/java/ai/elimu/entity/enums/ContentLicense.java
similarity index 88%
rename from src/main/java/ai/elimu/model/enums/ContentLicense.java
rename to src/main/java/ai/elimu/entity/enums/ContentLicense.java
index 578b36406..7f9e5be8f 100644
--- a/src/main/java/ai/elimu/model/enums/ContentLicense.java
+++ b/src/main/java/ai/elimu/entity/enums/ContentLicense.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 public enum ContentLicense {
 
diff --git a/src/main/java/ai/elimu/model/enums/PeerReviewStatus.java b/src/main/java/ai/elimu/entity/enums/PeerReviewStatus.java
similarity index 72%
rename from src/main/java/ai/elimu/model/enums/PeerReviewStatus.java
rename to src/main/java/ai/elimu/entity/enums/PeerReviewStatus.java
index c4ac46ce9..a4aada148 100644
--- a/src/main/java/ai/elimu/model/enums/PeerReviewStatus.java
+++ b/src/main/java/ai/elimu/entity/enums/PeerReviewStatus.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 public enum PeerReviewStatus {
     
diff --git a/src/main/java/ai/elimu/model/enums/Platform.java b/src/main/java/ai/elimu/entity/enums/Platform.java
similarity index 67%
rename from src/main/java/ai/elimu/model/enums/Platform.java
rename to src/main/java/ai/elimu/entity/enums/Platform.java
index 81bc843dd..72390461c 100644
--- a/src/main/java/ai/elimu/model/enums/Platform.java
+++ b/src/main/java/ai/elimu/entity/enums/Platform.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 public enum Platform {
     
diff --git a/src/main/java/ai/elimu/model/enums/Provider.java b/src/main/java/ai/elimu/entity/enums/Provider.java
similarity index 78%
rename from src/main/java/ai/elimu/model/enums/Provider.java
rename to src/main/java/ai/elimu/entity/enums/Provider.java
index c9646caf5..3c744d0be 100644
--- a/src/main/java/ai/elimu/model/enums/Provider.java
+++ b/src/main/java/ai/elimu/entity/enums/Provider.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 /**
  * Sign-On Providers.
diff --git a/src/main/java/ai/elimu/model/enums/Role.java b/src/main/java/ai/elimu/entity/enums/Role.java
similarity index 90%
rename from src/main/java/ai/elimu/model/enums/Role.java
rename to src/main/java/ai/elimu/entity/enums/Role.java
index 2d1490b7f..03155078d 100644
--- a/src/main/java/ai/elimu/model/enums/Role.java
+++ b/src/main/java/ai/elimu/entity/enums/Role.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 public enum Role {
     
diff --git a/src/main/java/ai/elimu/model/enums/StoryBookProvider.java b/src/main/java/ai/elimu/entity/enums/StoryBookProvider.java
similarity index 86%
rename from src/main/java/ai/elimu/model/enums/StoryBookProvider.java
rename to src/main/java/ai/elimu/entity/enums/StoryBookProvider.java
index 405a85474..a08bd5fc6 100644
--- a/src/main/java/ai/elimu/model/enums/StoryBookProvider.java
+++ b/src/main/java/ai/elimu/entity/enums/StoryBookProvider.java
@@ -1,4 +1,4 @@
-package ai.elimu.model.enums;
+package ai.elimu.entity.enums;
 
 public enum StoryBookProvider {
     
diff --git a/src/main/java/ai/elimu/logic/converters/StringToApplicationConverter.java b/src/main/java/ai/elimu/logic/converters/StringToApplicationConverter.java
index acd216cfc..25e8a2202 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToApplicationConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToApplicationConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.ApplicationDao;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToAudioConverter.java b/src/main/java/ai/elimu/logic/converters/StringToAudioConverter.java
index 0711b49f4..745693d10 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToAudioConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToAudioConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToContributorConverter.java b/src/main/java/ai/elimu/logic/converters/StringToContributorConverter.java
index 498b7a8ad..4deb23a19 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToContributorConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToContributorConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToImageConverter.java b/src/main/java/ai/elimu/logic/converters/StringToImageConverter.java
index 46ad66184..5da005d06 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToImageConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToImageConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.ImageDao;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToLetterConverter.java b/src/main/java/ai/elimu/logic/converters/StringToLetterConverter.java
index cbe0f5145..9dbfc7272 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToLetterConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToLetterConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToLetterSoundCorrespondenceConverter.java b/src/main/java/ai/elimu/logic/converters/StringToLetterSoundCorrespondenceConverter.java
index eaed27e7c..cd02c9758 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToLetterSoundCorrespondenceConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToLetterSoundCorrespondenceConverter.java
@@ -1,7 +1,7 @@
 package ai.elimu.logic.converters;
 
 import org.apache.commons.lang.StringUtils;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 import ai.elimu.dao.LetterSoundDao;
diff --git a/src/main/java/ai/elimu/logic/converters/StringToSoundConverter.java b/src/main/java/ai/elimu/logic/converters/StringToSoundConverter.java
index 88f68fef5..70247c7f9 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToSoundConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToSoundConverter.java
@@ -1,7 +1,7 @@
 package ai.elimu.logic.converters;
 
 import org.apache.commons.lang.StringUtils;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 import ai.elimu.dao.SoundDao;
diff --git a/src/main/java/ai/elimu/logic/converters/StringToStoryBookChapterConverter.java b/src/main/java/ai/elimu/logic/converters/StringToStoryBookChapterConverter.java
index 8ac57a1c2..b7edbec96 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToStoryBookChapterConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToStoryBookChapterConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.StoryBookChapterDao;
-import ai.elimu.model.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookChapter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToStoryBookConverter.java b/src/main/java/ai/elimu/logic/converters/StringToStoryBookConverter.java
index f07349354..fe8c69ae4 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToStoryBookConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToStoryBookConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.StoryBookDao;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.content.StoryBook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToStoryBookParagraphConverter.java b/src/main/java/ai/elimu/logic/converters/StringToStoryBookParagraphConverter.java
index 06d3a4d45..efeb7c10e 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToStoryBookParagraphConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToStoryBookParagraphConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBookParagraph;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/logic/converters/StringToWordConverter.java b/src/main/java/ai/elimu/logic/converters/StringToWordConverter.java
index 3e74dae89..8837acd15 100644
--- a/src/main/java/ai/elimu/logic/converters/StringToWordConverter.java
+++ b/src/main/java/ai/elimu/logic/converters/StringToWordConverter.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/src/main/java/ai/elimu/model/enums/CodeLicense.java b/src/main/java/ai/elimu/model/enums/CodeLicense.java
deleted file mode 100644
index 8313aac04..000000000
--- a/src/main/java/ai/elimu/model/enums/CodeLicense.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package ai.elimu.model.enums;
-
-public enum CodeLicense {
-
-}
diff --git a/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java b/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java
index 23bf4334a..e98687e96 100644
--- a/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java
+++ b/src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java
@@ -1,19 +1,19 @@
 package ai.elimu.rest.v2;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Video;
 import ai.elimu.model.v2.gson.application.ApplicationGson;
 import ai.elimu.model.v2.gson.application.ApplicationVersionGson;
 import ai.elimu.model.v2.gson.content.SoundGson;
diff --git a/src/main/java/ai/elimu/rest/v2/analytics/LetterLearningEventsRestController.java b/src/main/java/ai/elimu/rest/v2/analytics/LetterLearningEventsRestController.java
index e22ee9f7b..fa214e9aa 100644
--- a/src/main/java/ai/elimu/rest/v2/analytics/LetterLearningEventsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/analytics/LetterLearningEventsRestController.java
@@ -3,9 +3,9 @@
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.LetterDao;
 import ai.elimu.dao.LetterLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.LetterLearningEvent;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.LetterLearningEvent;
+import ai.elimu.entity.content.Letter;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import ai.elimu.util.AnalyticsHelper;
diff --git a/src/main/java/ai/elimu/rest/v2/analytics/StoryBookLearningEventsRestController.java b/src/main/java/ai/elimu/rest/v2/analytics/StoryBookLearningEventsRestController.java
index 8305f42b6..2f43d4514 100644
--- a/src/main/java/ai/elimu/rest/v2/analytics/StoryBookLearningEventsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/analytics/StoryBookLearningEventsRestController.java
@@ -3,9 +3,9 @@
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.StoryBook;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import ai.elimu.util.AnalyticsHelper;
diff --git a/src/main/java/ai/elimu/rest/v2/analytics/WordLearningEventsRestController.java b/src/main/java/ai/elimu/rest/v2/analytics/WordLearningEventsRestController.java
index f90de884f..795e00ac1 100644
--- a/src/main/java/ai/elimu/rest/v2/analytics/WordLearningEventsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/analytics/WordLearningEventsRestController.java
@@ -3,9 +3,9 @@
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.WordDao;
 import ai.elimu.dao.WordLearningEventDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.WordLearningEvent;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.WordLearningEvent;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import ai.elimu.util.AnalyticsHelper;
diff --git a/src/main/java/ai/elimu/rest/v2/applications/ApplicationsRestController.java b/src/main/java/ai/elimu/rest/v2/applications/ApplicationsRestController.java
index f17029e5c..b8583e61e 100644
--- a/src/main/java/ai/elimu/rest/v2/applications/ApplicationsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/applications/ApplicationsRestController.java
@@ -2,8 +2,8 @@
 
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.ApplicationVersionDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 import ai.elimu.model.v2.gson.application.ApplicationGson;
 import ai.elimu.model.v2.gson.application.ApplicationVersionGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
diff --git a/src/main/java/ai/elimu/rest/v2/content/AudiosRestController.java b/src/main/java/ai/elimu/rest/v2/content/AudiosRestController.java
index 05f6e1e95..607b89735 100644
--- a/src/main/java/ai/elimu/rest/v2/content/AudiosRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/AudiosRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 import ai.elimu.model.v2.gson.content.AudioGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/EmojisRestController.java b/src/main/java/ai/elimu/rest/v2/content/EmojisRestController.java
index 5525a8b2c..3ab6a66ca 100644
--- a/src/main/java/ai/elimu/rest/v2/content/EmojisRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/EmojisRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.EmojiDao;
-import ai.elimu.model.content.Emoji;
+import ai.elimu.entity.content.Emoji;
 import ai.elimu.model.v2.gson.content.EmojiGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/ImagesRestController.java b/src/main/java/ai/elimu/rest/v2/content/ImagesRestController.java
index 5bc5b3221..badfb8462 100644
--- a/src/main/java/ai/elimu/rest/v2/content/ImagesRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/ImagesRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.ImageDao;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import ai.elimu.model.v2.gson.content.ImageGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/LetterSoundsRestController.java b/src/main/java/ai/elimu/rest/v2/content/LetterSoundsRestController.java
index b9fadffbf..a6b6f5bea 100644
--- a/src/main/java/ai/elimu/rest/v2/content/LetterSoundsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/LetterSoundsRestController.java
@@ -1,6 +1,6 @@
 package ai.elimu.rest.v2.content;
 
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import ai.elimu.model.v2.gson.content.LetterSoundGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/LettersRestController.java b/src/main/java/ai/elimu/rest/v2/content/LettersRestController.java
index dad00426a..eef18c636 100644
--- a/src/main/java/ai/elimu/rest/v2/content/LettersRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/LettersRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import ai.elimu.model.v2.gson.content.LetterGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/NumbersRestController.java b/src/main/java/ai/elimu/rest/v2/content/NumbersRestController.java
index 6f00b7b9c..87054f66e 100644
--- a/src/main/java/ai/elimu/rest/v2/content/NumbersRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/NumbersRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.NumberDao;
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 import ai.elimu.model.v2.gson.content.NumberGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/SoundsRestController.java b/src/main/java/ai/elimu/rest/v2/content/SoundsRestController.java
index 8855355df..8cd1155ea 100644
--- a/src/main/java/ai/elimu/rest/v2/content/SoundsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/SoundsRestController.java
@@ -1,6 +1,6 @@
 package ai.elimu.rest.v2.content;
 
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.gson.content.SoundGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/VideosRestController.java b/src/main/java/ai/elimu/rest/v2/content/VideosRestController.java
index e98e608a1..c91efe1b0 100644
--- a/src/main/java/ai/elimu/rest/v2/content/VideosRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/VideosRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.VideoDao;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 import ai.elimu.model.v2.gson.content.VideoGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/content/WordsRestController.java b/src/main/java/ai/elimu/rest/v2/content/WordsRestController.java
index 333742547..b771edf43 100644
--- a/src/main/java/ai/elimu/rest/v2/content/WordsRestController.java
+++ b/src/main/java/ai/elimu/rest/v2/content/WordsRestController.java
@@ -1,7 +1,7 @@
 package ai.elimu.rest.v2.content;
 
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.gson.content.WordGson;
 import ai.elimu.rest.v2.JpaToGsonConverter;
 import com.google.gson.Gson;
diff --git a/src/main/java/ai/elimu/rest/v2/service/StoryBooksJsonService.java b/src/main/java/ai/elimu/rest/v2/service/StoryBooksJsonService.java
index ad65e7499..ade6dbe8e 100644
--- a/src/main/java/ai/elimu/rest/v2/service/StoryBooksJsonService.java
+++ b/src/main/java/ai/elimu/rest/v2/service/StoryBooksJsonService.java
@@ -3,9 +3,9 @@
 import ai.elimu.dao.StoryBookChapterDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 import ai.elimu.model.v2.gson.content.StoryBookChapterGson;
 import ai.elimu.model.v2.gson.content.StoryBookGson;
 import ai.elimu.model.v2.gson.content.StoryBookParagraphGson;
diff --git a/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java
index d42907ac5..9ca78d5f7 100644
--- a/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java
+++ b/src/main/java/ai/elimu/tasks/LetterSoundCorrespondenceUsageCountScheduler.java
@@ -5,10 +5,10 @@
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Word;
 import java.util.stream.Collectors;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/ai/elimu/tasks/LetterUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/LetterUsageCountScheduler.java
index 7c1bd585a..79780e068 100644
--- a/src/main/java/ai/elimu/tasks/LetterUsageCountScheduler.java
+++ b/src/main/java/ai/elimu/tasks/LetterUsageCountScheduler.java
@@ -8,10 +8,10 @@
 import ai.elimu.dao.StoryBookChapterDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.LetterFrequencyHelper;
diff --git a/src/main/java/ai/elimu/tasks/ParagraphWordScheduler.java b/src/main/java/ai/elimu/tasks/ParagraphWordScheduler.java
index 10431a16e..0e214076d 100644
--- a/src/main/java/ai/elimu/tasks/ParagraphWordScheduler.java
+++ b/src/main/java/ai/elimu/tasks/ParagraphWordScheduler.java
@@ -3,8 +3,8 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.ConfigHelper;
diff --git a/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java
index 0985b2052..ac63f147e 100644
--- a/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java
+++ b/src/main/java/ai/elimu/tasks/SoundUsageCountScheduler.java
@@ -5,9 +5,9 @@
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Word;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/src/main/java/ai/elimu/tasks/SyllableUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/SyllableUsageCountScheduler.java
index 4a899e98e..bd13ae0cf 100644
--- a/src/main/java/ai/elimu/tasks/SyllableUsageCountScheduler.java
+++ b/src/main/java/ai/elimu/tasks/SyllableUsageCountScheduler.java
@@ -10,11 +10,11 @@
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Syllable;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Syllable;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.SyllableFrequencyHelper;
diff --git a/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java b/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java
index bef08c31d..b60a1643e 100644
--- a/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java
+++ b/src/main/java/ai/elimu/tasks/WordUsageCountScheduler.java
@@ -8,10 +8,10 @@
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.WordFrequencyHelper;
diff --git a/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java b/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
index b2f0ef3cf..7090cc38d 100644
--- a/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
+++ b/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
@@ -1,14 +1,12 @@
 package ai.elimu.util;
 
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import org.apache.logging.log4j.LogManager;
 
diff --git a/src/main/java/ai/elimu/util/SyllableHelper.java b/src/main/java/ai/elimu/util/SyllableHelper.java
index 7f8c7aae8..0a09783af 100644
--- a/src/main/java/ai/elimu/util/SyllableHelper.java
+++ b/src/main/java/ai/elimu/util/SyllableHelper.java
@@ -11,7 +11,7 @@
 import net.davidashen.text.Hyphenator;
 import net.davidashen.util.ErrorHandler;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import org.apache.logging.log4j.LogManager;
 
diff --git a/src/main/java/ai/elimu/util/csv/CsvAnalyticsExtractionHelper.java b/src/main/java/ai/elimu/util/csv/CsvAnalyticsExtractionHelper.java
index 0ce2a5d80..a54aba49f 100644
--- a/src/main/java/ai/elimu/util/csv/CsvAnalyticsExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/csv/CsvAnalyticsExtractionHelper.java
@@ -2,9 +2,9 @@
 
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.StoryBookDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.StoryBook;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.StoryBook;
 import ai.elimu.model.v2.enums.analytics.LearningEventType;
 import ai.elimu.rest.v2.analytics.StoryBookLearningEventsRestController;
 import ai.elimu.web.analytics.StoryBookLearningEventCsvExportController;
diff --git a/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java b/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java
index 9214cf45a..cea5f3640 100644
--- a/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/csv/CsvContentExtractionHelper.java
@@ -4,14 +4,14 @@
 import ai.elimu.dao.LetterSoundDao;
 import ai.elimu.dao.SoundDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.enums.ContentLicense;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.enums.ContentLicense;
 import ai.elimu.model.v2.enums.ReadingLevel;
 import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.SpellingConsistency;
diff --git a/src/main/java/ai/elimu/util/csv/CsvLetterExtractionHelper.java b/src/main/java/ai/elimu/util/csv/CsvLetterExtractionHelper.java
index d693e9188..12f9746f6 100644
--- a/src/main/java/ai/elimu/util/csv/CsvLetterExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/csv/CsvLetterExtractionHelper.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.csv;
 
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import ai.elimu.web.content.letter.LetterCsvExportController;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
diff --git a/src/main/java/ai/elimu/util/csv/CsvSoundExtractionHelper.java b/src/main/java/ai/elimu/util/csv/CsvSoundExtractionHelper.java
index 90cc36de5..9ae840fe8 100644
--- a/src/main/java/ai/elimu/util/csv/CsvSoundExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/csv/CsvSoundExtractionHelper.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.csv;
 
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.enums.content.sound.SoundType;
 import ai.elimu.web.content.sound.SoundCsvExportController;
 import org.apache.commons.csv.CSVFormat;
diff --git a/src/main/java/ai/elimu/util/db/DbContentImportHelper.java b/src/main/java/ai/elimu/util/db/DbContentImportHelper.java
index a592060b2..d0de5bf67 100644
--- a/src/main/java/ai/elimu/util/db/DbContentImportHelper.java
+++ b/src/main/java/ai/elimu/util/db/DbContentImportHelper.java
@@ -18,25 +18,25 @@
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.enums.Platform;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.enums.Platform;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.model.v2.enums.Environment;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.model.v2.gson.content.StoryBookChapterGson;
diff --git a/src/main/java/ai/elimu/util/db/DbMigrationHelper.java b/src/main/java/ai/elimu/util/db/DbMigrationHelper.java
index ba7f50814..b69c2102a 100644
--- a/src/main/java/ai/elimu/util/db/DbMigrationHelper.java
+++ b/src/main/java/ai/elimu/util/db/DbMigrationHelper.java
@@ -9,7 +9,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.DbMigrationDao;
-import ai.elimu.model.DbMigration;
+import ai.elimu.entity.DbMigration;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.VersionHelper;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/ai/elimu/util/epub/EPubChapterExtractionHelper.java b/src/main/java/ai/elimu/util/epub/EPubChapterExtractionHelper.java
index 496103bd8..a5d74e2d7 100644
--- a/src/main/java/ai/elimu/util/epub/EPubChapterExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/epub/EPubChapterExtractionHelper.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.epub;
 
-import ai.elimu.model.enums.StoryBookProvider;
+import ai.elimu.entity.enums.StoryBookProvider;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/ai/elimu/util/epub/EPubImageExtractionHelper.java b/src/main/java/ai/elimu/util/epub/EPubImageExtractionHelper.java
index 30604e4cc..190e389a2 100644
--- a/src/main/java/ai/elimu/util/epub/EPubImageExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/epub/EPubImageExtractionHelper.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.epub;
 
-import ai.elimu.model.enums.StoryBookProvider;
+import ai.elimu.entity.enums.StoryBookProvider;
 import java.io.File;
 import java.io.IOException;
 import javax.xml.parsers.DocumentBuilder;
diff --git a/src/main/java/ai/elimu/util/epub/EPubParagraphExtractionHelper.java b/src/main/java/ai/elimu/util/epub/EPubParagraphExtractionHelper.java
index 03c762732..d2714ce06 100644
--- a/src/main/java/ai/elimu/util/epub/EPubParagraphExtractionHelper.java
+++ b/src/main/java/ai/elimu/util/epub/EPubParagraphExtractionHelper.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.epub;
 
-import ai.elimu.model.enums.StoryBookProvider;
+import ai.elimu.entity.enums.StoryBookProvider;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/ai/elimu/web/CustomAuthenticationManager.java b/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
index 42cf9fa5c..051b4e630 100644
--- a/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
+++ b/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
@@ -4,8 +4,8 @@
 import java.util.List;
 
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.enums.Role;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/main/java/ai/elimu/web/SignOnController.java b/src/main/java/ai/elimu/web/SignOnController.java
index eb069cdc4..c48ff7e5f 100644
--- a/src/main/java/ai/elimu/web/SignOnController.java
+++ b/src/main/java/ai/elimu/web/SignOnController.java
@@ -1,15 +1,11 @@
 package ai.elimu.web;
 
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashSet;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.Environment;
-import ai.elimu.model.enums.Role;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
index 98de350ce..f44312ac5 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
@@ -6,9 +6,9 @@
 import org.apache.logging.log4j.Logger;
 import org.json.JSONObject;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.Environment;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import com.github.scribejava.apis.DiscordApi;
diff --git a/src/main/java/ai/elimu/web/SignOnControllerGitHub.java b/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
index 5ec6dd2c8..dad6ef43e 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
@@ -7,9 +7,9 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.Environment;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import com.github.scribejava.apis.GitHubApi;
diff --git a/src/main/java/ai/elimu/web/SignOnControllerSelenium.java b/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
index 1f2b8dab4..44d19ac26 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
@@ -8,9 +8,9 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.Environment;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/ai/elimu/web/SignOnControllerWeb3.java b/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
index 7ab7f7d1d..3f8684406 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
@@ -4,8 +4,8 @@
 import javax.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.util.Web3Helper;
 import java.util.Arrays;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
index eb24e19c9..0d6080adc 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
@@ -5,7 +5,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ApplicationDao;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
index 4f57db38f..1633b00a0 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
@@ -6,8 +6,8 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.ApplicationVersionDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
index 29d7886a7..e5f93e0b6 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ApplicationDao;
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java b/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
index b36e629d1..94444a9f1 100644
--- a/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
+++ b/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
@@ -10,9 +10,9 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.ApplicationVersionDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.admin.ApplicationStatus;
 import ai.elimu.util.ChecksumHelper;
 import ai.elimu.util.DiscordHelper;
diff --git a/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
index 7563c4fc4..e161ffa43 100644
--- a/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.analytics;
 
 import ai.elimu.dao.LetterLearningEventDao;
-import ai.elimu.model.analytics.LetterLearningEvent;
+import ai.elimu.entity.analytics.LetterLearningEvent;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventCsvExportController.java b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventCsvExportController.java
index 504a45011..4a1a58d90 100644
--- a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventCsvExportController.java
+++ b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventCsvExportController.java
@@ -3,7 +3,7 @@
 import ai.elimu.dao.StoryBookChapterDao;
 import ai.elimu.dao.StoryBookLearningEventDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
index 3cf61b660..a08561309 100644
--- a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.analytics;
 
 import ai.elimu.dao.StoryBookLearningEventDao;
-import ai.elimu.model.analytics.StoryBookLearningEvent;
+import ai.elimu.entity.analytics.StoryBookLearningEvent;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
index 38dbceff1..24c601228 100644
--- a/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.analytics;
 
 import ai.elimu.dao.WordLearningEventDao;
-import ai.elimu.model.analytics.WordLearningEvent;
+import ai.elimu.entity.analytics.WordLearningEvent;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/ai/elimu/web/content/MainContentController.java b/src/main/java/ai/elimu/web/content/MainContentController.java
index fcfb86408..79114df5e 100644
--- a/src/main/java/ai/elimu/web/content/MainContentController.java
+++ b/src/main/java/ai/elimu/web/content/MainContentController.java
@@ -22,7 +22,7 @@
 import ai.elimu.dao.VideoDao;
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.model.v2.enums.Environment;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.HashMap;
diff --git a/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java b/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
index 92cf3b48f..5296d0b55 100644
--- a/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
@@ -5,7 +5,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/contributor/ContributorController.java b/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
index 3fbddcafd..b5a9d0d5e 100644
--- a/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
@@ -9,13 +9,13 @@
 import ai.elimu.dao.StoryBookPeerReviewEventDao;
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordPeerReviewEventDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java b/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
index 02ec74ff1..9580b3569 100644
--- a/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
@@ -1,12 +1,11 @@
 package ai.elimu.web.content.contributor;
 
-import java.util.Calendar;
 import javax.servlet.http.HttpSession;
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/ai/elimu/web/content/contributor/EditNameController.java b/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
index 5de368b86..89ebc98e9 100644
--- a/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
@@ -4,7 +4,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ContributorDao;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
index eb84e84a7..a8c7a47f9 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
@@ -5,7 +5,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.EmojiDao;
-import ai.elimu.model.content.Emoji;
+import ai.elimu.entity.content.Emoji;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiCsvExportController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiCsvExportController.java
index 8acd1e4f1..914d5b8c7 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiCsvExportController.java
@@ -1,8 +1,8 @@
 package ai.elimu.web.content.emoji;
 
 import ai.elimu.dao.EmojiDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
index a7e218ff2..398484bab 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
@@ -7,8 +7,8 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.EmojiDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
index 01ebc55e8..971b11cb3 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.EmojiDao;
-import ai.elimu.model.content.Emoji;
+import ai.elimu.entity.content.Emoji;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java b/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
index 21190e766..b83b4054b 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
@@ -6,10 +6,10 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.LetterContributionEventDao;
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterCsvExportController.java b/src/main/java/ai/elimu/web/content/letter/LetterCsvExportController.java
index 76f5fead7..c67d8ab69 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterCsvExportController.java
@@ -1,8 +1,7 @@
 package ai.elimu.web.content.letter;
 
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
@@ -17,7 +16,6 @@
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.logging.log4j.LogManager;
-import org.json.JSONArray;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 @Controller
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterEditController.java b/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
index 21caf005e..d7974a080 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
@@ -6,10 +6,10 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.LetterContributionEventDao;
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterListController.java b/src/main/java/ai/elimu/web/content/letter/LetterListController.java
index 53f4837e5..5578a89ac 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterListController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterListController.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.LetterDao;
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
index 5f0b4c704..926bc6a81 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
@@ -6,9 +6,9 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.LetterDao;
 import ai.elimu.dao.LetterSoundContributionEventDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -17,9 +17,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import ai.elimu.dao.LetterSoundDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCsvExportController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCsvExportController.java
index 273174647..133d03570 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCsvExportController.java
@@ -1,8 +1,8 @@
 package ai.elimu.web.content.letter_sound;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
index 5e656d60b..647d9d3e4 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
@@ -6,9 +6,9 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.LetterDao;
 import ai.elimu.dao.LetterSoundContributionEventDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -20,10 +20,10 @@
 import ai.elimu.dao.LetterSoundDao;
 import ai.elimu.dao.LetterSoundPeerReviewEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import java.util.Calendar;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
index 5bd731935..29f1b1619 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundPeerReviewsController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundPeerReviewsController.java
index 36a4c2970..27d1f6994 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundPeerReviewsController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundPeerReviewsController.java
@@ -4,9 +4,9 @@
 import ai.elimu.dao.LetterSoundContributionEventDao;
 import ai.elimu.dao.LetterSoundDao;
 import ai.elimu.dao.LetterSoundPeerReviewEventDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondencePeerReviewEvent;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpSession;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
index 69991a7ac..f2e45ad4e 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
@@ -12,14 +12,14 @@
 import ai.elimu.dao.EmojiDao;
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.enums.ContentLicense;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.enums.ContentLicense;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCsvExportController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCsvExportController.java
index f05ab48d3..9fc152176 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCsvExportController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.content.multimedia.audio;
 
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
index 3987ec6d1..8cac9dde1 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
@@ -17,15 +17,15 @@
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.enums.ContentLicense;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.enums.ContentLicense;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
index 7520dc036..f7646f512 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
@@ -4,7 +4,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
index 61b26d774..40ea0b7c6 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
@@ -12,12 +12,12 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ImageDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
-import ai.elimu.model.enums.ContentLicense;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
+import ai.elimu.entity.enums.ContentLicense;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCsvExportController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCsvExportController.java
index 095c04a5e..6b348a732 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCsvExportController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.content.multimedia.image;
 
 import ai.elimu.dao.ImageDao;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
index c571b0c3a..f196a37fd 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
@@ -16,16 +16,16 @@
 import ai.elimu.dao.LetterDao;
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
-import ai.elimu.model.enums.ContentLicense;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
+import ai.elimu.entity.enums.ContentLicense;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
index 541474fd8..89f682407 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
@@ -6,9 +6,9 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.ImageDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
index c843b6e42..d32adfbd0 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
@@ -8,8 +8,8 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.VideoDao;
-import ai.elimu.model.content.multimedia.Video;
-import ai.elimu.model.enums.ContentLicense;
+import ai.elimu.entity.content.multimedia.Video;
+import ai.elimu.entity.enums.ContentLicense;
 import ai.elimu.model.v2.enums.content.VideoFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCsvExportController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCsvExportController.java
index e3f4ad2ee..63b1bc901 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCsvExportController.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.content.multimedia.video;
 
 import ai.elimu.dao.VideoDao;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
index c4d9af53c..54416e6fc 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
@@ -14,12 +14,12 @@
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.VideoDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Video;
-import ai.elimu.model.enums.ContentLicense;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Video;
+import ai.elimu.entity.enums.ContentLicense;
 import ai.elimu.model.v2.enums.content.VideoFormat;
 import ai.elimu.model.v2.enums.content.LiteracySkill;
 import ai.elimu.model.v2.enums.content.NumeracySkill;
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
index 0f77bdd41..e7b1258bc 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
@@ -4,7 +4,7 @@
 
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.VideoDao;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/number/NumberCreateController.java b/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
index c87792a96..2f308739f 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
@@ -9,12 +9,12 @@
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.HashMap;
diff --git a/src/main/java/ai/elimu/web/content/number/NumberCsvExportController.java b/src/main/java/ai/elimu/web/content/number/NumberCsvExportController.java
index 754e06cf1..4a089d4e6 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberCsvExportController.java
@@ -1,8 +1,8 @@
 package ai.elimu.web.content.number;
 
 import ai.elimu.dao.NumberDao;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/number/NumberEditController.java b/src/main/java/ai/elimu/web/content/number/NumberEditController.java
index bdcb22498..092d66678 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberEditController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberEditController.java
@@ -10,12 +10,12 @@
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.NumberPeerReviewEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.HashMap;
diff --git a/src/main/java/ai/elimu/web/content/number/NumberListController.java b/src/main/java/ai/elimu/web/content/number/NumberListController.java
index 0a554dd0c..85806fc77 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberListController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberListController.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.NumberDao;
-import ai.elimu.model.content.Number;
+import ai.elimu.entity.content.Number;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/number/NumberPeerReviewsController.java b/src/main/java/ai/elimu/web/content/number/NumberPeerReviewsController.java
index eb84eb6d4..5ec309032 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberPeerReviewsController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberPeerReviewsController.java
@@ -4,9 +4,9 @@
 import ai.elimu.dao.NumberContributionEventDao;
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.NumberPeerReviewEventDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpSession;
diff --git a/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
index ff2452ce7..f0be70670 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
@@ -3,13 +3,13 @@
 import ai.elimu.dao.AudioContributionEventDao;
 import ai.elimu.dao.AudioDao;
 import ai.elimu.dao.AudioPeerReviewEventDao;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.AudioPeerReviewEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.AudioPeerReviewEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
index 1450125ab..dcff8b7a4 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
@@ -3,14 +3,14 @@
 import ai.elimu.dao.LetterSoundContributionEventDao;
 import ai.elimu.dao.LetterSoundDao;
 import ai.elimu.dao.LetterSoundPeerReviewEventDao;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.LetterSoundCorrespondenceContributionEvent;
-import ai.elimu.model.contributor.LetterSoundCorrespondencePeerReviewEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.LetterSoundCorrespondenceContributionEvent;
+import ai.elimu.entity.contributor.LetterSoundCorrespondencePeerReviewEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
index 425716ada..e44e0b49d 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
@@ -3,13 +3,13 @@
 import ai.elimu.dao.NumberContributionEventDao;
 import ai.elimu.dao.NumberDao;
 import ai.elimu.dao.NumberPeerReviewEventDao;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.NumberPeerReviewEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.NumberPeerReviewEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
index 28323dee3..84e84598c 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
@@ -3,13 +3,13 @@
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookPeerReviewEventDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
index fde229af7..3672da6a6 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
@@ -3,13 +3,13 @@
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
 import ai.elimu.dao.WordPeerReviewEventDao;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java b/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
index 4d6f31888..d274e51ec 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
@@ -7,7 +7,7 @@
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.enums.content.sound.SoundType;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,9 +17,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import ai.elimu.dao.SoundDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.SoundContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.SoundContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundCsvExportController.java b/src/main/java/ai/elimu/web/content/sound/SoundCsvExportController.java
index 9a67d2b1c..ce3cda711 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundCsvExportController.java
@@ -1,6 +1,6 @@
 package ai.elimu.web.content.sound;
 
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundEditController.java b/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
index 9a282a478..805bc2faf 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
@@ -8,7 +8,7 @@
 import org.apache.commons.lang.StringUtils;
 
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.enums.content.sound.SoundType;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +19,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import ai.elimu.dao.SoundDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.SoundContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.SoundContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundListController.java b/src/main/java/ai/elimu/web/content/sound/SoundListController.java
index 617e7a872..e4c431d44 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundListController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundListController.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
index 2baa948b6..a29a8d195 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
@@ -8,12 +8,12 @@
 import ai.elimu.dao.ImageDao;
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.ContentLicense;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.ContentLicense;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.ReadingLevel;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
index 4a3c7fc1f..2327149e8 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
@@ -12,14 +12,14 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.ImageFormat;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.util.ImageColorHelper;
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCsvExportController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCsvExportController.java
index ccf509e36..fdd03b7da 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookCsvExportController.java
@@ -3,9 +3,9 @@
 import ai.elimu.dao.StoryBookChapterDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
 import ai.elimu.model.v2.gson.content.ImageGson;
 import ai.elimu.model.v2.gson.content.StoryBookChapterGson;
 import ai.elimu.model.v2.gson.content.StoryBookParagraphGson;
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
index 6d4b8ab03..bf65ed127 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
@@ -16,19 +16,19 @@
 import ai.elimu.dao.StoryBookParagraphDao;
 import ai.elimu.dao.StoryBookPeerReviewEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.ContentLicense;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.ContentLicense;
 import ai.elimu.model.v2.enums.ReadingLevel;
 import ai.elimu.model.v2.enums.Language;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.DiscordHelper;
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookPeerReviewsController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookPeerReviewsController.java
index b3e7a70b5..2d22f6f55 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookPeerReviewsController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookPeerReviewsController.java
@@ -4,9 +4,9 @@
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookPeerReviewEventDao;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.contributor.StoryBookPeerReviewEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.StoryBookPeerReviewEvent;
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpSession;
diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
index 01326606e..92748916c 100644
--- a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
@@ -4,13 +4,13 @@
 import ai.elimu.dao.StoryBookChapterDao;
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
 import java.util.Calendar;
diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
index 4921913f6..471f6f8a8 100644
--- a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
@@ -7,17 +7,17 @@
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.ImageContributionEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.ImageContributionEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
index 50b8fa2f8..bdc400b47 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
@@ -6,13 +6,13 @@
 import ai.elimu.dao.StoryBookDao;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookChapter;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookChapter;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
index f11d09137..1a3d265d7 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
@@ -4,15 +4,15 @@
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.StoryBookDao;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.multimedia.Audio;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
+import ai.elimu.entity.enums.Role;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.DiscordHelper;
 import ai.elimu.web.context.EnvironmentContextLoaderListener;
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
index 712c2e35a..3c3fa6b02 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
@@ -6,15 +6,15 @@
 import ai.elimu.dao.StoryBookDao;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.StoryBookParagraphDao;
-import ai.elimu.model.content.StoryBook;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.content.StoryBook;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
 import ai.elimu.model.v2.enums.Language;
-import ai.elimu.model.enums.PeerReviewStatus;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.enums.PeerReviewStatus;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.rest.v2.service.StoryBooksJsonService;
 import ai.elimu.util.ConfigHelper;
diff --git a/src/main/java/ai/elimu/web/content/syllable/SyllableCsvExportController.java b/src/main/java/ai/elimu/web/content/syllable/SyllableCsvExportController.java
index d2922c4c9..441d22c56 100644
--- a/src/main/java/ai/elimu/web/content/syllable/SyllableCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/syllable/SyllableCsvExportController.java
@@ -1,8 +1,8 @@
 package ai.elimu.web.content.syllable;
 
 import ai.elimu.dao.SyllableDao;
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.Syllable;
+import ai.elimu.entity.content.Sound;
+import ai.elimu.entity.content.Syllable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
diff --git a/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java b/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
index 73fd6485e..4b83fcd7f 100644
--- a/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
+++ b/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.SyllableDao;
-import ai.elimu.model.content.Syllable;
+import ai.elimu.entity.content.Syllable;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/ai/elimu/web/content/word/WordCreateController.java b/src/main/java/ai/elimu/web/content/word/WordCreateController.java
index 6f208b732..7d35511ac 100644
--- a/src/main/java/ai/elimu/web/content/word/WordCreateController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordCreateController.java
@@ -13,18 +13,18 @@
 import ai.elimu.dao.SyllableDao;
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Syllable;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Syllable;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import ai.elimu.model.v2.enums.Language;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.model.v2.enums.content.SpellingConsistency;
 import ai.elimu.model.v2.enums.content.WordType;
diff --git a/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java b/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
index da8f5fef8..75bda321c 100644
--- a/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
@@ -4,8 +4,8 @@
 import ai.elimu.dao.WordDao;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.util.ConfigHelper;
 import ai.elimu.util.WordFrequencyHelper;
diff --git a/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java b/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java
index a99880834..cfa7ad02f 100644
--- a/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordCsvExportController.java
@@ -1,8 +1,8 @@
 package ai.elimu.web.content.word;
 
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.Word;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
diff --git a/src/main/java/ai/elimu/web/content/word/WordEditController.java b/src/main/java/ai/elimu/web/content/word/WordEditController.java
index c39290bda..c7ba302eb 100644
--- a/src/main/java/ai/elimu/web/content/word/WordEditController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordEditController.java
@@ -14,19 +14,19 @@
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
 import ai.elimu.dao.WordPeerReviewEventDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Letter;
-import ai.elimu.model.content.LetterSoundCorrespondence;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.content.Syllable;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Audio;
-import ai.elimu.model.content.multimedia.Image;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Letter;
+import ai.elimu.entity.content.LetterSoundCorrespondence;
+import ai.elimu.entity.content.StoryBookParagraph;
+import ai.elimu.entity.content.Syllable;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Image;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import ai.elimu.model.v2.enums.Language;
-import ai.elimu.model.enums.Platform;
+import ai.elimu.entity.enums.Platform;
 import ai.elimu.model.v2.enums.content.AudioFormat;
 import ai.elimu.model.v2.enums.content.SpellingConsistency;
 import ai.elimu.model.v2.enums.content.WordType;
diff --git a/src/main/java/ai/elimu/web/content/word/WordListController.java b/src/main/java/ai/elimu/web/content/word/WordListController.java
index 9c84e5251..682b2e36e 100644
--- a/src/main/java/ai/elimu/web/content/word/WordListController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordListController.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import org.apache.logging.log4j.Logger;
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/ai/elimu/web/content/word/WordPeerReviewsController.java b/src/main/java/ai/elimu/web/content/word/WordPeerReviewsController.java
index 1f3bff4f9..87463f0f0 100644
--- a/src/main/java/ai/elimu/web/content/word/WordPeerReviewsController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordPeerReviewsController.java
@@ -4,11 +4,11 @@
 import ai.elimu.dao.WordContributionEventDao;
 import ai.elimu.dao.WordDao;
 import ai.elimu.dao.WordPeerReviewEventDao;
-import ai.elimu.model.content.Emoji;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
-import ai.elimu.model.contributor.WordPeerReviewEvent;
+import ai.elimu.entity.content.Emoji;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordPeerReviewEvent;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java b/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
index c045fa833..9895bf968 100644
--- a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
+++ b/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
@@ -5,13 +5,13 @@
 import ai.elimu.dao.NumberContributionEventDao;
 import ai.elimu.dao.StoryBookContributionEventDao;
 import ai.elimu.dao.WordContributionEventDao;
-import ai.elimu.model.contributor.AudioContributionEvent;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.NumberContributionEvent;
-import ai.elimu.model.contributor.StoryBookContributionEvent;
+import ai.elimu.entity.contributor.AudioContributionEvent;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.NumberContributionEvent;
+import ai.elimu.entity.contributor.StoryBookContributionEvent;
 import java.util.List;
 import org.apache.logging.log4j.Logger;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import java.util.HashMap;
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/ai/elimu/web/download/ApkController.java b/src/main/java/ai/elimu/web/download/ApkController.java
index 712221d9c..657dd1fe2 100644
--- a/src/main/java/ai/elimu/web/download/ApkController.java
+++ b/src/main/java/ai/elimu/web/download/ApkController.java
@@ -14,8 +14,8 @@
 import javax.servlet.http.HttpServletResponse;
 import ai.elimu.dao.ApplicationDao;
 import ai.elimu.dao.ApplicationVersionDao;
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.web.bind.annotation.RequestMethod;
 
diff --git a/src/main/java/ai/elimu/web/download/AudioController.java b/src/main/java/ai/elimu/web/download/AudioController.java
index 1a95e1c30..ede2a2a91 100644
--- a/src/main/java/ai/elimu/web/download/AudioController.java
+++ b/src/main/java/ai/elimu/web/download/AudioController.java
@@ -12,7 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import ai.elimu.dao.AudioDao;
-import ai.elimu.model.content.multimedia.Audio;
+import ai.elimu.entity.content.multimedia.Audio;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/src/main/java/ai/elimu/web/download/ImageController.java b/src/main/java/ai/elimu/web/download/ImageController.java
index d35710a8c..c370b67d5 100644
--- a/src/main/java/ai/elimu/web/download/ImageController.java
+++ b/src/main/java/ai/elimu/web/download/ImageController.java
@@ -12,7 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import ai.elimu.dao.ImageDao;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/src/main/java/ai/elimu/web/download/VideoController.java b/src/main/java/ai/elimu/web/download/VideoController.java
index 50a0cdfe0..966218c9c 100644
--- a/src/main/java/ai/elimu/web/download/VideoController.java
+++ b/src/main/java/ai/elimu/web/download/VideoController.java
@@ -12,7 +12,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import ai.elimu.dao.VideoDao;
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
index 4dc5fe9d8..136205c04 100644
--- a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
+++ b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
@@ -1,5 +1,6 @@
 package ai.elimu.web.servlet;
 
+import ai.elimu.entity.BaseEntity;
 import ai.elimu.model.v2.enums.Environment;
 import ai.elimu.model.v2.enums.Language;
 import ai.elimu.util.ConfigHelper;
@@ -81,7 +82,7 @@ private void createJpaSchemaExport() {
         // Scan for classes annotated as JPA @Entity
         ClassPathScanningCandidateComponentProvider entityScanner = new ClassPathScanningCandidateComponentProvider(true);
         entityScanner.addIncludeFilter(new AnnotationTypeFilter(Entity.class));
-        for (BeanDefinition beanDefinition : entityScanner.findCandidateComponents("ai.elimu.model")) {
+        for (BeanDefinition beanDefinition : entityScanner.findCandidateComponents(BaseEntity.class.getPackageName())) {
             logger.info("beanDefinition.getBeanClassName(): " + beanDefinition.getBeanClassName());
             try {
                 Class<?> annotatedClass = Class.forName(beanDefinition.getBeanClassName());
diff --git a/src/test/java/ai/elimu/dao/ApplicationDaoTest.java b/src/test/java/ai/elimu/dao/ApplicationDaoTest.java
index f4096f75e..1473133f6 100644
--- a/src/test/java/ai/elimu/dao/ApplicationDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ApplicationDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
+import ai.elimu.entity.admin.Application;
 import org.apache.logging.log4j.Logger;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
diff --git a/src/test/java/ai/elimu/dao/ApplicationVersionDaoTest.java b/src/test/java/ai/elimu/dao/ApplicationVersionDaoTest.java
index d4537e6cf..71d8165b5 100644
--- a/src/test/java/ai/elimu/dao/ApplicationVersionDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ApplicationVersionDaoTest.java
@@ -1,7 +1,7 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.admin.Application;
-import ai.elimu.model.admin.ApplicationVersion;
+import ai.elimu.entity.admin.Application;
+import ai.elimu.entity.admin.ApplicationVersion;
 import org.apache.logging.log4j.Logger;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
diff --git a/src/test/java/ai/elimu/dao/BaseDaoTest.java b/src/test/java/ai/elimu/dao/BaseDaoTest.java
index 56c4bef70..5cd4a594f 100644
--- a/src/test/java/ai/elimu/dao/BaseDaoTest.java
+++ b/src/test/java/ai/elimu/dao/BaseDaoTest.java
@@ -1,12 +1,11 @@
 package ai.elimu.dao;
 
-import ai.elimu.dao.ImageDao;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.multimedia.Image;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/ai/elimu/dao/ContributorDaoTest.java b/src/test/java/ai/elimu/dao/ContributorDaoTest.java
index 1692526b8..888f8f4c2 100644
--- a/src/test/java/ai/elimu/dao/ContributorDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ContributorDaoTest.java
@@ -8,7 +8,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import ai.elimu.model.contributor.Contributor;
+import ai.elimu.entity.contributor.Contributor;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/ai/elimu/dao/DeviceDaoTest.java b/src/test/java/ai/elimu/dao/DeviceDaoTest.java
index c7f8f03db..bc5f7be58 100644
--- a/src/test/java/ai/elimu/dao/DeviceDaoTest.java
+++ b/src/test/java/ai/elimu/dao/DeviceDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.Device;
+import ai.elimu.entity.Device;
 import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/src/test/java/ai/elimu/dao/EmojiDaoTest.java b/src/test/java/ai/elimu/dao/EmojiDaoTest.java
index 73d7ef274..12c1d9408 100644
--- a/src/test/java/ai/elimu/dao/EmojiDaoTest.java
+++ b/src/test/java/ai/elimu/dao/EmojiDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Emoji;
+import ai.elimu.entity.content.Emoji;
 import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
diff --git a/src/test/java/ai/elimu/dao/ImageDaoTest.java b/src/test/java/ai/elimu/dao/ImageDaoTest.java
index 026434f2c..e1b7d9ce6 100644
--- a/src/test/java/ai/elimu/dao/ImageDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ImageDaoTest.java
@@ -9,8 +9,8 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import ai.elimu.model.content.Word;
-import ai.elimu.model.content.multimedia.Image;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.content.multimedia.Image;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/ai/elimu/dao/LetterDaoTest.java b/src/test/java/ai/elimu/dao/LetterDaoTest.java
index 8b1f2afb5..61e94219c 100644
--- a/src/test/java/ai/elimu/dao/LetterDaoTest.java
+++ b/src/test/java/ai/elimu/dao/LetterDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
diff --git a/src/test/java/ai/elimu/dao/NumberDaoTest.java b/src/test/java/ai/elimu/dao/NumberDaoTest.java
index 230192f04..812927548 100644
--- a/src/test/java/ai/elimu/dao/NumberDaoTest.java
+++ b/src/test/java/ai/elimu/dao/NumberDaoTest.java
@@ -7,8 +7,8 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import ai.elimu.model.content.Number;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Number;
+import ai.elimu.entity.content.Word;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/ai/elimu/dao/SoundDaoTest.java b/src/test/java/ai/elimu/dao/SoundDaoTest.java
index 12a24b11f..5c5d8059f 100644
--- a/src/test/java/ai/elimu/dao/SoundDaoTest.java
+++ b/src/test/java/ai/elimu/dao/SoundDaoTest.java
@@ -7,7 +7,7 @@
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.enums.content.sound.SoundType;
 import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/ai/elimu/dao/StoryBookParagraphDaoTest.java b/src/test/java/ai/elimu/dao/StoryBookParagraphDaoTest.java
index f0b18c73c..8562c9a13 100644
--- a/src/test/java/ai/elimu/dao/StoryBookParagraphDaoTest.java
+++ b/src/test/java/ai/elimu/dao/StoryBookParagraphDaoTest.java
@@ -1,8 +1,7 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Sound;
-import ai.elimu.model.content.StoryBookParagraph;
-import ai.elimu.model.v2.enums.content.sound.SoundType;
+import ai.elimu.entity.content.StoryBookParagraph;
+
 import java.util.List;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
diff --git a/src/test/java/ai/elimu/dao/VideoDaoTest.java b/src/test/java/ai/elimu/dao/VideoDaoTest.java
index 735970db7..c764b18a0 100644
--- a/src/test/java/ai/elimu/dao/VideoDaoTest.java
+++ b/src/test/java/ai/elimu/dao/VideoDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.multimedia.Video;
+import ai.elimu.entity.content.multimedia.Video;
 import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.FixMethodOrder;
diff --git a/src/test/java/ai/elimu/dao/WordContributionEventDaoTest.java b/src/test/java/ai/elimu/dao/WordContributionEventDaoTest.java
index b6a3a02e9..48950fbde 100644
--- a/src/test/java/ai/elimu/dao/WordContributionEventDaoTest.java
+++ b/src/test/java/ai/elimu/dao/WordContributionEventDaoTest.java
@@ -1,8 +1,8 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
-import ai.elimu.model.contributor.Contributor;
-import ai.elimu.model.contributor.WordContributionEvent;
+import ai.elimu.entity.content.Word;
+import ai.elimu.entity.contributor.Contributor;
+import ai.elimu.entity.contributor.WordContributionEvent;
 import java.util.Calendar;
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/test/java/ai/elimu/dao/WordDaoTest.java b/src/test/java/ai/elimu/dao/WordDaoTest.java
index 9cf3c3235..dd8fce7fa 100644
--- a/src/test/java/ai/elimu/dao/WordDaoTest.java
+++ b/src/test/java/ai/elimu/dao/WordDaoTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.dao;
 
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.content.WordType;
 import junit.framework.TestCase;
 import org.junit.Test;
diff --git a/src/test/java/ai/elimu/util/SyllableHelperTest.java b/src/test/java/ai/elimu/util/SyllableHelperTest.java
index ff59ce67e..aedf6d1bc 100644
--- a/src/test/java/ai/elimu/util/SyllableHelperTest.java
+++ b/src/test/java/ai/elimu/util/SyllableHelperTest.java
@@ -5,7 +5,7 @@
 import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import ai.elimu.model.v2.enums.Language;
 
 public class SyllableHelperTest {
diff --git a/src/test/java/ai/elimu/util/csv/CsvLetterExtractionHelperTest.java b/src/test/java/ai/elimu/util/csv/CsvLetterExtractionHelperTest.java
index eae562598..5424e4f5f 100644
--- a/src/test/java/ai/elimu/util/csv/CsvLetterExtractionHelperTest.java
+++ b/src/test/java/ai/elimu/util/csv/CsvLetterExtractionHelperTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.csv;
 
-import ai.elimu.model.content.Letter;
+import ai.elimu.entity.content.Letter;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -10,7 +10,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
diff --git a/src/test/java/ai/elimu/util/csv/CsvSoundExtractionHelperTest.java b/src/test/java/ai/elimu/util/csv/CsvSoundExtractionHelperTest.java
index 692bbabc3..19743bf86 100644
--- a/src/test/java/ai/elimu/util/csv/CsvSoundExtractionHelperTest.java
+++ b/src/test/java/ai/elimu/util/csv/CsvSoundExtractionHelperTest.java
@@ -1,6 +1,6 @@
 package ai.elimu.util.csv;
 
-import ai.elimu.model.content.Sound;
+import ai.elimu.entity.content.Sound;
 import ai.elimu.model.v2.enums.content.sound.SoundType;
 import org.junit.Before;
 import org.junit.Rule;
@@ -11,7 +11,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
diff --git a/src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java b/src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java
index 2395dc5e2..875499bd7 100644
--- a/src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java
+++ b/src/test/java/ai/elimu/web/content/word/WordCreateControllerTest.java
@@ -1,7 +1,7 @@
 package ai.elimu.web.content.word;
 
 import ai.elimu.dao.WordDao;
-import ai.elimu.model.content.Word;
+import ai.elimu.entity.content.Word;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
diff --git a/src/test/java/selenium/SignOnHelper.java b/src/test/java/selenium/SignOnHelper.java
index b0c7cf677..f89154a09 100644
--- a/src/test/java/selenium/SignOnHelper.java
+++ b/src/test/java/selenium/SignOnHelper.java
@@ -1,6 +1,6 @@
 package selenium;
 
-import ai.elimu.model.enums.Role;
+import ai.elimu.entity.enums.Role;
 import org.openqa.selenium.WebDriver;
 
 public class SignOnHelper {