Converted hook_menu() to routes, and other minor changes