Refactoring:
- Some class relocation.