restructuring contracts to jars