Merge "Move connectivity APIs to their own directory"