restructuring the application according to the latest version of jpc and jpc-commons