Refactor to allow multiple VPCs per region
also clean up mistakes in code distribution across files