Fix binops issue, seperate scanner modules