move nonexported structs into their using function
move nonexported structs into their using function

Co-authored-by: Anand Gaitonde <4f0ff06b2390eeadb0769d298cbdb3dc6df4c73d@pivotal.io>
Co-authored-by: Reid Mitchell <15b84f3bcf1e0a1a99817cc9360cedc980d7c5b6@pivotal.io>

cloudfoundry/cli,cloudfoundry/cli,cloudfoundry/cli