fixed name mistake
rename class
change class structure