Reorganize, ensure we're in a multi-network environment