Added a few controllers
Merged the Projects