began directory reorg - lots more work to do