Update paths to reflect cleanup of mainfolder