Automatic merge from submit-queue

move core storage out of master.go

Moves the core resource creation out of master.go and makes it more congruent to the other storages.

WIP because I haven't run tests yet, but I figured I'd see what breaks in the morning.