Refactor for the project structure