ENH: reorganize content