changing swift container structure - segments are stored in a separate container

Change-Id: Id9320c2bd3bc1fd59164f3873d8dd0cb0d04fbe9