Fixing project setup