Automatic merge from submit-queue

Unstructured methods belong in unstructured.go

Simple code move

@krousey just movement