Refactored project creation