Changed some project setup