ENH: reorganize