Updated the config files and folder names