Refactoring source code organization.