Added the option to create a new folder after the changeover process. Removed watches are added if the folder still exists after the changeover.