Combined modules into one controller module, merged wifi modules.