fix serviceprovider and routes