use new classes for controller.php