diff --git a/Models/Models/AlternativeAndSupplementalServices-FederalPrograms.mmd b/Models/AlternativeAndSupplementalServices-FederalPrograms.mmd
similarity index 96%
rename from Models/Models/AlternativeAndSupplementalServices-FederalPrograms.mmd
rename to Models/AlternativeAndSupplementalServices-FederalPrograms.mmd
index 603d7f5f..4cde17a7 100644
--- a/Models/Models/AlternativeAndSupplementalServices-FederalPrograms.mmd
+++ b/Models/AlternativeAndSupplementalServices-FederalPrograms.mmd
@@ -141,12 +141,12 @@ erDiagram
     }
     EducationOrganization ||--o{ Program : "HasAssociated"
     EducationOrganization }o--o{ Program : "IsDirectProviderOf"
-    Student |o..o{ GeneralStudentProgramAssociation : "ParticipatesIn"
-    Program |o..o{ GeneralStudentProgramAssociation : "ParticipatesIn"
+    Student ||..o{ GeneralStudentProgramAssociation : "ParticipatesIn"
+    Program ||..o{ GeneralStudentProgramAssociation : "ParticipatesIn"
     Student }o--o{ Program : "ParticipatesIn IsEvaluated"
     GeneralStudentProgramAssociation }o--|| EducationOrganization : "HasAssociated"
-    Student |o..o{ StudentSpecialEducationProgramEligibilityAssociation : "IsEvaluated"
-    Program |o..o{ StudentSpecialEducationProgramEligibilityAssociation : "IsEvaluated"
+    Student ||..o{ StudentSpecialEducationProgramEligibilityAssociation : "IsEvaluated"
+    Program ||..o{ StudentSpecialEducationProgramEligibilityAssociation : "IsEvaluated"
     StudentSpecialEducationProgramEligibilityAssociation }o--|| EducationOrganization : "HasAssociated"
     StudentCTEProgramAssociation ||--|| GeneralStudentProgramAssociation : "IsA"
     StudentHomelessProgramAssociation ||--|| GeneralStudentProgramAssociation : "IsA"
diff --git a/Models/Models/AlternativeAndSupplementalServices.mmd b/Models/AlternativeAndSupplementalServices.mmd
similarity index 99%
rename from Models/Models/AlternativeAndSupplementalServices.mmd
rename to Models/AlternativeAndSupplementalServices.mmd
index f8c12a0f..fbe15650 100644
--- a/Models/Models/AlternativeAndSupplementalServices.mmd
+++ b/Models/AlternativeAndSupplementalServices.mmd
@@ -171,7 +171,7 @@ erDiagram
     Student }o--o{ Program : "ParticipatesIn"
     Program }o--o{ Staff : "HasAssociated"
     Section }o--o{ Program : "HasAssociated"
-    Section ||--|| School : "HasAssociated"
+    Section }|--|| School : "HasAssociated"
     Student }o--o{ School : "HasAssociated"
     Staff }o--o{ School : "HasAssociated"
     Program ||..o{ GeneralStudentProgramAssociation : "HasAssociated"
diff --git a/Models/Models/Assessment-AssessmentMetaData.mmd b/Models/Assessment-AssessmentMetaData.mmd
similarity index 96%
rename from Models/Models/Assessment-AssessmentMetaData.mmd
rename to Models/Assessment-AssessmentMetaData.mmd
index f2c3aec1..c8d1528c 100644
--- a/Models/Models/Assessment-AssessmentMetaData.mmd
+++ b/Models/Assessment-AssessmentMetaData.mmd
@@ -95,11 +95,11 @@ erDiagram
         descriptor ProgramSponsor "OC"
         reference LearningStandard "OC"
     }
-    ObjectiveAssessment ||--o{ ObjectiveAssessment : "HasFunctionalComponent"
+    ObjectiveAssessment }o--o{ ObjectiveAssessment : "HasFunctionalComponent"
     ObjectiveAssessment }o--o{ AssessmentItem : "HasFunctionalComponent"
     Assessment ||--o{ ObjectiveAssessment : "HasAssociated"
     Assessment ||--o{ AssessmentItem : "HasAssociated"
-    Assessment ||--o| EducationOrganization : "HasAssociated"
+    Assessment }o--o| EducationOrganization : "HasAssociated"
     Assessment }o--o{ Section : "HasAssociated"
     Assessment }o--o{ Program : "HasAssociated"
     Section }o--o{ Program : "HasAssociated"
diff --git a/Models/Models/Assessment-Standards.mmd b/Models/Assessment-Standards.mmd
similarity index 92%
rename from Models/Models/Assessment-Standards.mmd
rename to Models/Assessment-Standards.mmd
index 95efcd72..3a60c1fc 100644
--- a/Models/Models/Assessment-Standards.mmd
+++ b/Models/Assessment-Standards.mmd
@@ -30,5 +30,4 @@ erDiagram
     }
     LearningStandard ||--o{ LearningStandard : "hasFunctionalComponent"
     LearningStandardEquivalenceAssociation }o..|| LearningStandard : "hasAssociatedEquivalence"
-    LearningStandardEquivalenceAssociation ||..o{ LearningStandard : "hasAssociatedEquivalence"
     LearningStandard }o--o{ LearningStandard : "hasAssociatedEquivalence"
diff --git a/Models/Models/Assessment-StudentAssessment.mmd b/Models/Assessment-StudentAssessment.mmd
similarity index 100%
rename from Models/Models/Assessment-StudentAssessment.mmd
rename to Models/Assessment-StudentAssessment.mmd
diff --git a/Models/Models/Assessment.mmd b/Models/Assessment.mmd
similarity index 95%
rename from Models/Models/Assessment.mmd
rename to Models/Assessment.mmd
index 2c294b40..ba297dc8 100644
--- a/Models/Models/Assessment.mmd
+++ b/Models/Assessment.mmd
@@ -189,24 +189,22 @@ erDiagram
     }
     StudentAssessment }o--|| Student : "HasAssociated"
     StudentAssessment }o--|| Assessment : "HasAssociated"
-    StudentAssessment }o--o{ EducationOrganization : "HasAssociated"
     StudentAssessmentEducationOrganizationAssociation }o..|| StudentAssessment : "HasAssociated"
     StudentAssessmentEducationOrganizationAssociation }o..|| EducationOrganization : "HasAssociated"
-    StudentAssessment }o--|| School : "HasCausalRelationship"
+    StudentAssessment }o--o| School : "HasAssociated"
     Assessment }o--o| EducationOrganization : "HasAssociated"
     Assessment }o--o{ Section : "HasAssociated"
     Assessment }o--o{ Program : "HasAssociated"
     ObjectiveAssessment }o--|| Assessment : "HasAssociated"
