Refactored project setup.