Removed old project setup
Added new project setup from ADT