Yemen deal calls for govt reshuffle, unifying forces in south