Commit before modifying header files structure.
Restructure header files. Now cj.h is only header needed to be included.