[IMP] infrastructure_x module unified with the main module