reorganized riftwarp