Initial Revision of project setup