Further work on refactoring projects