diff --git a/client/common_lib/cros/wlan/common.py b/client/common_lib/cros/network/common.py
similarity index 100%
rename from client/common_lib/cros/wlan/common.py
rename to client/common_lib/cros/network/common.py
diff --git a/client/common_lib/cros/wlan/shill_xmlrpc_server.py b/client/common_lib/cros/network/shill_xmlrpc_server.py
similarity index 98%
rename from client/common_lib/cros/wlan/shill_xmlrpc_server.py
rename to client/common_lib/cros/network/shill_xmlrpc_server.py
index a05678c..edcbc8e 100755
--- a/client/common_lib/cros/wlan/shill_xmlrpc_server.py
+++ b/client/common_lib/cros/network/shill_xmlrpc_server.py
@@ -11,7 +11,7 @@
 
 import common
 from autotest_lib.client.common_lib.cros import xmlrpc_server
-from autotest_lib.client.common_lib.cros.wlan import xmlrpc_datatypes
+from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
 from autotest_lib.client.cros import constants
 
 # pylint: disable=W0611
diff --git a/client/common_lib/cros/wlan/xmlrpc_datatypes.py b/client/common_lib/cros/network/xmlrpc_datatypes.py
similarity index 100%
rename from client/common_lib/cros/wlan/xmlrpc_datatypes.py
rename to client/common_lib/cros/network/xmlrpc_datatypes.py
diff --git a/client/cros/constants.py b/client/cros/constants.py
index b2b633a..43ea49b 100644
--- a/client/cros/constants.py
+++ b/client/cros/constants.py
@@ -127,7 +127,8 @@
 FAKE_NSSDB_DIR = FAKE_ROOT_CA_DIR + '/nssdb'
 
 SHILL_XMLRPC_SERVER_PORT = 9989
-SHILL_XMLRPC_SERVER_COMMAND = ('cd /usr/local/autotest/common_lib/cros/wlan && '
-                               './shill_xmlrpc_server.py')
+SHILL_XMLRPC_SERVER_COMMAND = (
+        'cd /usr/local/autotest/common_lib/cros/network && '
+        './shill_xmlrpc_server.py')
 SHILL_XMLRPC_SERVER_CLEANUP_PATTERN = 'shill_xmlrpc_server'
 SHILL_XMLRPC_SERVER_READY_METHOD = 'ready'
diff --git a/server/cros/wlan/wifi_test_base.py b/server/cros/wlan/wifi_test_base.py
index 01d73cf..caf1ed3 100644
--- a/server/cros/wlan/wifi_test_base.py
+++ b/server/cros/wlan/wifi_test_base.py
@@ -6,7 +6,7 @@
 
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.common_lib import utils
-from autotest_lib.client.common_lib.cros.wlan import xmlrpc_datatypes
+from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
 from autotest_lib.server import test
 from autotest_lib.server.cros import wifi_test_utils
 from autotest_lib.server.cros.wlan import wifi_test_context_manager
diff --git a/server/site_tests/network_WiFi_SimpleConnect/network_WiFi_SimpleConnect.py b/server/site_tests/network_WiFi_SimpleConnect/network_WiFi_SimpleConnect.py
index a584474..b5d7069 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/network_WiFi_SimpleConnect.py
+++ b/server/site_tests/network_WiFi_SimpleConnect/network_WiFi_SimpleConnect.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from autotest_lib.client.common_lib.cros.wlan import xmlrpc_datatypes
+from autotest_lib.client.common_lib.cros.network import xmlrpc_datatypes
 from autotest_lib.server.cros.wlan import wifi_test_base