re-organize classes and add test json file