Code and project refactoring.