minor update .. merge some classes in one file for simplicity