Fix folder and encoding