Restructure into blueprint-per-service.