diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
rename to IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingClinicalDataPDF.cs
rename to IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicalReviewDialog.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingMedicalReviewDialog.cs
rename to IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicalReviewDialog.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineQuestionAnswer.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingMedicineQuestionAnswer.cs
rename to IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineQuestionAnswer.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineSystemQuestion.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingMedicineSystemQuestion.cs
rename to IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineSystemQuestion.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineTrialQuestion.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingMedicineTrialQuestion.cs
rename to IRaCIS.Core.Domain/Reading/MedicalAuditQuestion/ReadingMedicineTrialQuestion.cs
diff --git a/IRaCIS.Core.Domain/Reading/CriterionNidus.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/CriterionNidus.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs
diff --git a/IRaCIS.Core.Domain/Reading/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/OrganInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/OrganTrialInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TumorAssessment.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/TumorAssessment.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/TumorAssessment.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingTableQuestionSystem.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs
rename to IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingGlobalTaskInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingJudgeInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingOncologyTaskInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingTableAnswerRowInfo.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingTableQuestionAnswer.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingTaskQuestionAnswer.cs
rename to IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadModule.cs
rename to IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingPeriodPlan.cs
rename to IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingPeriodSet.cs
rename to IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs
similarity index 100%
rename from IRaCIS.Core.Domain/Reading/ReadingPeriodSite.cs
rename to IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs