refactoring: removed excessive watersheds

watershed_object_t renamed to seg_object_t
further methods ordering.