reorg to new directory naming conventions