-    ObjectiveAssessment ||--o{ ObjectiveAssessment : "HasFunctionalComponent"
+    ObjectiveAssessment }o--o{ ObjectiveAssessment : "HasFunctionalComponent"
     ObjectiveAssessment }o--o{ AssessmentItem : "HasFunctionalComponent"
     ObjectiveAssessment }o--o{ LearningStandard : "HasAssociated"
     AssessmentItem }o--o{ LearningStandard : "HasAssociated"
     AssessmentItem }o--|| Assessment : "HasAssociated"
-    AssessmentScoreRangeLearningStandard }o--|| LearningStandard : "HasAssociated"
+    AssessmentScoreRangeLearningStandard }o--|{ LearningStandard : "HasAssociated"
     AssessmentScoreRangeLearningStandard }o--|| Assessment : "HasAssociated"
     AssessmentScoreRangeLearningStandard }o--o| ObjectiveAssessment : "HasAssociated"
     LearningStandardEquivalenceAssociation }o..|| LearningStandard : "HasAssociatedEquivalence"
-    LearningStandardEquivalenceAssociation ||..o{ LearningStandard : "HasAssociatedEquivalence"
     LearningStandard }o--o{ LearningStandard : "HasAssociatedEquivalence"
     LearningStandard ||--o{ LearningStandard : "HasFunctionalComponent"
     Program }o--o{ LearningStandard : "HasAssociated"
diff --git a/Models/Models/AssessmentRegistration.mmd b/Models/AssessmentRegistration.mmd
similarity index 99%
rename from Models/Models/AssessmentRegistration.mmd
rename to Models/AssessmentRegistration.mmd
index 8e157ec8..9c8ee65a 100644
--- a/Models/Models/AssessmentRegistration.mmd
+++ b/Models/AssessmentRegistration.mmd
@@ -188,7 +188,7 @@ erDiagram
     StudentAssessmentRegistration }o--|| AssessmentAdministration : "HasAssociated"
     StudentAssessmentRegistration }o--|| StudentSchoolAssociation : "HasAssociated"
     StudentAssessmentRegistration }o--|| EducationOrganization : "HasAssociated"
