Simplify DefaultQualityAdjustmentStrategy
Organise into packages