Refactored project setup