jtong - extroduce code to multi files