fix sub folders names issues