Flatten ContainerSpec.

I think embedding has its benefits. It will help with the storage drivers as well.