Revert "Added controller class"

This reverts commit 97a8f13773095e46654e4c8a48197223447b3458.