Merge 'base' and 'controller/network_generator'