Refactor projects