Updated controllers

Moved controllers from the public space into the app/controller folder
where they belong.