rename folders
Remove old naming