Refactor project and modules