Reorg and mkprops.