Refactoring, reorganizing project structure.