Changes from Class

Moved Controller file to Controller file