Reorganize class name & package and removed redundant comments