Unborked project setup (refactoring)