ENH: reorganization of design/block