config files updated and reorganized