updated to use new modules (more independance to libi2ncommon)