Refactor the projects