#1 Improved paths and project setup.