Refactoring the project...