updating folder names
remove "self"