Changed the whole project setup
Changed the whole project setup