Refact account class & change account class name