Refactoring architecture projects