Redid initial project setup.