Use JCL library and reorganize project