Now making sure client exists in ESDR upon start up. Also reorg'd config files.