clean up bootstrap and routes by moving service defns to services