Project refactoring to make the project clean.