More reorganization of code. Moved jars to icf-lib folder