Fixed the controller setup and change the project setup