reorg in anticipation of generating METADATA files