Major refactoring of Network Controller continues