Refactor the project structure