Refactoring code and restructuring to organization of the project.