Moved controllers to the place they should be