-    StudentAssessmentRegistration }o--|| StudentEducationOrganizationAssessmentAccommodation : "HasAssociated"
+    StudentAssessmentRegistration }o--o| StudentEducationOrganizationAssessmentAccommodation : "HasAssociated"
     StudentAssessmentRegistrationBatteryPartAssociation }o--|| StudentAssessmentRegistration : "HasAssociated"
     StudentAssessmentRegistrationBatteryPartAssociation }o--|| AssessmentBatteryPart : "HasAssociated"
     StudentEducationOrganizationAssessmentAccommodation }o--|| Student : "HasAssociated"
diff --git a/Models/Models/BellSchedule.mmd b/Models/BellSchedule.mmd
similarity index 96%
rename from Models/Models/BellSchedule.mmd
rename to Models/BellSchedule.mmd
index d2bb91ff..7eecb858 100644
--- a/Models/Models/BellSchedule.mmd
+++ b/Models/BellSchedule.mmd
@@ -84,7 +84,7 @@ erDiagram
     }
     School ||--|| EducationOrganization : "IsA"
     BellSchedule }o--|| School : "HasAssociated"
-    BellSchedule ||--o| ClassPeriod : "HasAssociated"
+    BellSchedule ||--|{ ClassPeriod : "HasAssociated"
     ClassPeriod }o--|| School : "HasAssociated"
-    Session }|--o| School : "HasAssociated"
+    Session }|--|| School : "HasAssociated"
     Section ||--o{ ClassPeriod : "HasAssociated"
diff --git a/Models/Models/Credential.mmd b/Models/Credential.mmd
similarity index 98%
rename from Models/Models/Credential.mmd
rename to Models/Credential.mmd
index eaad2fdf..44452bdc 100644
--- a/Models/Models/Credential.mmd
+++ b/Models/Credential.mmd
@@ -162,4 +162,4 @@ erDiagram
     CertificationExam }o--o{ EducationOrganization : "HasAssociated"
     CertificationExamResult }o--|| CertificationExam : "HasAssociated"
     CertificationExamResult }o--|| Person : "HasAssociated"
-    CertificationExamResult |o--|| StudentAssessment : "HasAssociated"
+    CertificationExamResult |o--o| StudentAssessment : "HasAssociated"
diff --git a/Models/Models/Discipline.mmd b/Models/Discipline.mmd
similarity index 97%
rename from Models/Models/Discipline.mmd
rename to Models/Discipline.mmd
index c6c921b4..e6de3bc5 100644
--- a/Models/Models/Discipline.mmd
+++ b/Models/Discipline.mmd
@@ -98,11 +98,11 @@ erDiagram
     }
     Student }o--o{ School : "HasAssociated"
     Student }o--o{ DisciplineIncident : "ParticipatesIn"
-    DisciplineAction }o--o{ Student : "HasAssociated"
+    DisciplineAction }o--|| Student : "HasAssociated"
     DisciplineAction }o--o{ StudentDisciplineIncidentBehaviorAssociation : "HasAssociated"
     DisciplineAction }o--o{ Staff : "HasAssociated"
     DisciplineAction }o--|| School : "HasAssociated"
