- Moving some items around for better project setup