Move routing to bundle