diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint_owner.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint/owner.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint_owner.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint/owner.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint_renter.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint/renter.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint_renter.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/income_offset/joint/renter.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/phase_out/threshold.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/phase_out/income_threshold.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/phase_out/threshold.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/credits/property_tax/phase_out/income_threshold.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_max_private_pension.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/max_private_pension.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_max_private_pension.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/max_private_pension.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_private_pension_deduction_allowance.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/private_pension_deduction_allowance.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_private_pension_deduction_allowance.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/private_pension_deduction_allowance.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_public_pension_deduction_allowance.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/public_pension_deduction_allowance.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_public_pension_deduction_allowance.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/pension/public_pension_deduction_allowance.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_max_social_security_benefit.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/max_social_security_benefit.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_max_social_security_benefit.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/max_social_security_benefit.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_ss_or_ssd_deduction_allowance.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/ss_or_ssd_deduction_allowance.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_ss_or_ssd_deduction_allowance.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/ss_or_ssd_deduction_allowance.yaml
diff --git a/policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_ss_or_ssdi_exemption_threshold.yaml b/policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/ss_or_ssdi_exemption_threshold.yaml
similarity index 100%
rename from policyengine_us/parameters/gov/states/mo/tax/income/deductions/mo_ss_or_ssdi_exemption_threshold.yaml
rename to policyengine_us/parameters/gov/states/mo/tax/income/deductions/social_security/ss_or_ssdi_exemption_threshold.yaml