reorg into cleaner directory structure.