Moved controller-classes from main package to .controller.