Move routing to application