Projects refactoring