directory reorg

Starting to reorg properly. Will continue to improve as we make decisions