-    DisciplineAction }o--|| School : "HasCasualRelationship"
+    DisciplineAction }o--o| School : "HasCausalRelationship"
     DisciplineIncident }o--|| School : "HasAssociated"
     DisciplineIncident ||..o{ StaffDisciplineIncidentAssociation : "ParticipatesIn"
     Staff ||..o{ StaffDisciplineIncidentAssociation : "ParticipatesIn"
diff --git a/Models/Models/EducationOrganization.mmd b/Models/EducationOrganization.mmd
similarity index 98%
rename from Models/Models/EducationOrganization.mmd
rename to Models/EducationOrganization.mmd
index 6db9278d..4ba6a675 100644
--- a/Models/Models/EducationOrganization.mmd
+++ b/Models/EducationOrganization.mmd
@@ -118,7 +118,7 @@ erDiagram
     CommunityOrganization ||--|| EducationOrganization : "IsA"
     OrganizationDepartment }o--o| EducationOrganization : "IsOrganizationComponentOf"
     OrganizationDepartment ||--|| EducationOrganization : "IsA"
-    EducationOrganization }o--o{ EducationOrganization : "hasAssociatedPeer"
+    EducationOrganization }o--o{ EducationOrganizationPeerAssociation : "hasAssociatedPeer"
      EducationOrganizationNetwork ||--|| EducationOrganization : "IsA"
     EducationOrganizationNetwork }o--o{ EducationOrganization : "HasAssociated"
     EducationOrganization ||..o{ EducationOrganizationNetworkAssociation : "HasAssociated"
diff --git a/Models/Models/EducatorPreparationProgram.mmd b/Models/EducatorPreparationProgram.mmd
similarity index 100%
rename from Models/Models/EducatorPreparationProgram.mmd
rename to Models/EducatorPreparationProgram.mmd
diff --git a/Models/Models/Enrollment.mmd b/Models/Enrollment.mmd
similarity index 99%
rename from Models/Models/Enrollment.mmd
rename to Models/Enrollment.mmd
index 43584ee4..368e4c79 100644
--- a/Models/Models/Enrollment.mmd
+++ b/Models/Enrollment.mmd
@@ -189,5 +189,5 @@ erDiagram
     AccountabilityRating }o--|| EducationOrganization : "HasAssociated"
     School ||--|| EducationOrganization : "IsA"
     School }o--o| LocalEducationAgency : "IsOrganizationalComponentOf"
-    LocalEducationAgency }o--|| EducationOrganization : "HasAssociated"
+    LocalEducationAgency }o--|| EducationOrganization : "IsA"
     LocalEducationAgency }o--o| LocalEducationAgency : "IsOrganizationalComponentOf"
diff --git a/Models/Models/Finance.mmd b/Models/Finance.mmd
similarity index 97%
rename from Models/Models/Finance.mmd
rename to Models/Finance.mmd
index ed2316f2..b3532f94 100644
--- a/Models/Models/Finance.mmd
+++ b/Models/Finance.mmd
@@ -120,8 +120,6 @@ erDiagram
         string CodeName "O"
         descriptor ReportingTag "OC"
     }
-    NewDimension {
-    }
     Staff {
         string StaffUniqueId "I"
         common Name "R"
@@ -141,7 +139,7 @@ erDiagram
         reference OpenStaffPosition "O"
     }
     LocalAccount }o--|| EducationOrganization : "HasAssociated"
-    LocalAccount }o--o| ChartOfAccount : "HasAssociated"
+    LocalAccount }o--|| ChartOfAccount : "HasAssociated"
     ChartOfAccount }o--|| EducationOrganization : "HasAssociated"
     ChartOfAccount }o--o| FundDimension : "HasAssociated"
     ChartOfAccount }o--o| ProgramDimension : "HasAssociated"
@@ -151,7 +149,6 @@ erDiagram
     ChartOfAccount }o--o| OperationalUnitDimension : "HasAssociated"
     ChartOfAccount }o--o| SourceDimension : "HasAssociated"
     ChartOfAccount }o--o| BalanceSheetDimension : "HasAssociated"
-    ChartOfAccount }o--o{ NewDimension : "HasAssociated"
     LocalBudget }o--|| LocalAccount : "HasAssociated"
     LocalActual }o--|| LocalAccount : "HasAssociated"
     LocalEncumbrance }o--|| LocalAccount : "HasAssociated"
diff --git a/Models/Models/Graduation.mmd b/Models/Graduation.mmd
similarity index 100%
rename from Models/Models/Graduation.mmd
rename to Models/Graduation.mmd
diff --git a/Models/Models/Intervention.mmd b/Models/Intervention.mmd
similarity index 95%
rename from Models/Models/Intervention.mmd
rename to Models/Intervention.mmd
index b70b853e..299a48e1 100644
--- a/Models/Models/Intervention.mmd
+++ b/Models/Intervention.mmd
@@ -132,13 +132,13 @@ erDiagram
         reference OpenStaffPosition "O"
     }
     Intervention }o--o{ InterventionPrescription : "HasAssociated"
-    Intervention |{--o{ EducationContent : "HasFunctionalComponent"
+    Intervention }o--o{ EducationContent : "HasFunctionalComponent"
     Intervention }o--|| EducationOrganization : "HasAssociated"
     Intervention }o--o{ Staff : "HasAssociated"
     Student }o--o{ Intervention : "HasAssociated"
     StudentInterventionAssociation }o..|| Student : "HasAssociated"
     StudentInterventionAssociation }o..|| Intervention : "HasAssociated"
