Project spec refactoring