diff --git a/app/Controllers/Contact.php b/app/Controllers/Contact/Contact.php
similarity index 98%
rename from app/Controllers/Contact.php
rename to app/Controllers/Contact/Contact.php
index e4dcbf4..5d2ba68 100644
--- a/app/Controllers/Contact.php
+++ b/app/Controllers/Contact/Contact.php
@@ -4,8 +4,8 @@ namespace App\Controllers;
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
 
-use App\Models\ContactModel;
-use App\Models\ContactDetailModel;
+use App\Models\Contact\ContactModel;
+use App\Models\Contact\ContactDetailModel;
 
 class Contact extends Controller {
     use ResponseTrait;
diff --git a/app/Controllers/Occupation.php b/app/Controllers/Contact/Occupation.php
similarity index 58%
rename from app/Controllers/Occupation.php
rename to app/Controllers/Contact/Occupation.php
index 73971d4..f3cdd01 100644
--- a/app/Controllers/Occupation.php
+++ b/app/Controllers/Contact/Occupation.php
@@ -2,26 +2,25 @@
 namespace App\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
-use CodeIgniter\Controller;
-use App\Models\OccupationModel;
+use CodeIgniter\BaseController;
+use App\Models\Contact\OccupationModel;
 
-class Occupation extends Controller {
+class Occupation extends BaseController {
     use ResponseTrait;
 
     protected $db;
-    protected $modelOccupation;
-    protected $rulesOccupation;
+    protected $model;
+    protected $rules;
 
     public function __construct() {
         $this->db = \Config\Database::connect();
-        $this->modelOccupation = new OccupationModel();
-        $this->rulesOccupation = [ 'OccCode' => 'required','OccText' => 'required' ];
+        $this->model = new OccupationModel();
+        $this->rules = [ 'OccCode' => 'required','OccText' => 'required' ];
     }
 
     public function index() {
         $model = new OccupationModel();
-        $rows = $model->get()->getResultArray();
-        
+        $rows = $model->findAll();
         if (empty($rows)) {
             return $this->respond([ 'status'  => 'success', 'message' => "no Data."], 200);
         }
@@ -31,26 +30,17 @@ class Occupation extends Controller {
 
     public function show($OccupationID = null) {
         $model = new OccupationModel();
-        $rows = $model->where('occupationID', (int) $OccupationID)->get()->getResultArray();
-        
+        $rows = $model->find($OccupationID);
         if (empty($rows)) {
             return $this->respond([ 'status'  => 'success', 'message' => "no Data."], 200);
         }
-
         return $this->respond([ 'status' => 'success', 'message'=> "fetch success", 'data'   => $rows ], 200);
     }
 
     public function create() {
         $input = $this->request->getJSON(true);
         try {
-            $this->db->transStart();
-            $insert = $this->modelOccupation->insert($input);
-            $this->db->transComplete();
-
-            if ($this->db->transStatus() === false || !$insert) {
-                return $this->fail();
-            }
-            
+            $insert = $this->model->insert($input);
             return $this->respondCreated([ 'status'  => 'success', 'message' => 'data created successfully', 'data' => $input ], 201);
         } catch (\Throwable $e) {
             $this->db->transRollback();
@@ -61,18 +51,7 @@ class Occupation extends Controller {
     public function update() {
         $input = $this->request->getJSON(true);
         try {
-            if (!$this->modelOccupation->find($input['OccupationID'])) {
-                return $this->failNotFound('Data not found');
-            }
-            
-            $this->db->transStart();
-            $update = $this->modelOccupation->update($input['OccupationID'], $input);
-            $this->db->transComplete();
-
-            if ($this->db->transStatus() === false || !$insert) {
-                return $this->fail();
-            }
-
+            $this->modelOccupation->update($input['OccupationID'], $input);
             return $this->respondCreated([ 'status'  => 'success', 'message' => 'Data updated successfully', 'data' => $input ], 201);
         } catch (\Throwable $e) {
             $this->db->transRollback();
diff --git a/app/Controllers/ValueSet/ValueSet.php b/app/Controllers/ValueSet/ValueSet.php
index f412f0c..f0f753b 100644
--- a/app/Controllers/ValueSet/ValueSet.php
+++ b/app/Controllers/ValueSet/ValueSet.php
@@ -37,10 +37,7 @@ class ValueSet extends BaseController {
     }
 
     public function showByValueSetDef($VSetID = null) {
-        $rows = $this->db->table('valueset')
-            ->select("*")
-            ->where('VSetID', (int) $VSetID)
-            ->get()->getResultArray();
+        $rows = $this->model->getValueSetByValueSetDef($VSetID);
         if (empty($rows)) {
             return $this->respond([ 'status'  => 'success', 'message' => "ValueSet not found.", 'data' => [] ], 200);
         }
diff --git a/app/Models/BaseUtcModel.php b/app/Models/BaseModel.php
similarity index 95%
rename from app/Models/BaseUtcModel.php
rename to app/Models/BaseModel.php
index c276b5b..9e3ba00 100644
--- a/app/Models/BaseUtcModel.php
+++ b/app/Models/BaseModel.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use CodeIgniter\Model;
 
-class BaseUtcModel extends Model {
+class BaseModel extends Model {
   protected $beforeInsert = ['normalizeDatesToUTC'];
   protected $beforeUpdate = ['normalizeDatesToUTC'];
   protected $afterFind   = ['convertDatesToUTCISO'];
diff --git a/app/Models/ContactDetailModel.php b/app/Models/Contact/ContactDetailModel.php
similarity index 94%
rename from app/Models/ContactDetailModel.php
rename to app/Models/Contact/ContactDetailModel.php
index c70767d..5a94f5f 100644
--- a/app/Models/ContactDetailModel.php
+++ b/app/Models/Contact/ContactDetailModel.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Contact;
 
-use CodeIgniter\Model;
+use App\Models\BaseModel;
 
-class ContactDetailModel extends BaseUtcModel {
+class ContactDetailModel extends BaseModel {
   protected $table      = 'contactdetail';
   protected $primaryKey = 'ContactDetID';
   protected $allowedFields = ['ContactID', 'SiteID', 'ContactCode', 'ContactEmail', 'OccupationID', 'JobTitle', 'Department', 'ContactStartDate', 'ContactEndDate']; 
diff --git a/app/Models/ContactModel.php b/app/Models/Contact/ContactModel.php
similarity index 97%
rename from app/Models/ContactModel.php
rename to app/Models/Contact/ContactModel.php
index 6463b3e..1e91c6f 100644
--- a/app/Models/ContactModel.php
+++ b/app/Models/Contact/ContactModel.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Contact;
 
-use CodeIgniter\Model;
+use App\Models\BaseModel;
 
-class ContactModel extends BaseUtcModel {
+class ContactModel extends BaseModel {
   protected $table      = 'contact';
   protected $primaryKey = 'ContactID';
   protected $allowedFields = ['NameFirst', 'NameLast', 'Title', 'Initial', 'Birthdate', 'EmailAddress1', 'EmailAddress2', 'Phone', 'MobilePhone1', 'MobilePhone2', 'Specialty', 'SubSpecialty', 'CreateDate', 'EndDate']; 
diff --git a/app/Models/OccupationModel.php b/app/Models/Contact/OccupationModel.php
similarity index 62%
rename from app/Models/OccupationModel.php
rename to app/Models/Contact/OccupationModel.php
index dccb6a7..1ab32a7 100644
--- a/app/Models/OccupationModel.php
+++ b/app/Models/Contact/OccupationModel.php
@@ -1,8 +1,9 @@
 <?php
+namespace App\Models\Contact;
 
-namespace App\Models;
+use App\Models\BaseModel;
 
-class OccupationModel extends BaseUtcModel {
+class OccupationModel extends BaseModel {
   protected $table      = 'occupation';
   protected $primaryKey = 'OccupationID';
   protected $allowedFields = ['OccCode', 'OccText', 'Description']; 
diff --git a/app/Models/CounterModel.php b/app/Models/CounterModel.php
index c564b08..b2902cd 100644
--- a/app/Models/CounterModel.php
+++ b/app/Models/CounterModel.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-class CounterModel extends BaseUtcModel {
+class CounterModel extends BaseModel {
   protected $table      = 'counter';
   protected $primaryKey = 'CounterID';
   protected $allowedFields = ['CounterValue', 'CounterStart', 'CounterEnd', 'CounterReset']; 
diff --git a/app/Models/PatVisitModel.php b/app/Models/PatVisitModel.php
index 1bb255b..4de7380 100644
--- a/app/Models/PatVisitModel.php
+++ b/app/Models/PatVisitModel.php
@@ -4,7 +4,7 @@ namespace App\Models;
 
 use App\Models\CounterModel;
 
-class PatVisitModel extends BaseUtcModel {
+class PatVisitModel extends BaseModel {
 	protected $table      = 'patvisit';
 	protected $primaryKey = 'InternalPVID';
 	protected $allowedFields = ['PVID', 'InternalPID', 'EpisodeID', 'CreateDate', 'EndDate'];
diff --git a/app/Models/PatientModel.php b/app/Models/PatientModel.php
index f1e17e1..af0cee8 100644
--- a/app/Models/PatientModel.php
+++ b/app/Models/PatientModel.php
@@ -3,7 +3,7 @@ namespace App\Models;
 
 use CodeIgniter\Database\RawSql;
 
-class PatientModel extends BaseUtcModel {
+class PatientModel extends BaseModel {
   protected $table      = 'patient';
   protected $primaryKey = 'InternalPID';
   protected $allowedFields = ['PatientID', 'AlternatePID', 'Prefix', 'NameFirst', 'NameMiddle', 'NameMaiden', 'NameLast', 'Suffix', 'NameAlias', 'Gender', 'Birthdate', 'PlaceOfBirth', 'Street_1', 'Street_2', 'Street_3', 
diff --git a/app/Models/Specimen/ContainerDefModel.php b/app/Models/Specimen/ContainerDefModel.php
index 88cec28..03ba649 100644
--- a/app/Models/Specimen/ContainerDefModel.php
+++ b/app/Models/Specimen/ContainerDefModel.php
@@ -3,7 +3,7 @@ namespace App\Models\Specimen;
 
 use App\Models\BaseUtcModel;
 
-class ContainerDefModel extends BaseUtcModel {
+class ContainerDefModel extends BaseModel {
   protected $table      = 'containerdef';
   protected $primaryKey = 'ConDefID';
   protected $allowedFields = ['SiteID', 'ConCode', 'ConName', 'ConDesc', 'Additive', 'ConClass', 'Color', 'CreateDate', 'EndDate']; 
diff --git a/app/Models/ValueSet/ValueSetDefModel.php b/app/Models/ValueSet/ValueSetDefModel.php
index 0c13ec1..5b0d6b1 100644
--- a/app/Models/ValueSet/ValueSetDefModel.php
+++ b/app/Models/ValueSet/ValueSetDefModel.php
@@ -4,7 +4,7 @@ namespace App\Models\ValueSet;
 
 use App\Models\BaseUtcModel;
 
-class ValueSetDefModel extends BaseUtcModel {
+class ValueSetDefModel extends BaseModel {
   protected $table      = 'valuesetdef';
   protected $primaryKey = 'VSetID';
   protected $allowedFields = ['SiteID', 'VSName', 'VSDesc', 'CreateDate', 'EndDate']; 
diff --git a/app/Models/ValueSet/ValueSetModel.php b/app/Models/ValueSet/ValueSetModel.php
index 44adf44..edb0a94 100644
--- a/app/Models/ValueSet/ValueSetModel.php
+++ b/app/Models/ValueSet/ValueSetModel.php
@@ -2,9 +2,9 @@
 
 namespace App\Models\ValueSet;
 
-use App\Models\BaseUtcModel;
+use App\Models\BaseModel;
 
-class ValueSetModel extends BaseUtcModel {
+class ValueSetModel extends BaseModel {
   protected $table      = 'valueset';
   protected $primaryKey = 'VID';
   protected $allowedFields = ['SiteID', 'VSetID', 'VOrder', 'VValue', 'VDesc', 'VCategory', 'CreateDate', 'EndDate']; 
@@ -44,4 +44,10 @@ class ValueSetModel extends BaseUtcModel {
 		return $rows;
 	}
 
+  public function getValueSetByValueSetDef($VSetID) {
+		$rows = $this->where('VSetID', (int) $VSetID)->findAll();
+		return $rows;
+	}
+  
+
 }