Moved all services to bootstrap