diff --git a/Sources/ProjectSpec/Decoding.swift b/Sources/ProjectSpec/Parsing/Decoding.swift
similarity index 100%
rename from Sources/ProjectSpec/Decoding.swift
rename to Sources/ProjectSpec/Parsing/Decoding.swift
diff --git a/Sources/ProjectSpec/Encoding.swift b/Sources/ProjectSpec/Parsing/Encoding.swift
similarity index 100%
rename from Sources/ProjectSpec/Encoding.swift
rename to Sources/ProjectSpec/Parsing/Encoding.swift
diff --git a/Sources/ProjectSpec/SpecFile.swift b/Sources/ProjectSpec/Parsing/SpecFile.swift
similarity index 100%
rename from Sources/ProjectSpec/SpecFile.swift
rename to Sources/ProjectSpec/Parsing/SpecFile.swift
diff --git a/Sources/ProjectSpec/SpecLoader.swift b/Sources/ProjectSpec/Parsing/SpecLoader.swift
similarity index 100%
rename from Sources/ProjectSpec/SpecLoader.swift
rename to Sources/ProjectSpec/Parsing/SpecLoader.swift
diff --git a/Sources/ProjectSpec/SpecParsingError.swift b/Sources/ProjectSpec/Parsing/SpecParsingError.swift
similarity index 100%
rename from Sources/ProjectSpec/SpecParsingError.swift
rename to Sources/ProjectSpec/Parsing/SpecParsingError.swift
diff --git a/Sources/ProjectSpec/Yaml.swift b/Sources/ProjectSpec/Parsing/Yaml.swift
similarity index 100%
rename from Sources/ProjectSpec/Yaml.swift
rename to Sources/ProjectSpec/Parsing/Yaml.swift
diff --git a/Sources/ProjectSpec/BuildSettingsContainer.swift b/Sources/ProjectSpec/Settings/BuildSettingsContainer.swift
similarity index 100%
rename from Sources/ProjectSpec/BuildSettingsContainer.swift
rename to Sources/ProjectSpec/Settings/BuildSettingsContainer.swift
diff --git a/Sources/ProjectSpec/Config.swift b/Sources/ProjectSpec/Settings/Config.swift
similarity index 100%
rename from Sources/ProjectSpec/Config.swift
rename to Sources/ProjectSpec/Settings/Config.swift
diff --git a/Sources/ProjectSpec/Settings.swift b/Sources/ProjectSpec/Settings/Settings.swift
similarity index 100%
rename from Sources/ProjectSpec/Settings.swift
rename to Sources/ProjectSpec/Settings/Settings.swift
diff --git a/Sources/ProjectSpec/AggregateTarget.swift b/Sources/ProjectSpec/Target/AggregateTarget.swift
similarity index 100%
rename from Sources/ProjectSpec/AggregateTarget.swift
rename to Sources/ProjectSpec/Target/AggregateTarget.swift
diff --git a/Sources/ProjectSpec/BuildRule.swift b/Sources/ProjectSpec/Target/BuildRule.swift
similarity index 100%
rename from Sources/ProjectSpec/BuildRule.swift
rename to Sources/ProjectSpec/Target/BuildRule.swift
diff --git a/Sources/ProjectSpec/BuildScript.swift b/Sources/ProjectSpec/Target/BuildScript.swift
similarity index 100%
rename from Sources/ProjectSpec/BuildScript.swift
rename to Sources/ProjectSpec/Target/BuildScript.swift
diff --git a/Sources/ProjectSpec/Linkage.swift b/Sources/ProjectSpec/Target/Linkage.swift
similarity index 100%
rename from Sources/ProjectSpec/Linkage.swift
rename to Sources/ProjectSpec/Target/Linkage.swift
diff --git a/Sources/ProjectSpec/ProjectTarget.swift b/Sources/ProjectSpec/Target/ProjectTarget.swift
similarity index 100%
rename from Sources/ProjectSpec/ProjectTarget.swift
rename to Sources/ProjectSpec/Target/ProjectTarget.swift
diff --git a/Sources/ProjectSpec/Target.swift b/Sources/ProjectSpec/Target/Target.swift
similarity index 100%
rename from Sources/ProjectSpec/Target.swift
rename to Sources/ProjectSpec/Target/Target.swift
diff --git a/Sources/ProjectSpec/TargetReference.swift b/Sources/ProjectSpec/Target/TargetReference.swift
similarity index 100%
rename from Sources/ProjectSpec/TargetReference.swift
rename to Sources/ProjectSpec/Target/TargetReference.swift
diff --git a/Sources/ProjectSpec/TargetScheme.swift b/Sources/ProjectSpec/Target/TargetScheme.swift
similarity index 100%
rename from Sources/ProjectSpec/TargetScheme.swift
rename to Sources/ProjectSpec/Target/TargetScheme.swift
diff --git a/Sources/ProjectSpec/TargetSource.swift b/Sources/ProjectSpec/Target/TargetSource.swift
similarity index 100%
rename from Sources/ProjectSpec/TargetSource.swift
rename to Sources/ProjectSpec/Target/TargetSource.swift
diff --git a/Sources/ProjectSpec/SpecValidation.swift b/Sources/ProjectSpec/Validation/SpecValidation.swift
similarity index 100%
rename from Sources/ProjectSpec/SpecValidation.swift
rename to Sources/ProjectSpec/Validation/SpecValidation.swift
diff --git a/Sources/ProjectSpec/SpecValidationError.swift b/Sources/ProjectSpec/Validation/SpecValidationError.swift
similarity index 100%
rename from Sources/ProjectSpec/SpecValidationError.swift
rename to Sources/ProjectSpec/Validation/SpecValidationError.swift