Changed structure to allow routes, modules and handlers