Refactored org.jclif.runtime package