Re-order services and fix pathing