Refactored proj structure