Move all in the struct package to main package.