-    InterventionPrescription |{--o{ EducationContent : "HasFunctionalComponent"
+    InterventionPrescription }o--o{ EducationContent : "HasFunctionalComponent"
     InterventionPrescription }o--|| EducationOrganization : "HasAssociated"
     InterventionStudy }o--|| InterventionPrescription : "HasAssociated"
     InterventionStudy }o--|| EducationOrganization : "HasAssociated"
@@ -152,5 +152,5 @@ erDiagram
     Cohort }o--|| EducationOrganization : "HasAssociated"
     Cohort }o--o{ Student : "HasAssociated"
     Cohort }o--o{ Staff : "HasAssociated"
-    Staff |{--|{ EducationOrganization : "HasAssociated"
-    Staff o{--o{ EducationOrganization : "ProvidesServiceTo"
+    Staff }o--o{ EducationOrganization : "HasAssociated"
+    Staff }o--o{ EducationOrganization : "ProvidesServiceTo"
diff --git a/Models/Models/Path.mmd b/Models/Path.mmd
similarity index 95%
rename from Models/Models/Path.mmd
rename to Models/Path.mmd
index 72965568..aab8ca68 100644
--- a/Models/Models/Path.mmd
+++ b/Models/Path.mmd
@@ -73,7 +73,7 @@ erDiagram
         reference PathPhase "O"
     }
     Path }o--|| EducationOrganization : "HasAssociated"
-    Path }o--|| GraduationPlan : "HasAssociated"
+    Path }o--o| GraduationPlan : "HasAssociated"
     Path ||--o{ PathPhase : "HasAssociated"
     PathPhase }o--o{ PathMilestone : "HasAssociated"
     StudentPath }o--|| Student : "HasAssociated"
@@ -81,5 +81,5 @@ erDiagram
     StudentPathPhaseStatus }o--|| StudentPath : "HasAssociated"
     StudentPathPhaseStatus }o--|| PathPhase : "HasAssociated"
     StudentPathMilestoneStatus }o--|| StudentPath : "HasAssociated"
-    StudentPathMilestoneStatus }o--|| PathPhase : "HasAssociated"
+    StudentPathMilestoneStatus }o--o| PathPhase : "HasAssociated"
     StudentPathMilestoneStatus }o--|| PathMilestone : "HasAssociated"
diff --git a/Models/Models/PerformanceEvaluation.mmd b/Models/PerformanceEvaluation.mmd
similarity index 99%
rename from Models/Models/PerformanceEvaluation.mmd
rename to Models/PerformanceEvaluation.mmd
index 65ae12cd..1bdabe9d 100644
--- a/Models/Models/PerformanceEvaluation.mmd
+++ b/Models/PerformanceEvaluation.mmd
@@ -165,7 +165,7 @@ erDiagram
     Evaluation ||--o{ EvaluationObjective : "HasAssociated"
     EvaluationObjective ||--o{ EvaluationElement : "HasAssociated"
     EvaluationObjectiveRating }o--|| EvaluationObjective : "HasAssociated"
-    EvaluationObjectiveRating }o--|| EvaluationElementRating : "HasAssociated"
+    EvaluationObjectiveRating ||--o{ EvaluationElementRating : "HasAssociated"
     EvaluationElementRating }o--|| EvaluationElement : "HasAssociated"
     EvaluationElementRating ||--o{ QuantitativeMeasureScore : "HasAssociated"
     EvaluationElement ||--o{ QuantitativeMeasure : "HasAssociated"
diff --git a/Models/Models/RecruitmentAndStaffing.mmd b/Models/RecruitmentAndStaffing.mmd
similarity index 100%
rename from Models/Models/RecruitmentAndStaffing.mmd
rename to Models/RecruitmentAndStaffing.mmd
diff --git a/Models/Models/SchoolCalendar.mmd b/Models/SchoolCalendar.mmd
similarity index 98%
rename from Models/Models/SchoolCalendar.mmd
rename to Models/SchoolCalendar.mmd
index c8422250..d63ec627 100644
--- a/Models/Models/SchoolCalendar.mmd
+++ b/Models/SchoolCalendar.mmd
@@ -111,7 +111,7 @@ erDiagram
     }
     Session }o--o{ AcademicWeek : "HasAssociated"
     Session }o--|| School : "HasAssociated"
