diff --git a/src/main/java/com/techconative/posf/core/IPOSFService.java b/src/main/java/com/techconative/posf/core/IPOSFService.java
index a7ba715..777fbf7 100644
--- a/src/main/java/com/techconative/posf/core/IPOSFService.java
+++ b/src/main/java/com/techconative/posf/core/IPOSFService.java
@@ -1,7 +1,7 @@
 package com.techconative.posf.core;
 
-import com.techconative.posf.modal.PageResult;
-import com.techconative.posf.modal.POSFCriteria;
+import com.techconative.posf.model.PageResult;
+import com.techconative.posf.model.POSFCriteria;
 
 /**
  * Interface of main class to be implemented to use the library
diff --git a/src/main/java/com/techconative/posf/modal/OrderingCriteria.java b/src/main/java/com/techconative/posf/model/OrderingCriteria.java
similarity index 81%
rename from src/main/java/com/techconative/posf/modal/OrderingCriteria.java
rename to src/main/java/com/techconative/posf/model/OrderingCriteria.java
index 913e3a3..285f79a 100644
--- a/src/main/java/com/techconative/posf/modal/OrderingCriteria.java
+++ b/src/main/java/com/techconative/posf/model/OrderingCriteria.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 /** Order Criteria for sorting of data */
 public enum OrderingCriteria {
diff --git a/src/main/java/com/techconative/posf/modal/POSFCriteria.java b/src/main/java/com/techconative/posf/model/POSFCriteria.java
similarity index 94%
rename from src/main/java/com/techconative/posf/modal/POSFCriteria.java
rename to src/main/java/com/techconative/posf/model/POSFCriteria.java
index 5f85940..5ab9b82 100644
--- a/src/main/java/com/techconative/posf/modal/POSFCriteria.java
+++ b/src/main/java/com/techconative/posf/model/POSFCriteria.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/techconative/posf/modal/PageResult.java b/src/main/java/com/techconative/posf/model/PageResult.java
similarity index 94%
rename from src/main/java/com/techconative/posf/modal/PageResult.java
rename to src/main/java/com/techconative/posf/model/PageResult.java
index d70b368..4994bcf 100644
--- a/src/main/java/com/techconative/posf/modal/PageResult.java
+++ b/src/main/java/com/techconative/posf/model/PageResult.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import java.util.List;
 
diff --git a/src/main/java/com/techconative/posf/service/POSFService.java b/src/main/java/com/techconative/posf/service/POSFService.java
index 7d25803..a62208f 100644
--- a/src/main/java/com/techconative/posf/service/POSFService.java
+++ b/src/main/java/com/techconative/posf/service/POSFService.java
@@ -1,8 +1,8 @@
 package com.techconative.posf.service;
 
 import com.techconative.posf.core.IPOSFService;
-import com.techconative.posf.modal.PageResult;
-import com.techconative.posf.modal.POSFCriteria;
+import com.techconative.posf.model.PageResult;
+import com.techconative.posf.model.POSFCriteria;
 import com.techconative.posf.util.POSFUtil;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/src/main/java/com/techconative/posf/util/POSFUtil.java b/src/main/java/com/techconative/posf/util/POSFUtil.java
index 91f944c..1f931b5 100644
--- a/src/main/java/com/techconative/posf/util/POSFUtil.java
+++ b/src/main/java/com/techconative/posf/util/POSFUtil.java
@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.techconative.posf.modal.OrderingCriteria;
-import com.techconative.posf.modal.PageResult;
-import com.techconative.posf.modal.POSFCriteria;
+import com.techconative.posf.model.OrderingCriteria;
+import com.techconative.posf.model.PageResult;
+import com.techconative.posf.model.POSFCriteria;
 import exception.InvalidCriteriaException;
 import java.util.*;
 import java.util.regex.Pattern;
diff --git a/src/test/java/com/techconative/posf/CounterService.java b/src/test/java/com/techconative/posf/CounterService.java
index 8b36644..ba6b389 100644
--- a/src/test/java/com/techconative/posf/CounterService.java
+++ b/src/test/java/com/techconative/posf/CounterService.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.techconative.posf.modal.Counters;
+import com.techconative.posf.model.Counters;
 import com.techconative.posf.service.POSFService;
 import java.io.IOException;
 import java.util.List;
diff --git a/src/test/java/com/techconative/posf/CucumberStepDefinitions.java b/src/test/java/com/techconative/posf/CucumberStepDefinitions.java
index 3dd1e2e..a744e44 100644
--- a/src/test/java/com/techconative/posf/CucumberStepDefinitions.java
+++ b/src/test/java/com/techconative/posf/CucumberStepDefinitions.java
@@ -1,9 +1,9 @@
 package com.techconative.posf;
 
 import com.techconative.posf.core.IPOSFService;
-import com.techconative.posf.modal.OrderingCriteria;
-import com.techconative.posf.modal.PageResult;
-import com.techconative.posf.modal.POSFCriteria;
+import com.techconative.posf.model.OrderingCriteria;
+import com.techconative.posf.model.PageResult;
+import com.techconative.posf.model.POSFCriteria;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
diff --git a/src/test/java/com/techconative/posf/FeedService.java b/src/test/java/com/techconative/posf/FeedService.java
index c04723c..ab5f433 100644
--- a/src/test/java/com/techconative/posf/FeedService.java
+++ b/src/test/java/com/techconative/posf/FeedService.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.techconative.posf.modal.Feed;
+import com.techconative.posf.model.Feed;
 import com.techconative.posf.service.POSFService;
 import java.io.IOException;
 import java.util.List;
diff --git a/src/test/java/com/techconative/posf/StudentService.java b/src/test/java/com/techconative/posf/StudentService.java
index 92d3c77..348c564 100644
--- a/src/test/java/com/techconative/posf/StudentService.java
+++ b/src/test/java/com/techconative/posf/StudentService.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.techconative.posf.modal.Student;
+import com.techconative.posf.model.Student;
 import com.techconative.posf.service.POSFService;
 import java.io.IOException;
 import java.util.List;
diff --git a/src/test/java/com/techconative/posf/modal/Counters.java b/src/test/java/com/techconative/posf/model/Counters.java
similarity index 85%
rename from src/test/java/com/techconative/posf/modal/Counters.java
rename to src/test/java/com/techconative/posf/model/Counters.java
index 8530dde..b593a51 100644
--- a/src/test/java/com/techconative/posf/modal/Counters.java
+++ b/src/test/java/com/techconative/posf/model/Counters.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import java.util.List;
 import lombok.Data;
diff --git a/src/test/java/com/techconative/posf/modal/DailyFields.java b/src/test/java/com/techconative/posf/model/DailyFields.java
similarity index 78%
rename from src/test/java/com/techconative/posf/modal/DailyFields.java
rename to src/test/java/com/techconative/posf/model/DailyFields.java
index 6ab024a..f0735b5 100644
--- a/src/test/java/com/techconative/posf/modal/DailyFields.java
+++ b/src/test/java/com/techconative/posf/model/DailyFields.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import lombok.Data;
 
diff --git a/src/test/java/com/techconative/posf/modal/DateCounter.java b/src/test/java/com/techconative/posf/model/DateCounter.java
similarity index 79%
rename from src/test/java/com/techconative/posf/modal/DateCounter.java
rename to src/test/java/com/techconative/posf/model/DateCounter.java
index 0c8ab1f..6c9ee88 100644
--- a/src/test/java/com/techconative/posf/modal/DateCounter.java
+++ b/src/test/java/com/techconative/posf/model/DateCounter.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import java.util.List;
 import lombok.Data;
diff --git a/src/test/java/com/techconative/posf/modal/Feed.java b/src/test/java/com/techconative/posf/model/Feed.java
similarity index 99%
rename from src/test/java/com/techconative/posf/modal/Feed.java
rename to src/test/java/com/techconative/posf/model/Feed.java
index 763d822..eb60dc8 100644
--- a/src/test/java/com/techconative/posf/modal/Feed.java
+++ b/src/test/java/com/techconative/posf/model/Feed.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;
diff --git a/src/test/java/com/techconative/posf/modal/LikeDislike.java b/src/test/java/com/techconative/posf/model/LikeDislike.java
similarity index 93%
rename from src/test/java/com/techconative/posf/modal/LikeDislike.java
rename to src/test/java/com/techconative/posf/model/LikeDislike.java
index 8f2f9a4..946fde8 100644
--- a/src/test/java/com/techconative/posf/modal/LikeDislike.java
+++ b/src/test/java/com/techconative/posf/model/LikeDislike.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 public class LikeDislike {
 
diff --git a/src/test/java/com/techconative/posf/modal/MultiMedium.java b/src/test/java/com/techconative/posf/model/MultiMedium.java
similarity index 97%
rename from src/test/java/com/techconative/posf/modal/MultiMedium.java
rename to src/test/java/com/techconative/posf/model/MultiMedium.java
index 58cdb14..4ae1c1f 100644
--- a/src/test/java/com/techconative/posf/modal/MultiMedium.java
+++ b/src/test/java/com/techconative/posf/model/MultiMedium.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Date;
diff --git a/src/test/java/com/techconative/posf/modal/Student.java b/src/test/java/com/techconative/posf/model/Student.java
similarity index 98%
rename from src/test/java/com/techconative/posf/modal/Student.java
rename to src/test/java/com/techconative/posf/model/Student.java
index a0840af..cd559bb 100644
--- a/src/test/java/com/techconative/posf/modal/Student.java
+++ b/src/test/java/com/techconative/posf/model/Student.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/test/java/com/techconative/posf/modal/YearMonth.java b/src/test/java/com/techconative/posf/model/YearMonth.java
similarity index 76%
rename from src/test/java/com/techconative/posf/modal/YearMonth.java
rename to src/test/java/com/techconative/posf/model/YearMonth.java
index a67dbd2..a36bae9 100644
--- a/src/test/java/com/techconative/posf/modal/YearMonth.java
+++ b/src/test/java/com/techconative/posf/model/YearMonth.java
@@ -1,4 +1,4 @@
-package com.techconative.posf.modal;
+package com.techconative.posf.model;
 
 import java.util.List;
 import lombok.Data;