Moved controllers to services