-    Session }|--o{ GradingPeriod : "HasAssociated"
+    Session }o--o{ GradingPeriod : "HasAssociated"
     GradingPeriod }o--|| School : "HasAssociated"
     CalendarDate }o--|| Calendar : "HasAssociated"
     Calendar }o--|| School : "HasAssociated"
diff --git a/Models/Models/SpecialEducation.mmd b/Models/SpecialEducation.mmd
similarity index 99%
rename from Models/Models/SpecialEducation.mmd
rename to Models/SpecialEducation.mmd
index 8637fca1..0acc8833 100644
--- a/Models/Models/SpecialEducation.mmd
+++ b/Models/SpecialEducation.mmd
@@ -189,7 +189,7 @@ erDiagram
     StudentSchoolAttendanceEvent }o--|| Student : "HasAssociated"
     RestraintEvent }o--|| School : "HasAssociated"
     RestraintEvent }o--|| Student : "HasAssociated"
-    RestraintEvent }o--|| Program : "HasAssociated"
+    RestraintEvent }o--o{ Program : "HasAssociated"
     StudentProgramAttendanceEvent }o--|| Student : "HasAssociated"
     StudentProgramAttendanceEvent }o--|| Program : "HasAssociated"
     Program }o--|| EducationOrganization : "HasAssociated"
diff --git a/Models/Models/SpecialEducationDataModel.mmd b/Models/SpecialEducationDataModel.mmd
similarity index 92%
rename from Models/Models/SpecialEducationDataModel.mmd
rename to Models/SpecialEducationDataModel.mmd
index c49acd0f..6488e7eb 100644
--- a/Models/Models/SpecialEducationDataModel.mmd
+++ b/Models/SpecialEducationDataModel.mmd
@@ -114,15 +114,15 @@ erDiagram
  }
 
     IDEAEvent }o--|| EducationOrganization : "HasAssociated"
-    StudentIEPServicePerscription }o--|| StudentIEP : "HasAssociated"
-    StudentIEP ||--o{ StudentGoal : "HasAssociated"
-    StudentIEPServiceDelivery }o--|| StudentIEPServicePerscription : "HasAssociated"
+    StudentIEPServicePrescription }o--|| StudentIEP : "HasAssociated"
+    StudentIEP ||--o{ StudentIEPGoal : "HasAssociated"
+    StudentIEPServiceDelivery }o--|| StudentIEPServicePrescription : "HasAssociated"
     Student }|--o{ EducationOrganization : "HasAssociated"
     Student ||--o{ IDEAEvent : "HasAssociated"
     Student ||--o{ StudentIEP : "HasAssociated"
     StudentIEP }o--o{ IDEAEvent : "HasAssociated"
-    Staff }o--|| StudentIEPServicePerscription : "HasAssociated"
-    StudentGoal }o--o{ IDEAEvent : "HasAssociated"
+    Staff }o--o{ StudentIEPServicePrescription : "HasAssociated"
+    StudentIEPGoal }o--o{ IDEAEvent : "HasAssociated"
     StudentIEP ||--o{ StudentIEPServiceDelivery : "HasAssociated"
     EducationOrganization ||--o{ StudentIEP : "HasAssociated"
 
diff --git a/Models/Models/Staff.mmd b/Models/Staff.mmd
similarity index 98%
rename from Models/Models/Staff.mmd
rename to Models/Staff.mmd
index fedf78c6..0fd42422 100644
--- a/Models/Models/Staff.mmd
+++ b/Models/Staff.mmd
@@ -210,12 +210,11 @@ erDiagram
     }
     EducationServiceCenter }o--o| StateEducationAgency : "IsOrganizationComponentOf"
     LocalEducationAgency }o--o| EducationServiceCenter : "IsOrganizationComponentOf"
-    LocalEducationAgency }o--o| LocalEducationAgency : "IsOrganization ComponentOf"
+    LocalEducationAgency }o--o| LocalEducationAgency : "IsOrganizationComponentOf"
     School }o--o| LocalEducationAgency : "IsOrganizationComponentOf"
     Staff }o--o{ School : "HasAssociated"
     Staff }o--o{ Credential : "HasAssociated"
     Staff }o--o| Person : "HasAssociated"
