Refactoring for organizational purposes.