add class wrapper and clean test codes
encapsulate data holder classes
move test and run codes here