Tweaked project setup