Rename source folder
Fix foreach