Updated routing system
Added controller generator