Working version of reorganize