-    Staff }|--|{ EducationOrganization : "HasAssociated"
     Staff }o--o{ EducationOrganization : "ProvidesServicesTo"
     Staff }o--o{ EducationOrganization : "HasAssociated"
     StaffAbsenceEvent }o--|| Staff : "HasAssociated"
@@ -227,7 +226,7 @@ erDiagram
     StaffEducationOrganizationEmploymentAssociation }o--o| Credential : "IsBasedOn"
     EducationOrganization ||--o{ StaffDirectory : "HasAssociated"
     EducationOrganization ||--o{ StaffDemographic : "HasAssociated"
-    EducationOrganization ||--o{ StaffIdentificationCode
+    EducationOrganization ||--o{ StaffIdentificationCode : "HasAssociated"
     StaffDirectory }o--|| Staff : "HasAssociated"
     StaffIdentificationCode }o--|| Staff : "HasAssociated"
     StaffDemographic }o--|| Staff : "HasAssociated"
diff --git a/Models/Models/StudentAcademicRecord-Gradebook.mmd b/Models/StudentAcademicRecord-Gradebook.mmd
similarity index 100%
rename from Models/Models/StudentAcademicRecord-Gradebook.mmd
rename to Models/StudentAcademicRecord-Gradebook.mmd
diff --git a/Models/Models/StudentAcademicRecord-ReportCard.mmd b/Models/StudentAcademicRecord-ReportCard.mmd
similarity index 100%
rename from Models/Models/StudentAcademicRecord-ReportCard.mmd
rename to Models/StudentAcademicRecord-ReportCard.mmd
diff --git a/Models/Models/StudentAcademicRecord-StudentTranscript.mmd b/Models/StudentAcademicRecord-StudentTranscript.mmd
similarity index 100%
rename from Models/Models/StudentAcademicRecord-StudentTranscript.mmd
rename to Models/StudentAcademicRecord-StudentTranscript.mmd
diff --git a/Models/Models/StudentAcademicRecord.mmd b/Models/StudentAcademicRecord.mmd
similarity index 100%
rename from Models/Models/StudentAcademicRecord.mmd
rename to Models/StudentAcademicRecord.mmd
diff --git a/Models/Models/StudentAttendance.mmd b/Models/StudentAttendance.mmd
similarity index 100%
rename from Models/Models/StudentAttendance.mmd
rename to Models/StudentAttendance.mmd
diff --git a/Models/Models/StudentCohort.mmd b/Models/StudentCohort.mmd
similarity index 100%
rename from Models/Models/StudentCohort.mmd
rename to Models/StudentCohort.mmd
diff --git a/Models/Models/StudentHealth.mmd b/Models/StudentHealth.mmd
similarity index 100%
rename from Models/Models/StudentHealth.mmd
rename to Models/StudentHealth.mmd
diff --git a/Models/Models/StudentIdentificationAndDemographics.mmd b/Models/StudentIdentificationAndDemographics.mmd
similarity index 100%
rename from Models/Models/StudentIdentificationAndDemographics.mmd
rename to Models/StudentIdentificationAndDemographics.mmd
diff --git a/Models/Models/StudentProgramEvaluation.mmd b/Models/StudentProgramEvaluation.mmd
similarity index 100%
rename from Models/Models/StudentProgramEvaluation.mmd
rename to Models/StudentProgramEvaluation.mmd
diff --git a/Models/Models/Survey.mmd b/Models/Survey.mmd
similarity index 100%
rename from Models/Models/Survey.mmd
rename to Models/Survey.mmd
diff --git a/Models/Models/TeachingAndLearning-CourseCatalog.mmd b/Models/TeachingAndLearning-CourseCatalog.mmd
similarity index 100%
rename from Models/Models/TeachingAndLearning-CourseCatalog.mmd
rename to Models/TeachingAndLearning-CourseCatalog.mmd
diff --git a/Models/Models/TeachingAndLearning-SectionsAndPrograms.mmd b/Models/TeachingAndLearning-SectionsAndPrograms.mmd
similarity index 100%
rename from Models/Models/TeachingAndLearning-SectionsAndPrograms.mmd
rename to Models/TeachingAndLearning-SectionsAndPrograms.mmd
diff --git a/Models/Models/TeachingAndLearning.mmd b/Models/TeachingAndLearning.mmd
similarity index 100%
rename from Models/Models/TeachingAndLearning.mmd
rename to Models/TeachingAndLearning.mmd