reorg into 2d/3d