encoding fixed; files moved