adding in confi and reorg for kyleness
cleanups