Extract Change & Validation classes to separate files