rename and modify the way to import
update data structure
correct some awkward mistakes