Pulled BlueprintId out to it's own files, and added BlueprintGroupId