Refactoring. No logic-changes - only relocation of classes.