Fixing up project setup