Overhauled project setup