organize data structs in new package