Project references refactored