Merge "Restructure blueprint file for gpuservice and vkjson"