diff --git a/active_passive_out_of_credits_detector.cc b/cellular/active_passive_out_of_credits_detector.cc
similarity index 98%
rename from active_passive_out_of_credits_detector.cc
rename to cellular/active_passive_out_of_credits_detector.cc
index a07d4a0..4a92efc 100644
--- a/active_passive_out_of_credits_detector.cc
+++ b/cellular/active_passive_out_of_credits_detector.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/active_passive_out_of_credits_detector.h"
+#include "shill/cellular/active_passive_out_of_credits_detector.h"
 
 #include <string>
 
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 #include "shill/connection.h"
 #include "shill/connection_health_checker.h"
 #include "shill/logging.h"
diff --git a/active_passive_out_of_credits_detector.h b/cellular/active_passive_out_of_credits_detector.h
similarity index 93%
rename from active_passive_out_of_credits_detector.h
rename to cellular/active_passive_out_of_credits_detector.h
index 4a16a9c..53b74c3 100644
--- a/active_passive_out_of_credits_detector.h
+++ b/cellular/active_passive_out_of_credits_detector.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
-#define SHILL_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
+#ifndef SHILL_CELLULAR_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
+#define SHILL_CELLULAR_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
 
 #include <memory>
 #include <string>
 
 #include <base/time/time.h>
 
+#include "shill/cellular/out_of_credits_detector.h"
 #include "shill/connection_health_checker.h"
-#include "shill/out_of_credits_detector.h"
 
 namespace shill {
 
@@ -114,4 +114,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
+#endif  // SHILL_CELLULAR_ACTIVE_PASSIVE_OUT_OF_CREDITS_DETECTOR_H_
diff --git a/active_passive_out_of_credits_detector_unittest.cc b/cellular/active_passive_out_of_credits_detector_unittest.cc
similarity index 98%
rename from active_passive_out_of_credits_detector_unittest.cc
rename to cellular/active_passive_out_of_credits_detector_unittest.cc
index 5ec7a1d..1f95b14 100644
--- a/active_passive_out_of_credits_detector_unittest.cc
+++ b/cellular/active_passive_out_of_credits_detector_unittest.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/active_passive_out_of_credits_detector.h"
+#include "shill/cellular/active_passive_out_of_credits_detector.h"
 
 #include <string>
 #include <vector>
 
 #include <gtest/gtest.h>
 
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_cellular_service.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/event_dispatcher.h"
-#include "shill/mock_cellular.h"
-#include "shill/mock_cellular_service.h"
 #include "shill/mock_connection.h"
 #include "shill/mock_connection_health_checker.h"
 #include "shill/mock_device_info.h"
 #include "shill/mock_manager.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_proxy_factory.h"
 #include "shill/mock_traffic_monitor.h"
 
diff --git a/cellular.cc b/cellular/cellular.cc
similarity index 98%
rename from cellular.cc
rename to cellular/cellular.cc
index 815ac13..bf78bc5 100644
--- a/cellular.cc
+++ b/cellular/cellular.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 
 #include <netinet/in.h>
 #include <linux/if.h>  // NOLINT - Needs definitions from netinet/in.h
@@ -19,12 +19,13 @@
 #include <chromeos/dbus/service_constants.h>
 
 #include "shill/adaptor_interfaces.h"
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_capability_cdma.h"
-#include "shill/cellular_capability_gsm.h"
-#include "shill/cellular_capability_universal.h"
-#include "shill/cellular_capability_universal_cdma.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_capability_cdma.h"
+#include "shill/cellular/cellular_capability_gsm.h"
+#include "shill/cellular/cellular_capability_universal.h"
+#include "shill/cellular/cellular_capability_universal_cdma.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mobile_operator_info.h"
 #include "shill/control_interface.h"
 #include "shill/device.h"
 #include "shill/device_info.h"
@@ -33,7 +34,6 @@
 #include "shill/external_task.h"
 #include "shill/logging.h"
 #include "shill/manager.h"
-#include "shill/mobile_operator_info.h"
 #include "shill/net/rtnl_handler.h"
 #include "shill/ppp_device.h"
 #include "shill/ppp_device_factory.h"
diff --git a/cellular.h b/cellular/cellular.h
similarity index 98%
rename from cellular.h
rename to cellular/cellular.h
index a2bec68..4b27add 100644
--- a/cellular.h
+++ b/cellular/cellular.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_H_
-#define SHILL_CELLULAR_H_
+#ifndef SHILL_CELLULAR_CELLULAR_H_
+#define SHILL_CELLULAR_CELLULAR_H_
 
 #include <map>
 #include <memory>
@@ -14,13 +14,13 @@
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
+#include "shill/cellular/mobile_operator_info.h"
+#include "shill/cellular/modem_info.h"
+#include "shill/cellular/modem_proxy_interface.h"
 #include "shill/dbus_properties.h"
 #include "shill/device.h"
 #include "shill/event_dispatcher.h"
 #include "shill/metrics.h"
-#include "shill/mobile_operator_info.h"
-#include "shill/modem_info.h"
-#include "shill/modem_proxy_interface.h"
 #include "shill/refptr_types.h"
 #include "shill/rpc_task.h"
 
@@ -567,4 +567,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_H_
+#endif  // SHILL_CELLULAR_CELLULAR_H_
diff --git a/cellular_bearer.cc b/cellular/cellular_bearer.cc
similarity index 98%
rename from cellular_bearer.cc
rename to cellular/cellular_bearer.cc
index 84ffaac..0e9ba44 100644
--- a/cellular_bearer.cc
+++ b/cellular/cellular_bearer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_bearer.h"
+#include "shill/cellular/cellular_bearer.h"
 
 #include <ModemManager/ModemManager.h>
 
diff --git a/cellular_bearer.h b/cellular/cellular_bearer.h
similarity index 96%
rename from cellular_bearer.h
rename to cellular/cellular_bearer.h
index 2fcab0b..b95a8c8 100644
--- a/cellular_bearer.h
+++ b/cellular/cellular_bearer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_BEARER_H_
-#define SHILL_CELLULAR_BEARER_H_
+#ifndef SHILL_CELLULAR_CELLULAR_BEARER_H_
+#define SHILL_CELLULAR_CELLULAR_BEARER_H_
 
 #include <memory>
 #include <string>
@@ -126,4 +126,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_BEARER_H_
+#endif  // SHILL_CELLULAR_CELLULAR_BEARER_H_
diff --git a/cellular_bearer_unittest.cc b/cellular/cellular_bearer_unittest.cc
similarity index 99%
rename from cellular_bearer_unittest.cc
rename to cellular/cellular_bearer_unittest.cc
index e6646a4..f21bfab 100644
--- a/cellular_bearer_unittest.cc
+++ b/cellular/cellular_bearer_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_bearer.h"
+#include "shill/cellular/cellular_bearer.h"
 
 #include <ModemManager/ModemManager.h>
 
diff --git a/cellular_capability.cc b/cellular/cellular_capability.cc
similarity index 97%
rename from cellular_capability.cc
rename to cellular/cellular_capability.cc
index e64f2fa..1d6df69 100644
--- a/cellular_capability.cc
+++ b/cellular/cellular_capability.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability.h"
+#include "shill/cellular/cellular_capability.h"
 
 #include <base/bind.h>
 #include <chromeos/dbus/service_constants.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 #include "shill/error.h"
 #include "shill/logging.h"
 #include "shill/property_accessor.h"
diff --git a/cellular_capability.h b/cellular/cellular_capability.h
similarity index 98%
rename from cellular_capability.h
rename to cellular/cellular_capability.h
index 1d79f3f..357aaa2 100644
--- a/cellular_capability.h
+++ b/cellular/cellular_capability.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_H_
-#define SHILL_CELLULAR_CAPABILITY_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_H_
 
 #include <string>
 #include <vector>
@@ -13,7 +13,7 @@
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 #include "shill/callbacks.h"
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 #include "shill/dbus_properties.h"
 #include "shill/metrics.h"
 
@@ -298,4 +298,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_H_
diff --git a/cellular_capability_cdma.cc b/cellular/cellular_capability_cdma.cc
similarity index 98%
rename from cellular_capability_cdma.cc
rename to cellular/cellular_capability_cdma.cc
index bbcb8d3..255d933 100644
--- a/cellular_capability_cdma.cc
+++ b/cellular/cellular_capability_cdma.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_cdma.h"
+#include "shill/cellular/cellular_capability_cdma.h"
 
 #include <string>
 #include <vector>
@@ -12,8 +12,8 @@
 #include <chromeos/dbus/service_constants.h>
 #include <mm/mm-modem.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_service.h"
 #include "shill/logging.h"
 #include "shill/proxy_factory.h"
 
diff --git a/cellular_capability_cdma.h b/cellular/cellular_capability_cdma.h
similarity index 91%
rename from cellular_capability_cdma.h
rename to cellular/cellular_capability_cdma.h
index 02ad6fd..eb5436f 100644
--- a/cellular_capability_cdma.h
+++ b/cellular/cellular_capability_cdma.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_CDMA_H_
-#define SHILL_CELLULAR_CAPABILITY_CDMA_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_CDMA_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_CDMA_H_
 
 #include <memory>
 #include <string>
@@ -13,10 +13,10 @@
 #include <chromeos/dbus/service_constants.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/cellular_capability.h"
-#include "shill/cellular_capability_classic.h"
-#include "shill/cellular_service.h"
-#include "shill/modem_cdma_proxy_interface.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/cellular_capability_classic.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/modem_cdma_proxy_interface.h"
 
 namespace shill {
 
@@ -118,4 +118,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_CDMA_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_CDMA_H_
diff --git a/cellular_capability_cdma_unittest.cc b/cellular/cellular_capability_cdma_unittest.cc
similarity index 97%
rename from cellular_capability_cdma_unittest.cc
rename to cellular/cellular_capability_cdma_unittest.cc
index 674eddf..3f8a8be 100644
--- a/cellular_capability_cdma_unittest.cc
+++ b/cellular/cellular_capability_cdma_unittest.cc
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_cdma.h"
+#include "shill/cellular/cellular_capability_cdma.h"
 
 #include <base/bind.h>
 #include <chromeos/dbus/service_constants.h>
 #include <gtest/gtest.h>
 #include <mm/mm-modem.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_modem_cdma_proxy.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_modem_proxy.h"
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_cellular.h"
-#include "shill/mock_modem_cdma_proxy.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_modem_proxy.h"
 #include "shill/proxy_factory.h"
 
 using base::Bind;
diff --git a/cellular_capability_classic.cc b/cellular/cellular_capability_classic.cc
similarity index 98%
rename from cellular_capability_classic.cc
rename to cellular/cellular_capability_classic.cc
index 300beee..dc4250d 100644
--- a/cellular_capability_classic.cc
+++ b/cellular/cellular_capability_classic.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_classic.h"
+#include "shill/cellular/cellular_capability_classic.h"
 
 #include <base/bind.h>
 #include <chromeos/dbus/service_constants.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/modem_gobi_proxy_interface.h"
 #include "shill/error.h"
 #include "shill/logging.h"
-#include "shill/modem_gobi_proxy_interface.h"
 #include "shill/property_accessor.h"
 #include "shill/proxy_factory.h"
 
diff --git a/cellular_capability_classic.h b/cellular/cellular_capability_classic.h
similarity index 94%
rename from cellular_capability_classic.h
rename to cellular/cellular_capability_classic.h
index f869c91..4e32a54 100644
--- a/cellular_capability_classic.h
+++ b/cellular/cellular_capability_classic.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_CLASSIC_H_
-#define SHILL_CELLULAR_CAPABILITY_CLASSIC_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_CLASSIC_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_CLASSIC_H_
 
 #include <memory>
 #include <string>
@@ -14,11 +14,11 @@
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/cellular.h"
-#include "shill/cellular_capability.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/modem_proxy_interface.h"
+#include "shill/cellular/modem_simple_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/modem_proxy_interface.h"
-#include "shill/modem_simple_proxy_interface.h"
 
 namespace shill {
 
@@ -167,4 +167,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_CLASSIC_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_CLASSIC_H_
diff --git a/cellular_capability_classic_unittest.cc b/cellular/cellular_capability_classic_unittest.cc
similarity index 97%
rename from cellular_capability_classic_unittest.cc
rename to cellular/cellular_capability_classic_unittest.cc
index f261c4b..9752c77 100644
--- a/cellular_capability_classic_unittest.cc
+++ b/cellular/cellular_capability_classic_unittest.cc
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_gsm.h"
+#include "shill/cellular/cellular_capability_gsm.h"
 
 #include <base/bind.h>
 #include <chromeos/dbus/service_constants.h>
 #include <mm/mm-modem.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_modem_cdma_proxy.h"
+#include "shill/cellular/mock_modem_gobi_proxy.h"
+#include "shill/cellular/mock_modem_gsm_card_proxy.h"
+#include "shill/cellular/mock_modem_gsm_network_proxy.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_modem_proxy.h"
+#include "shill/cellular/mock_modem_simple_proxy.h"
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_modem_cdma_proxy.h"
-#include "shill/mock_modem_gobi_proxy.h"
-#include "shill/mock_modem_gsm_card_proxy.h"
-#include "shill/mock_modem_gsm_network_proxy.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_modem_proxy.h"
-#include "shill/mock_modem_simple_proxy.h"
 #include "shill/mock_profile.h"
 #include "shill/net/mock_rtnl_handler.h"
 #include "shill/proxy_factory.h"
diff --git a/cellular_capability_gsm.cc b/cellular/cellular_capability_gsm.cc
similarity index 99%
rename from cellular_capability_gsm.cc
rename to cellular/cellular_capability_gsm.cc
index cbee8f4..7bbd66c 100644
--- a/cellular_capability_gsm.cc
+++ b/cellular/cellular_capability_gsm.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_gsm.h"
+#include "shill/cellular/cellular_capability_gsm.h"
 
 #include <string>
 #include <vector>
@@ -15,7 +15,7 @@
 #include <mm/mm-modem.h>
 
 #include "shill/adaptor_interfaces.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 #include "shill/error.h"
 #include "shill/logging.h"
 #include "shill/property_accessor.h"
diff --git a/cellular_capability_gsm.h b/cellular/cellular_capability_gsm.h
similarity index 95%
rename from cellular_capability_gsm.h
rename to cellular/cellular_capability_gsm.h
index f3a7a42..f98b979 100644
--- a/cellular_capability_gsm.h
+++ b/cellular/cellular_capability_gsm.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_GSM_H_
-#define SHILL_CELLULAR_CAPABILITY_GSM_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_GSM_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_GSM_H_
 
 #include <deque>
 #include <memory>
@@ -15,11 +15,11 @@
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 #include "shill/accessor_interface.h"
-#include "shill/cellular.h"
-#include "shill/cellular_capability.h"
-#include "shill/cellular_capability_classic.h"
-#include "shill/modem_gsm_card_proxy_interface.h"
-#include "shill/modem_gsm_network_proxy_interface.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/cellular_capability_classic.h"
+#include "shill/cellular/modem_gsm_card_proxy_interface.h"
+#include "shill/cellular/modem_gsm_network_proxy_interface.h"
 
 struct mobile_provider;
 
@@ -228,4 +228,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_GSM_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_GSM_H_
diff --git a/cellular_capability_gsm_unittest.cc b/cellular/cellular_capability_gsm_unittest.cc
similarity index 98%
rename from cellular_capability_gsm_unittest.cc
rename to cellular/cellular_capability_gsm_unittest.cc
index 88da97a..7c57e0e 100644
--- a/cellular_capability_gsm_unittest.cc
+++ b/cellular/cellular_capability_gsm_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_gsm.h"
+#include "shill/cellular/cellular_capability_gsm.h"
 
 #include <string>
 #include <vector>
@@ -12,18 +12,18 @@
 #include <chromeos/dbus/service_constants.h>
 #include <mm/mm-modem.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_mobile_operator_info.h"
+#include "shill/cellular/mock_modem_gsm_card_proxy.h"
+#include "shill/cellular/mock_modem_gsm_network_proxy.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_modem_proxy.h"
+#include "shill/cellular/mock_modem_simple_proxy.h"
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
 #include "shill/mock_log.h"
-#include "shill/mock_mobile_operator_info.h"
-#include "shill/mock_modem_gsm_card_proxy.h"
-#include "shill/mock_modem_gsm_network_proxy.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_modem_proxy.h"
-#include "shill/mock_modem_simple_proxy.h"
 #include "shill/mock_profile.h"
 #include "shill/proxy_factory.h"
 #include "shill/testing.h"
diff --git a/cellular_capability_universal.cc b/cellular/cellular_capability_universal.cc
similarity index 99%
rename from cellular_capability_universal.cc
rename to cellular/cellular_capability_universal.cc
index cda10d9..f3fb0fd 100644
--- a/cellular_capability_universal.cc
+++ b/cellular/cellular_capability_universal.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_universal.h"
+#include "shill/cellular/cellular_capability_universal.h"
 
 #include <base/bind.h>
 #include <base/stl_util.h>
@@ -15,12 +15,12 @@
 #include <vector>
 
 #include "shill/adaptor_interfaces.h"
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mobile_operator_info.h"
 #include "shill/dbus_properties_proxy_interface.h"
 #include "shill/error.h"
 #include "shill/logging.h"
-#include "shill/mobile_operator_info.h"
 #include "shill/pending_activation_store.h"
 #include "shill/property_accessor.h"
 #include "shill/proxy_factory.h"
diff --git a/cellular_capability_universal.h b/cellular/cellular_capability_universal.h
similarity index 96%
rename from cellular_capability_universal.h
rename to cellular/cellular_capability_universal.h
index d08665e..7c5a56c 100644
--- a/cellular_capability_universal.h
+++ b/cellular/cellular_capability_universal.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_UNIVERSAL_H_
-#define SHILL_CELLULAR_CAPABILITY_UNIVERSAL_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_H_
 
 #include <deque>
 #include <map>
@@ -15,14 +15,14 @@
 #include <ModemManager/ModemManager.h>
 
 #include "shill/accessor_interface.h"
-#include "shill/cellular.h"
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_capability.h"
-#include "shill/mm1_modem_modem3gpp_proxy_interface.h"
-#include "shill/mm1_modem_proxy_interface.h"
-#include "shill/mm1_modem_simple_proxy_interface.h"
-#include "shill/mm1_sim_proxy_interface.h"
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/mm1_modem_modem3gpp_proxy_interface.h"
+#include "shill/cellular/mm1_modem_proxy_interface.h"
+#include "shill/cellular/mm1_modem_simple_proxy_interface.h"
+#include "shill/cellular/mm1_sim_proxy_interface.h"
+#include "shill/cellular/out_of_credits_detector.h"
 
 struct mobile_provider;
 
@@ -435,4 +435,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_UNIVERSAL_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_H_
diff --git a/cellular_capability_universal_cdma.cc b/cellular/cellular_capability_universal_cdma.cc
similarity index 98%
rename from cellular_capability_universal_cdma.cc
rename to cellular/cellular_capability_universal_cdma.cc
index d0d62ef..147c842 100644
--- a/cellular_capability_universal_cdma.cc
+++ b/cellular/cellular_capability_universal_cdma.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_universal_cdma.h"
+#include "shill/cellular/cellular_capability_universal_cdma.h"
 
 #include <base/strings/string_number_conversions.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 #include <chromeos/dbus/service_constants.h>
 
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_service.h"
 #include "shill/dbus_properties_proxy_interface.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/cellular_capability_universal_cdma.h b/cellular/cellular_capability_universal_cdma.h
similarity index 93%
rename from cellular_capability_universal_cdma.h
rename to cellular/cellular_capability_universal_cdma.h
index cf7f097..8300a75 100644
--- a/cellular_capability_universal_cdma.h
+++ b/cellular/cellular_capability_universal_cdma.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
-#define SHILL_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
+#ifndef SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
+#define SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
 
 #include <memory>
 #include <string>
@@ -12,9 +12,9 @@
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/cellular.h"
-#include "shill/cellular_capability_universal.h"
-#include "shill/mm1_modem_modemcdma_proxy_interface.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_capability_universal.h"
+#include "shill/cellular/mm1_modem_modemcdma_proxy_interface.h"
 
 namespace shill {
 
@@ -130,4 +130,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
+#endif  // SHILL_CELLULAR_CELLULAR_CAPABILITY_UNIVERSAL_CDMA_H_
diff --git a/cellular_capability_universal_cdma_unittest.cc b/cellular/cellular_capability_universal_cdma_unittest.cc
similarity index 97%
rename from cellular_capability_universal_cdma_unittest.cc
rename to cellular/cellular_capability_universal_cdma_unittest.cc
index 22f61ed..02ae2db 100644
--- a/cellular_capability_universal_cdma_unittest.cc
+++ b/cellular/cellular_capability_universal_cdma_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_universal_cdma.h"
+#include "shill/cellular/cellular_capability_universal_cdma.h"
 
 #include <string>
 #include <vector>
@@ -14,22 +14,22 @@
 #include <gtest/gtest.h>
 #include <ModemManager/ModemManager.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_cellular_service.h"
+#include "shill/cellular/mock_mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mock_mm1_modem_modemcdma_proxy.h"
+#include "shill/cellular/mock_mm1_modem_proxy.h"
+#include "shill/cellular/mock_mm1_modem_simple_proxy.h"
+#include "shill/cellular/mock_mm1_sim_proxy.h"
+#include "shill/cellular/mock_mobile_operator_info.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_cellular_service.h"
 #include "shill/mock_dbus_properties_proxy.h"
 #include "shill/mock_glib.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_metrics.h"
-#include "shill/mock_mm1_modem_modem3gpp_proxy.h"
-#include "shill/mock_mm1_modem_modemcdma_proxy.h"
-#include "shill/mock_mm1_modem_proxy.h"
-#include "shill/mock_mm1_modem_simple_proxy.h"
-#include "shill/mock_mm1_sim_proxy.h"
-#include "shill/mock_mobile_operator_info.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_pending_activation_store.h"
 #include "shill/nice_mock_control.h"
 #include "shill/proxy_factory.h"
diff --git a/cellular_capability_universal_unittest.cc b/cellular/cellular_capability_universal_unittest.cc
similarity index 98%
rename from cellular_capability_universal_unittest.cc
rename to cellular/cellular_capability_universal_unittest.cc
index 2dc4668..4566799 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular/cellular_capability_universal_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_capability_universal.h"
+#include "shill/cellular/cellular_capability_universal.h"
 
 #include <string>
 #include <vector>
@@ -13,24 +13,24 @@
 #include <chromeos/dbus/service_constants.h>
 #include <ModemManager/ModemManager.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_cellular_service.h"
+#include "shill/cellular/mock_mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mock_mm1_modem_modemcdma_proxy.h"
+#include "shill/cellular/mock_mm1_modem_proxy.h"
+#include "shill/cellular/mock_mm1_modem_simple_proxy.h"
+#include "shill/cellular/mock_mm1_sim_proxy.h"
+#include "shill/cellular/mock_mobile_operator_info.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/dbus_adaptor.h"
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_cellular.h"
-#include "shill/mock_cellular_service.h"
 #include "shill/mock_dbus_properties_proxy.h"
 #include "shill/mock_event_dispatcher.h"
-#include "shill/mock_mm1_modem_modem3gpp_proxy.h"
-#include "shill/mock_mm1_modem_modemcdma_proxy.h"
-#include "shill/mock_mm1_modem_proxy.h"
-#include "shill/mock_mm1_modem_simple_proxy.h"
-#include "shill/mock_mm1_sim_proxy.h"
-#include "shill/mock_mobile_operator_info.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_pending_activation_store.h"
 #include "shill/mock_profile.h"
 #include "shill/net/mock_rtnl_handler.h"
diff --git a/cellular_error.cc b/cellular/cellular_error.cc
similarity index 96%
rename from cellular_error.cc
rename to cellular/cellular_error.cc
index 5937ff9..ffa44b2 100644
--- a/cellular_error.cc
+++ b/cellular/cellular_error.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 
 #include <string>
 
diff --git a/cellular_error.h b/cellular/cellular_error.h
similarity index 79%
rename from cellular_error.h
rename to cellular/cellular_error.h
index 5af7694..12a7554 100644
--- a/cellular_error.h
+++ b/cellular/cellular_error.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_ERROR_H_
-#define SHILL_CELLULAR_ERROR_H_
+#ifndef SHILL_CELLULAR_CELLULAR_ERROR_H_
+#define SHILL_CELLULAR_CELLULAR_ERROR_H_
 
 #include <dbus-c++/error.h>
 
@@ -23,4 +23,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_ERROR_H_
+#endif  // SHILL_CELLULAR_CELLULAR_ERROR_H_
diff --git a/cellular_error_mm1.cc b/cellular/cellular_error_mm1.cc
similarity index 97%
rename from cellular_error_mm1.cc
rename to cellular/cellular_error_mm1.cc
index eb4fc0e..ef8faf8 100644
--- a/cellular_error_mm1.cc
+++ b/cellular/cellular_error_mm1.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 
 #include <string>
 
diff --git a/cellular_error_unittest.cc b/cellular/cellular_error_unittest.cc
similarity index 98%
rename from cellular_error_unittest.cc
rename to cellular/cellular_error_unittest.cc
index 67bddc6..ab15362 100644
--- a/cellular_error_unittest.cc
+++ b/cellular/cellular_error_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 
 #include <dbus-c++/error.h>
 #include <gtest/gtest.h>
diff --git a/cellular_service.cc b/cellular/cellular_service.cc
similarity index 98%
rename from cellular_service.cc
rename to cellular/cellular_service.cc
index 24a8f6b..32e835b 100644
--- a/cellular_service.cc
+++ b/cellular/cellular_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 
 #include <string>
 
@@ -10,7 +10,7 @@
 #include <chromeos/dbus/service_constants.h>
 
 #include "shill/adaptor_interfaces.h"
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 #include "shill/property_accessor.h"
 #include "shill/store_interface.h"
 
diff --git a/cellular_service.h b/cellular/cellular_service.h
similarity index 96%
rename from cellular_service.h
rename to cellular/cellular_service.h
index 0ac2a20..1e2a5a0 100644
--- a/cellular_service.h
+++ b/cellular/cellular_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_CELLULAR_SERVICE_H_
-#define SHILL_CELLULAR_SERVICE_H_
+#ifndef SHILL_CELLULAR_CELLULAR_SERVICE_H_
+#define SHILL_CELLULAR_CELLULAR_SERVICE_H_
 
 #include <map>
 #include <memory>
@@ -13,8 +13,8 @@
 #include <base/time/time.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/cellular.h"
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/out_of_credits_detector.h"
 #include "shill/refptr_types.h"
 #include "shill/service.h"
 
@@ -230,4 +230,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_CELLULAR_SERVICE_H_
+#endif  // SHILL_CELLULAR_CELLULAR_SERVICE_H_
diff --git a/cellular_service_unittest.cc b/cellular/cellular_service_unittest.cc
similarity index 98%
rename from cellular_service_unittest.cc
rename to cellular/cellular_service_unittest.cc
index 4439262..da40905 100644
--- a/cellular_service_unittest.cc
+++ b/cellular/cellular_service_unittest.cc
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 
 #include <chromeos/dbus/service_constants.h>
 #include <gtest/gtest.h>
 #include <mm/mm-modem.h>
 
-#include "shill/cellular_capability.h"
-#include "shill/cellular_capability_cdma.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/cellular_capability_cdma.h"
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_out_of_credits_detector.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_cellular.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_metrics.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_out_of_credits_detector.h"
 #include "shill/mock_profile.h"
 #include "shill/mock_store.h"
 #include "shill/nice_mock_control.h"
diff --git a/cellular_unittest.cc b/cellular/cellular_unittest.cc
similarity index 98%
rename from cellular_unittest.cc
rename to cellular/cellular_unittest.cc
index 29d4b31..b8cbfaa 100644
--- a/cellular_unittest.cc
+++ b/cellular/cellular_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 
 #include <sys/socket.h>
 #include <linux/if.h>  // NOLINT - Needs typedefs from sys/socket.h.
@@ -11,31 +11,31 @@
 #include <base/bind.h>
 #include <chromeos/dbus/service_constants.h>
 
-#include "shill/cellular_bearer.h"
-#include "shill/cellular_capability_cdma.h"
-#include "shill/cellular_capability_classic.h"
-#include "shill/cellular_capability_gsm.h"
-#include "shill/cellular_capability_universal.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_bearer.h"
+#include "shill/cellular/cellular_capability_cdma.h"
+#include "shill/cellular/cellular_capability_classic.h"
+#include "shill/cellular/cellular_capability_gsm.h"
+#include "shill/cellular/cellular_capability_universal.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/mock_cellular_service.h"
+#include "shill/cellular/mock_mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mock_mm1_modem_proxy.h"
+#include "shill/cellular/mock_mm1_modem_simple_proxy.h"
+#include "shill/cellular/mock_mobile_operator_info.h"
+#include "shill/cellular/mock_modem_cdma_proxy.h"
+#include "shill/cellular/mock_modem_gsm_card_proxy.h"
+#include "shill/cellular/mock_modem_gsm_network_proxy.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_modem_proxy.h"
+#include "shill/cellular/mock_modem_simple_proxy.h"
 #include "shill/error.h"
 #include "shill/event_dispatcher.h"
 #include "shill/mock_adaptors.h"
-#include "shill/mock_cellular_service.h"
 #include "shill/mock_dbus_properties_proxy.h"
 #include "shill/mock_device_info.h"
 #include "shill/mock_dhcp_config.h"
 #include "shill/mock_dhcp_provider.h"
 #include "shill/mock_external_task.h"
-#include "shill/mock_mm1_modem_modem3gpp_proxy.h"
-#include "shill/mock_mm1_modem_proxy.h"
-#include "shill/mock_mm1_modem_simple_proxy.h"
-#include "shill/mock_mobile_operator_info.h"
-#include "shill/mock_modem_cdma_proxy.h"
-#include "shill/mock_modem_gsm_card_proxy.h"
-#include "shill/mock_modem_gsm_network_proxy.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_modem_proxy.h"
-#include "shill/mock_modem_simple_proxy.h"
 #include "shill/mock_ppp_device.h"
 #include "shill/mock_ppp_device_factory.h"
 #include "shill/net/mock_rtnl_handler.h"
diff --git a/dbus_objectmanager_proxy.cc b/cellular/dbus_objectmanager_proxy.cc
similarity index 96%
rename from dbus_objectmanager_proxy.cc
rename to cellular/dbus_objectmanager_proxy.cc
index 7acef1a..7479cfd 100644
--- a/dbus_objectmanager_proxy.cc
+++ b/cellular/dbus_objectmanager_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/dbus_objectmanager_proxy.h"
+#include "shill/cellular/dbus_objectmanager_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/dbus_objectmanager_proxy.h b/cellular/dbus_objectmanager_proxy.h
similarity index 91%
rename from dbus_objectmanager_proxy.h
rename to cellular/dbus_objectmanager_proxy.h
index 346e320..13f7cde 100644
--- a/dbus_objectmanager_proxy.h
+++ b/cellular/dbus_objectmanager_proxy.h
@@ -1,14 +1,14 @@
-
 // Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#ifndef SHILL_DBUS_OBJECTMANAGER_PROXY_H_
-#define SHILL_DBUS_OBJECTMANAGER_PROXY_H_
+
+#ifndef SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_H_
+#define SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_H_
 
 #include <string>
 #include <vector>
 
-#include "shill/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/dbus_objectmanager_proxy_interface.h"
 #include "shill/dbus_proxies/dbus-objectmanager.h"
 
 namespace shill {
@@ -73,4 +73,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_DBUS_OBJECTMANAGER_PROXY_H_
+#endif  // SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_H_
diff --git a/dbus_objectmanager_proxy_interface.h b/cellular/dbus_objectmanager_proxy_interface.h
similarity index 90%
rename from dbus_objectmanager_proxy_interface.h
rename to cellular/dbus_objectmanager_proxy_interface.h
index 9968b03..ebde700 100644
--- a/dbus_objectmanager_proxy_interface.h
+++ b/cellular/dbus_objectmanager_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
-#define SHILL_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
 
 #include <map>
 #include <string>
@@ -49,4 +49,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_DBUS_OBJECTMANAGER_PROXY_INTERFACE_H_
diff --git a/mm1_bearer_proxy.cc b/cellular/mm1_bearer_proxy.cc
similarity index 95%
rename from mm1_bearer_proxy.cc
rename to cellular/mm1_bearer_proxy.cc
index b7ded9a..22da205 100644
--- a/mm1_bearer_proxy.cc
+++ b/cellular/mm1_bearer_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_bearer_proxy.h"
+#include "shill/cellular/mm1_bearer_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_bearer_proxy.h b/cellular/mm1_bearer_proxy.h
similarity index 90%
rename from mm1_bearer_proxy.h
rename to cellular/mm1_bearer_proxy.h
index 74f35fd..bdddf13 100644
--- a/mm1_bearer_proxy.h
+++ b/cellular/mm1_bearer_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_BEARER_PROXY_H_
-#define SHILL_MM1_BEARER_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_BEARER_PROXY_H_
+#define SHILL_CELLULAR_MM1_BEARER_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Bearer.h"
+#include "shill/cellular/mm1_bearer_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_bearer_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -61,4 +61,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_BEARER_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_BEARER_PROXY_H_
diff --git a/mm1_bearer_proxy_interface.h b/cellular/mm1_bearer_proxy_interface.h
similarity index 84%
rename from mm1_bearer_proxy_interface.h
rename to cellular/mm1_bearer_proxy_interface.h
index a4f0ec8..b51d8db 100644
--- a/mm1_bearer_proxy_interface.h
+++ b/cellular/mm1_bearer_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_BEARER_PROXY_INTERFACE_H_
-#define SHILL_MM1_BEARER_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_BEARER_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_BEARER_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -34,4 +34,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_BEARER_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_BEARER_PROXY_INTERFACE_H_
diff --git a/mm1_modem_location_proxy.cc b/cellular/mm1_modem_location_proxy.cc
similarity index 95%
rename from mm1_modem_location_proxy.cc
rename to cellular/mm1_modem_location_proxy.cc
index c9f11c2..d84aabf 100644
--- a/mm1_modem_location_proxy.cc
+++ b/cellular/mm1_modem_location_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_location_proxy.h"
+#include "shill/cellular/mm1_modem_location_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_location_proxy.h b/cellular/mm1_modem_location_proxy.h
similarity index 89%
rename from mm1_modem_location_proxy.h
rename to cellular/mm1_modem_location_proxy.h
index 391ca35..16d5be0 100644
--- a/mm1_modem_location_proxy.h
+++ b/cellular/mm1_modem_location_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_LOCATION_PROXY_H_
-#define SHILL_MM1_MODEM_LOCATION_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Location.h"
+#include "shill/cellular/mm1_modem_location_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_location_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -66,4 +66,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_LOCATION_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_H_
diff --git a/mm1_modem_location_proxy_interface.h b/cellular/mm1_modem_location_proxy_interface.h
similarity index 84%
rename from mm1_modem_location_proxy_interface.h
rename to cellular/mm1_modem_location_proxy_interface.h
index b1630aa..12aaba3 100644
--- a/mm1_modem_location_proxy_interface.h
+++ b/cellular/mm1_modem_location_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
 
 #include "shill/callbacks.h"
 
@@ -34,4 +34,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_LOCATION_PROXY_INTERFACE_H_
diff --git a/mm1_modem_modem3gpp_proxy.cc b/cellular/mm1_modem_modem3gpp_proxy.cc
similarity index 95%
rename from mm1_modem_modem3gpp_proxy.cc
rename to cellular/mm1_modem_modem3gpp_proxy.cc
index ad4c8d7..3673f4a 100644
--- a/mm1_modem_modem3gpp_proxy.cc
+++ b/cellular/mm1_modem_modem3gpp_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mm1_modem_modem3gpp_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_modem3gpp_proxy.h b/cellular/mm1_modem_modem3gpp_proxy.h
similarity index 89%
rename from mm1_modem_modem3gpp_proxy.h
rename to cellular/mm1_modem_modem3gpp_proxy.h
index 9cf3bcc..8b7de1f 100644
--- a/mm1_modem_modem3gpp_proxy.h
+++ b/cellular/mm1_modem_modem3gpp_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_MODEM3GPP_PROXY_H_
-#define SHILL_MM1_MODEM_MODEM3GPP_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_H_
 
 #include <string>
 #include <vector>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Modem3gpp.h"
+#include "shill/cellular/mm1_modem_modem3gpp_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_modem3gpp_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -61,4 +61,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_MODEM3GPP_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_H_
diff --git a/mm1_modem_modem3gpp_proxy_interface.h b/cellular/mm1_modem_modem3gpp_proxy_interface.h
similarity index 83%
rename from mm1_modem_modem3gpp_proxy_interface.h
rename to cellular/mm1_modem_modem3gpp_proxy_interface.h
index ff8242a..10a8508 100644
--- a/mm1_modem_modem3gpp_proxy_interface.h
+++ b/cellular/mm1_modem_modem3gpp_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -35,4 +35,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_MODEM3GPP_PROXY_INTERFACE_H_
diff --git a/mm1_modem_modemcdma_proxy.cc b/cellular/mm1_modem_modemcdma_proxy.cc
similarity index 96%
rename from mm1_modem_modemcdma_proxy.cc
rename to cellular/mm1_modem_modemcdma_proxy.cc
index 141c828..2a8f59e 100644
--- a/mm1_modem_modemcdma_proxy.cc
+++ b/cellular/mm1_modem_modemcdma_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_modemcdma_proxy.h"
+#include "shill/cellular/mm1_modem_modemcdma_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_modemcdma_proxy.h b/cellular/mm1_modem_modemcdma_proxy.h
similarity index 91%
rename from mm1_modem_modemcdma_proxy.h
rename to cellular/mm1_modem_modemcdma_proxy.h
index bf58502..d1ae73c 100644
--- a/mm1_modem_modemcdma_proxy.h
+++ b/cellular/mm1_modem_modemcdma_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_MODEMCDMA_PROXY_H_
-#define SHILL_MM1_MODEM_MODEMCDMA_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.ModemCdma.h"
+#include "shill/cellular/mm1_modem_modemcdma_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_modemcdma_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -76,4 +76,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_MODEMCDMA_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_H_
diff --git a/mm1_modem_modemcdma_proxy_interface.h b/cellular/mm1_modem_modemcdma_proxy_interface.h
similarity index 85%
rename from mm1_modem_modemcdma_proxy_interface.h
rename to cellular/mm1_modem_modemcdma_proxy_interface.h
index 93c3412..6fe7fcc 100644
--- a/mm1_modem_modemcdma_proxy_interface.h
+++ b/cellular/mm1_modem_modemcdma_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -40,4 +40,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_MODEMCDMA_PROXY_INTERFACE_H_
diff --git a/mm1_modem_proxy.cc b/cellular/mm1_modem_proxy.cc
similarity index 98%
rename from mm1_modem_proxy.cc
rename to cellular/mm1_modem_proxy.cc
index deb980e..25d62f7 100644
--- a/mm1_modem_proxy.cc
+++ b/cellular/mm1_modem_proxy.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_proxy.h"
+#include "shill/cellular/mm1_modem_proxy.h"
 
 #include <ModemManager/ModemManager.h>
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_proxy.h b/cellular/mm1_modem_proxy.h
similarity index 96%
rename from mm1_modem_proxy.h
rename to cellular/mm1_modem_proxy.h
index 16c57ec..d4590ed 100644
--- a/mm1_modem_proxy.h
+++ b/cellular/mm1_modem_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_PROXY_H_
-#define SHILL_MM1_MODEM_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_PROXY_H_
 
 #include <string>
 #include <vector>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.h"
+#include "shill/cellular/mm1_modem_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -129,4 +129,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_PROXY_H_
diff --git a/mm1_modem_proxy_interface.h b/cellular/mm1_modem_proxy_interface.h
similarity index 94%
rename from mm1_modem_proxy_interface.h
rename to cellular/mm1_modem_proxy_interface.h
index 563d39a..cf76978 100644
--- a/mm1_modem_proxy_interface.h
+++ b/cellular/mm1_modem_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_PROXY_INTERFACE_H_
 
 #include <string>
 #include <vector>
@@ -75,4 +75,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_PROXY_INTERFACE_H_
diff --git a/mm1_modem_simple_proxy.cc b/cellular/mm1_modem_simple_proxy.cc
similarity index 96%
rename from mm1_modem_simple_proxy.cc
rename to cellular/mm1_modem_simple_proxy.cc
index b194d8c..cb42a03 100644
--- a/mm1_modem_simple_proxy.cc
+++ b/cellular/mm1_modem_simple_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_simple_proxy.h"
+#include "shill/cellular/mm1_modem_simple_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_simple_proxy.h b/cellular/mm1_modem_simple_proxy.h
similarity index 90%
rename from mm1_modem_simple_proxy.h
rename to cellular/mm1_modem_simple_proxy.h
index 774d36b..c2b5047 100644
--- a/mm1_modem_simple_proxy.h
+++ b/cellular/mm1_modem_simple_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_SIMPLE_PROXY_H_
-#define SHILL_MM1_MODEM_SIMPLE_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Simple.h"
+#include "shill/cellular/mm1_modem_simple_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_simple_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -70,4 +70,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_SIMPLE_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_H_
diff --git a/mm1_modem_simple_proxy_interface.h b/cellular/mm1_modem_simple_proxy_interface.h
similarity index 86%
rename from mm1_modem_simple_proxy_interface.h
rename to cellular/mm1_modem_simple_proxy_interface.h
index 184f912..8ba256b 100644
--- a/mm1_modem_simple_proxy_interface.h
+++ b/cellular/mm1_modem_simple_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -39,4 +39,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_SIMPLE_PROXY_INTERFACE_H_
diff --git a/mm1_modem_time_proxy.cc b/cellular/mm1_modem_time_proxy.cc
similarity index 95%
rename from mm1_modem_time_proxy.cc
rename to cellular/mm1_modem_time_proxy.cc
index fe0f3f3..2ba2e1e 100644
--- a/mm1_modem_time_proxy.cc
+++ b/cellular/mm1_modem_time_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_modem_time_proxy.h"
+#include "shill/cellular/mm1_modem_time_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_modem_time_proxy.h b/cellular/mm1_modem_time_proxy.h
similarity index 90%
rename from mm1_modem_time_proxy.h
rename to cellular/mm1_modem_time_proxy.h
index 3fa8458..36cf07b 100644
--- a/mm1_modem_time_proxy.h
+++ b/cellular/mm1_modem_time_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_TIME_PROXY_H_
-#define SHILL_MM1_MODEM_TIME_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_H_
+#define SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Modem.Time.h"
+#include "shill/cellular/mm1_modem_time_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_modem_time_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -68,4 +68,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_TIME_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_H_
diff --git a/mm1_modem_time_proxy_interface.h b/cellular/mm1_modem_time_proxy_interface.h
similarity index 85%
rename from mm1_modem_time_proxy_interface.h
rename to cellular/mm1_modem_time_proxy_interface.h
index e47369f..31e84b1 100644
--- a/mm1_modem_time_proxy_interface.h
+++ b/cellular/mm1_modem_time_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_MODEM_TIME_PROXY_INTERFACE_H_
-#define SHILL_MM1_MODEM_TIME_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -36,4 +36,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_MODEM_TIME_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_MODEM_TIME_PROXY_INTERFACE_H_
diff --git a/mm1_sim_proxy.cc b/cellular/mm1_sim_proxy.cc
similarity index 97%
rename from mm1_sim_proxy.cc
rename to cellular/mm1_sim_proxy.cc
index f4f2118..190925d 100644
--- a/mm1_sim_proxy.cc
+++ b/cellular/mm1_sim_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mm1_sim_proxy.h"
+#include "shill/cellular/mm1_sim_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/mm1_sim_proxy.h b/cellular/mm1_sim_proxy.h
similarity index 93%
rename from mm1_sim_proxy.h
rename to cellular/mm1_sim_proxy.h
index 3803d44..ce72fd6 100644
--- a/mm1_sim_proxy.h
+++ b/cellular/mm1_sim_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_SIM_PROXY_H_
-#define SHILL_MM1_SIM_PROXY_H_
+#ifndef SHILL_CELLULAR_MM1_SIM_PROXY_H_
+#define SHILL_CELLULAR_MM1_SIM_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager1.Sim.h"
+#include "shill/cellular/mm1_sim_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/mm1_sim_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -84,4 +84,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_SIM_PROXY_H_
+#endif  // SHILL_CELLULAR_MM1_SIM_PROXY_H_
diff --git a/mm1_sim_proxy_interface.h b/cellular/mm1_sim_proxy_interface.h
similarity index 90%
rename from mm1_sim_proxy_interface.h
rename to cellular/mm1_sim_proxy_interface.h
index 77b5404..b7a3769 100644
--- a/mm1_sim_proxy_interface.h
+++ b/cellular/mm1_sim_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MM1_SIM_PROXY_INTERFACE_H_
-#define SHILL_MM1_SIM_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MM1_SIM_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MM1_SIM_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -47,4 +47,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MM1_SIM_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MM1_SIM_PROXY_INTERFACE_H_
diff --git a/mobile_operator_info.cc b/cellular/mobile_operator_info.cc
similarity index 98%
rename from mobile_operator_info.cc
rename to cellular/mobile_operator_info.cc
index 744de8d..988875c 100644
--- a/mobile_operator_info.cc
+++ b/cellular/mobile_operator_info.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mobile_operator_info.h"
+#include "shill/cellular/mobile_operator_info.h"
 
 #include <sstream>
 
+#include "shill/cellular/mobile_operator_info_impl.h"
 #include "shill/logging.h"
-#include "shill/mobile_operator_info_impl.h"
 
 namespace shill {
 
diff --git a/mobile_operator_info.h b/cellular/mobile_operator_info.h
similarity index 97%
rename from mobile_operator_info.h
rename to cellular/mobile_operator_info.h
index bc12615..27bd6bc 100644
--- a/mobile_operator_info.h
+++ b/cellular/mobile_operator_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOBILE_OPERATOR_INFO_H_
-#define SHILL_MOBILE_OPERATOR_INFO_H_
+#ifndef SHILL_CELLULAR_MOBILE_OPERATOR_INFO_H_
+#define SHILL_CELLULAR_MOBILE_OPERATOR_INFO_H_
 
 #include <memory>
 #include <string>
@@ -215,4 +215,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOBILE_OPERATOR_INFO_H_
+#endif  // SHILL_CELLULAR_MOBILE_OPERATOR_INFO_H_
diff --git a/mobile_operator_info_impl.cc b/cellular/mobile_operator_info_impl.cc
similarity index 99%
rename from mobile_operator_info_impl.cc
rename to cellular/mobile_operator_info_impl.cc
index c9c65d3..43d4f86 100644
--- a/mobile_operator_info_impl.cc
+++ b/cellular/mobile_operator_info_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mobile_operator_info_impl.h"
+#include "shill/cellular/mobile_operator_info_impl.h"
 
 #include <regex.h>
 
diff --git a/mobile_operator_info_impl.h b/cellular/mobile_operator_info_impl.h
similarity index 97%
rename from mobile_operator_info_impl.h
rename to cellular/mobile_operator_info_impl.h
index 3dc8999..5e7f0d2 100644
--- a/mobile_operator_info_impl.h
+++ b/cellular/mobile_operator_info_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOBILE_OPERATOR_INFO_IMPL_H_
-#define SHILL_MOBILE_OPERATOR_INFO_IMPL_H_
+#ifndef SHILL_CELLULAR_MOBILE_OPERATOR_INFO_IMPL_H_
+#define SHILL_CELLULAR_MOBILE_OPERATOR_INFO_IMPL_H_
 
 #include <map>
 #include <memory>
@@ -16,8 +16,8 @@
 #include <base/memory/weak_ptr.h>
 #include <base/observer_list.h>
 
+#include "shill/cellular/mobile_operator_info.h"
 #include "shill/event_dispatcher.h"
-#include "shill/mobile_operator_info.h"
 #include "shill/proto_bindings/mobile_operator_db/mobile_operator_db.pb.h"
 
 namespace shill {
@@ -219,4 +219,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOBILE_OPERATOR_INFO_IMPL_H_
+#endif  // SHILL_CELLULAR_MOBILE_OPERATOR_INFO_IMPL_H_
diff --git a/mobile_operator_info_unittest.cc b/cellular/mobile_operator_info_unittest.cc
similarity index 98%
rename from mobile_operator_info_unittest.cc
rename to cellular/mobile_operator_info_unittest.cc
index df4bded..c865a6e 100644
--- a/mobile_operator_info_unittest.cc
+++ b/cellular/mobile_operator_info_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mobile_operator_info.h"
+#include "shill/cellular/mobile_operator_info.h"
 
 #include <fstream>
 #include <map>
@@ -15,21 +15,21 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "shill/cellular/mobile_operator_info_impl.h"
+#include "shill/event_dispatcher.h"
+#include "shill/logging.h"
+
 // These files contain binary protobuf definitions used by the following tests
 // inside the namespace ::mobile_operator_db
 #define IN_MOBILE_OPERATOR_INFO_UNITTEST_CC
-#include "mobile_operator_db/test_protos/data_test.h"
-#include "mobile_operator_db/test_protos/init_test_empty_db_init.h"
-#include "mobile_operator_db/test_protos/init_test_multiple_db_init_1.h"
-#include "mobile_operator_db/test_protos/init_test_multiple_db_init_2.h"
-#include "mobile_operator_db/test_protos/init_test_successful_init.h"
-#include "mobile_operator_db/test_protos/main_test.h"
+#include "shill/mobile_operator_db/test_protos/data_test.h"
+#include "shill/mobile_operator_db/test_protos/init_test_empty_db_init.h"
+#include "shill/mobile_operator_db/test_protos/init_test_multiple_db_init_1.h"
+#include "shill/mobile_operator_db/test_protos/init_test_multiple_db_init_2.h"
+#include "shill/mobile_operator_db/test_protos/init_test_successful_init.h"
+#include "shill/mobile_operator_db/test_protos/main_test.h"
 #undef IN_MOBILE_OPERATOR_INFO_UNITTEST_CC
 
-#include "shill/event_dispatcher.h"
-#include "shill/logging.h"
-#include "shill/mobile_operator_info_impl.h"
-
 using base::FilePath;
 using shill::mobile_operator_db::MobileOperatorDB;
 using std::map;
diff --git a/mock_cellular.cc b/cellular/mock_cellular.cc
similarity index 95%
rename from mock_cellular.cc
rename to cellular/mock_cellular.cc
index c5a4394..509e7d4 100644
--- a/mock_cellular.cc
+++ b/cellular/mock_cellular.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_cellular.h"
+#include "shill/cellular/mock_cellular.h"
 
 #include <gmock/gmock.h>
 
diff --git a/mock_cellular.h b/cellular/mock_cellular.h
similarity index 88%
rename from mock_cellular.h
rename to cellular/mock_cellular.h
index 4b9e1b7..7d57148 100644
--- a/mock_cellular.h
+++ b/cellular/mock_cellular.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_CELLULAR_H_
-#define SHILL_MOCK_CELLULAR_H_
+#ifndef SHILL_CELLULAR_MOCK_CELLULAR_H_
+#define SHILL_CELLULAR_MOCK_CELLULAR_H_
 
 #include <string>
 #include <vector>
 
 #include <gmock/gmock.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 
 namespace shill {
 
@@ -43,4 +43,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_CELLULAR_H_
+#endif  // SHILL_CELLULAR_MOCK_CELLULAR_H_
diff --git a/mock_cellular_service.cc b/cellular/mock_cellular_service.cc
similarity index 92%
rename from mock_cellular_service.cc
rename to cellular/mock_cellular_service.cc
index c4290a4..64e7d2b 100644
--- a/mock_cellular_service.cc
+++ b/cellular/mock_cellular_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_cellular_service.h"
+#include "shill/cellular/mock_cellular_service.h"
 
 #include <chromeos/dbus/service_constants.h>
 
diff --git a/mock_cellular_service.h b/cellular/mock_cellular_service.h
similarity index 86%
rename from mock_cellular_service.h
rename to cellular/mock_cellular_service.h
index 913a3d3..f78d852 100644
--- a/mock_cellular_service.h
+++ b/cellular/mock_cellular_service.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_CELLULAR_SERVICE_H_
-#define SHILL_MOCK_CELLULAR_SERVICE_H_
+#ifndef SHILL_CELLULAR_MOCK_CELLULAR_SERVICE_H_
+#define SHILL_CELLULAR_MOCK_CELLULAR_SERVICE_H_
 
 #include <string>
 
 #include <gmock/gmock.h>
 
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 
 namespace shill {
 
@@ -41,4 +41,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_CELLULAR_SERVICE_H_
+#endif  // SHILL_CELLULAR_MOCK_CELLULAR_SERVICE_H_
diff --git a/mock_dbus_objectmanager_proxy.cc b/cellular/mock_dbus_objectmanager_proxy.cc
similarity index 92%
rename from mock_dbus_objectmanager_proxy.cc
rename to cellular/mock_dbus_objectmanager_proxy.cc
index 81ca236..b6d9c34 100644
--- a/mock_dbus_objectmanager_proxy.cc
+++ b/cellular/mock_dbus_objectmanager_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_dbus_objectmanager_proxy.h"
+#include "shill/cellular/mock_dbus_objectmanager_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_dbus_objectmanager_proxy.h b/cellular/mock_dbus_objectmanager_proxy.h
similarity index 79%
rename from mock_dbus_objectmanager_proxy.h
rename to cellular/mock_dbus_objectmanager_proxy.h
index 7ae077f..0e50c1b 100644
--- a/mock_dbus_objectmanager_proxy.h
+++ b/cellular/mock_dbus_objectmanager_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
-#define SHILL_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
+#define SHILL_CELLULAR_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/dbus_objectmanager_proxy_interface.h"
 
 namespace shill {
 
@@ -32,4 +32,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_DBUS_OBJECTMANAGER_PROXY_H_
diff --git a/mock_mm1_bearer_proxy.cc b/cellular/mock_mm1_bearer_proxy.cc
similarity index 91%
rename from mock_mm1_bearer_proxy.cc
rename to cellular/mock_mm1_bearer_proxy.cc
index 6544abf..f26be03 100644
--- a/mock_mm1_bearer_proxy.cc
+++ b/cellular/mock_mm1_bearer_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_bearer_proxy.h"
+#include "shill/cellular/mock_mm1_bearer_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_bearer_proxy.h b/cellular/mock_mm1_bearer_proxy.h
similarity index 77%
rename from mock_mm1_bearer_proxy.h
rename to cellular/mock_mm1_bearer_proxy.h
index 883081e..e478967 100644
--- a/mock_mm1_bearer_proxy.h
+++ b/cellular/mock_mm1_bearer_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_BEARER_PROXY_H_
-#define SHILL_MOCK_MM1_BEARER_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_BEARER_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_BEARER_PROXY_H_
 
 #include <string>
 
 #include <gmock/gmock.h>
 
-#include "shill/mm1_bearer_proxy_interface.h"
+#include "shill/cellular/mm1_bearer_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -30,4 +30,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_BEARER_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_BEARER_PROXY_H_
diff --git a/mock_mm1_modem_location_proxy.cc b/cellular/mock_mm1_modem_location_proxy.cc
similarity index 90%
rename from mock_mm1_modem_location_proxy.cc
rename to cellular/mock_mm1_modem_location_proxy.cc
index 3701936..a62376f 100644
--- a/mock_mm1_modem_location_proxy.cc
+++ b/cellular/mock_mm1_modem_location_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_location_proxy.h"
+#include "shill/cellular/mock_mm1_modem_location_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_location_proxy.h b/cellular/mock_mm1_modem_location_proxy.h
similarity index 80%
rename from mock_mm1_modem_location_proxy.h
rename to cellular/mock_mm1_modem_location_proxy.h
index ae7c580..3324807 100644
--- a/mock_mm1_modem_location_proxy.h
+++ b/cellular/mock_mm1_modem_location_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_LOCATION_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_LOCATION_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_LOCATION_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_LOCATION_PROXY_H_
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_location_proxy_interface.h"
+#include "shill/cellular/mm1_modem_location_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -36,4 +36,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_LOCATION_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_LOCATION_PROXY_H_
diff --git a/mock_mm1_modem_modem3gpp_proxy.cc b/cellular/mock_mm1_modem_modem3gpp_proxy.cc
similarity index 90%
rename from mock_mm1_modem_modem3gpp_proxy.cc
rename to cellular/mock_mm1_modem_modem3gpp_proxy.cc
index 83a4c9d..ad985dc 100644
--- a/mock_mm1_modem_modem3gpp_proxy.cc
+++ b/cellular/mock_mm1_modem_modem3gpp_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mock_mm1_modem_modem3gpp_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_modem3gpp_proxy.h b/cellular/mock_mm1_modem_modem3gpp_proxy.h
similarity index 78%
rename from mock_mm1_modem_modem3gpp_proxy.h
rename to cellular/mock_mm1_modem_modem3gpp_proxy.h
index 0ccf402..7e9bba4 100644
--- a/mock_mm1_modem_modem3gpp_proxy.h
+++ b/cellular/mock_mm1_modem_modem3gpp_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_modem3gpp_proxy_interface.h"
+#include "shill/cellular/mm1_modem_modem3gpp_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -35,4 +35,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_MODEM3GPP_PROXY_H_
diff --git a/mock_mm1_modem_modemcdma_proxy.cc b/cellular/mock_mm1_modem_modemcdma_proxy.cc
similarity index 90%
rename from mock_mm1_modem_modemcdma_proxy.cc
rename to cellular/mock_mm1_modem_modemcdma_proxy.cc
index b660fff..650afd4 100644
--- a/mock_mm1_modem_modemcdma_proxy.cc
+++ b/cellular/mock_mm1_modem_modemcdma_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_modemcdma_proxy.h"
+#include "shill/cellular/mock_mm1_modem_modemcdma_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_modemcdma_proxy.h b/cellular/mock_mm1_modem_modemcdma_proxy.h
similarity index 79%
rename from mock_mm1_modem_modemcdma_proxy.h
rename to cellular/mock_mm1_modem_modemcdma_proxy.h
index c973f67..39c2f83 100644
--- a/mock_mm1_modem_modemcdma_proxy.h
+++ b/cellular/mock_mm1_modem_modemcdma_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_modemcdma_proxy_interface.h"
+#include "shill/cellular/mm1_modem_modemcdma_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -42,4 +42,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_MODEMCDMA_PROXY_H_
diff --git a/mock_mm1_modem_proxy.cc b/cellular/mock_mm1_modem_proxy.cc
similarity index 95%
rename from mock_mm1_modem_proxy.cc
rename to cellular/mock_mm1_modem_proxy.cc
index 3ac4c6c..e223fbe 100644
--- a/mock_mm1_modem_proxy.cc
+++ b/cellular/mock_mm1_modem_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_proxy.h"
+#include "shill/cellular/mock_mm1_modem_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_proxy.h b/cellular/mock_mm1_modem_proxy.h
similarity index 93%
rename from mock_mm1_modem_proxy.h
rename to cellular/mock_mm1_modem_proxy.h
index f48f8af..3fce369 100644
--- a/mock_mm1_modem_proxy.h
+++ b/cellular/mock_mm1_modem_proxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_PROXY_H_
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_proxy_interface.h"
+#include "shill/cellular/mm1_modem_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -73,4 +73,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_PROXY_H_
diff --git a/mock_mm1_modem_simple_proxy.cc b/cellular/mock_mm1_modem_simple_proxy.cc
similarity index 92%
rename from mock_mm1_modem_simple_proxy.cc
rename to cellular/mock_mm1_modem_simple_proxy.cc
index b39113b..d985d3a 100644
--- a/mock_mm1_modem_simple_proxy.cc
+++ b/cellular/mock_mm1_modem_simple_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_simple_proxy.h"
+#include "shill/cellular/mock_mm1_modem_simple_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_simple_proxy.h b/cellular/mock_mm1_modem_simple_proxy.h
similarity index 82%
rename from mock_mm1_modem_simple_proxy.h
rename to cellular/mock_mm1_modem_simple_proxy.h
index 58d3b63..e0f1863 100644
--- a/mock_mm1_modem_simple_proxy.h
+++ b/cellular/mock_mm1_modem_simple_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_simple_proxy_interface.h"
+#include "shill/cellular/mm1_modem_simple_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -38,4 +38,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_SIMPLE_PROXY_H_
diff --git a/mock_mm1_modem_time_proxy.cc b/cellular/mock_mm1_modem_time_proxy.cc
similarity index 89%
rename from mock_mm1_modem_time_proxy.cc
rename to cellular/mock_mm1_modem_time_proxy.cc
index f4efe8c..1e0f2aa 100644
--- a/mock_mm1_modem_time_proxy.cc
+++ b/cellular/mock_mm1_modem_time_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_modem_time_proxy.h"
+#include "shill/cellular/mock_mm1_modem_time_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_modem_time_proxy.h b/cellular/mock_mm1_modem_time_proxy.h
similarity index 79%
rename from mock_mm1_modem_time_proxy.h
rename to cellular/mock_mm1_modem_time_proxy.h
index 8e8f27a..2dd1e09 100644
--- a/mock_mm1_modem_time_proxy.h
+++ b/cellular/mock_mm1_modem_time_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_MODEM_TIME_PROXY_H_
-#define SHILL_MOCK_MM1_MODEM_TIME_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_MODEM_TIME_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_MODEM_TIME_PROXY_H_
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_modem_time_proxy_interface.h"
+#include "shill/cellular/mm1_modem_time_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -33,4 +33,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_MODEM_TIME_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_MODEM_TIME_PROXY_H_
diff --git a/mock_mm1_sim_proxy.cc b/cellular/mock_mm1_sim_proxy.cc
similarity index 93%
rename from mock_mm1_sim_proxy.cc
rename to cellular/mock_mm1_sim_proxy.cc
index d18fde0..760e7a0 100644
--- a/mock_mm1_sim_proxy.cc
+++ b/cellular/mock_mm1_sim_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mm1_sim_proxy.h"
+#include "shill/cellular/mock_mm1_sim_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_mm1_sim_proxy.h b/cellular/mock_mm1_sim_proxy.h
similarity index 88%
rename from mock_mm1_sim_proxy.h
rename to cellular/mock_mm1_sim_proxy.h
index eca0395..5282439 100644
--- a/mock_mm1_sim_proxy.h
+++ b/cellular/mock_mm1_sim_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MM1_SIM_PROXY_H_
-#define SHILL_MOCK_MM1_SIM_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MM1_SIM_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MM1_SIM_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/mm1_sim_proxy_interface.h"
+#include "shill/cellular/mm1_sim_proxy_interface.h"
 
 namespace shill {
 namespace mm1 {
@@ -47,4 +47,4 @@
 }  // namespace mm1
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MM1_SIM_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MM1_SIM_PROXY_H_
diff --git a/mock_mobile_operator_info.cc b/cellular/mock_mobile_operator_info.cc
similarity index 94%
rename from mock_mobile_operator_info.cc
rename to cellular/mock_mobile_operator_info.cc
index 48197bf..2027a87 100644
--- a/mock_mobile_operator_info.cc
+++ b/cellular/mock_mobile_operator_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_mobile_operator_info.h"
+#include "shill/cellular/mock_mobile_operator_info.h"
 
 #include <gmock/gmock.h>
 
diff --git a/mock_mobile_operator_info.h b/cellular/mock_mobile_operator_info.h
similarity index 88%
rename from mock_mobile_operator_info.h
rename to cellular/mock_mobile_operator_info.h
index 65d4a8c..6c65c9c 100644
--- a/mock_mobile_operator_info.h
+++ b/cellular/mock_mobile_operator_info.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MOBILE_OPERATOR_INFO_H_
-#define SHILL_MOCK_MOBILE_OPERATOR_INFO_H_
+#ifndef SHILL_CELLULAR_MOCK_MOBILE_OPERATOR_INFO_H_
+#define SHILL_CELLULAR_MOCK_MOBILE_OPERATOR_INFO_H_
 
 #include <string>
 #include <vector>
 
 #include <gmock/gmock.h>
 
-#include "shill/mobile_operator_info.h"
+#include "shill/cellular/mobile_operator_info.h"
 
 using testing::ReturnRef;
 
@@ -53,4 +53,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MOBILE_OPERATOR_INFO_H_
+#endif  // SHILL_CELLULAR_MOCK_MOBILE_OPERATOR_INFO_H_
diff --git a/mock_modem.cc b/cellular/mock_modem.cc
similarity index 92%
rename from mock_modem.cc
rename to cellular/mock_modem.cc
index 23c64a1..782c6d5 100644
--- a/mock_modem.cc
+++ b/cellular/mock_modem.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem.h"
+#include "shill/cellular/mock_modem.h"
 
 namespace shill {
 
diff --git a/mock_modem.h b/cellular/mock_modem.h
similarity index 88%
rename from mock_modem.h
rename to cellular/mock_modem.h
index 86d5e2b..01b7f6c 100644
--- a/mock_modem.h
+++ b/cellular/mock_modem.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_H_
-#define SHILL_MOCK_MODEM_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_H_
+#define SHILL_CELLULAR_MOCK_MODEM_H_
 
 #include <string>
 
 #include <gmock/gmock.h>
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 namespace shill {
 
@@ -40,4 +40,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_H_
diff --git a/mock_modem_cdma_proxy.cc b/cellular/mock_modem_cdma_proxy.cc
similarity index 92%
rename from mock_modem_cdma_proxy.cc
rename to cellular/mock_modem_cdma_proxy.cc
index 6871380..bceacae 100644
--- a/mock_modem_cdma_proxy.cc
+++ b/cellular/mock_modem_cdma_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_cdma_proxy.h"
+#include "shill/cellular/mock_modem_cdma_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_cdma_proxy.h b/cellular/mock_modem_cdma_proxy.h
similarity index 86%
rename from mock_modem_cdma_proxy.h
rename to cellular/mock_modem_cdma_proxy.h
index bda5f61..0086691 100644
--- a/mock_modem_cdma_proxy.h
+++ b/cellular/mock_modem_cdma_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_CDMA_PROXY_H_
-#define SHILL_MOCK_MODEM_CDMA_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_CDMA_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_CDMA_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_cdma_proxy_interface.h"
+#include "shill/cellular/modem_cdma_proxy_interface.h"
 
 namespace shill {
 
@@ -42,4 +42,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_CDMA_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_CDMA_PROXY_H_
diff --git a/mock_modem_gobi_proxy.cc b/cellular/mock_modem_gobi_proxy.cc
similarity index 89%
rename from mock_modem_gobi_proxy.cc
rename to cellular/mock_modem_gobi_proxy.cc
index 820673c..d99e750 100644
--- a/mock_modem_gobi_proxy.cc
+++ b/cellular/mock_modem_gobi_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_gobi_proxy.h"
+#include "shill/cellular/mock_modem_gobi_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_gobi_proxy.h b/cellular/mock_modem_gobi_proxy.h
similarity index 76%
rename from mock_modem_gobi_proxy.h
rename to cellular/mock_modem_gobi_proxy.h
index 529938b..f05c867 100644
--- a/mock_modem_gobi_proxy.h
+++ b/cellular/mock_modem_gobi_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_GOBI_PROXY_H_
-#define SHILL_MOCK_MODEM_GOBI_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_GOBI_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_GOBI_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_gobi_proxy_interface.h"
+#include "shill/cellular/modem_gobi_proxy_interface.h"
 
 namespace shill {
 
@@ -29,4 +29,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_GOBI_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_GOBI_PROXY_H_
diff --git a/mock_modem_gsm_card_proxy.cc b/cellular/mock_modem_gsm_card_proxy.cc
similarity index 95%
rename from mock_modem_gsm_card_proxy.cc
rename to cellular/mock_modem_gsm_card_proxy.cc
index 8aac6d2..b044628 100644
--- a/mock_modem_gsm_card_proxy.cc
+++ b/cellular/mock_modem_gsm_card_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_gsm_card_proxy.h"
+#include "shill/cellular/mock_modem_gsm_card_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_gsm_card_proxy.h b/cellular/mock_modem_gsm_card_proxy.h
similarity index 89%
rename from mock_modem_gsm_card_proxy.h
rename to cellular/mock_modem_gsm_card_proxy.h
index 586af5f..6ea2b9f 100644
--- a/mock_modem_gsm_card_proxy.h
+++ b/cellular/mock_modem_gsm_card_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_GSM_CARD_PROXY_H_
-#define SHILL_MOCK_MODEM_GSM_CARD_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_GSM_CARD_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_GSM_CARD_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_gsm_card_proxy_interface.h"
+#include "shill/cellular/modem_gsm_card_proxy_interface.h"
 
 namespace shill {
 
@@ -53,4 +53,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_GSM_CARD_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_GSM_CARD_PROXY_H_
diff --git a/mock_modem_gsm_network_proxy.cc b/cellular/mock_modem_gsm_network_proxy.cc
similarity index 92%
rename from mock_modem_gsm_network_proxy.cc
rename to cellular/mock_modem_gsm_network_proxy.cc
index bd5f4ab..8a1889a 100644
--- a/mock_modem_gsm_network_proxy.cc
+++ b/cellular/mock_modem_gsm_network_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_gsm_network_proxy.h"
+#include "shill/cellular/mock_modem_gsm_network_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_gsm_network_proxy.h b/cellular/mock_modem_gsm_network_proxy.h
similarity index 86%
rename from mock_modem_gsm_network_proxy.h
rename to cellular/mock_modem_gsm_network_proxy.h
index 7ec5a9c..070f63d 100644
--- a/mock_modem_gsm_network_proxy.h
+++ b/cellular/mock_modem_gsm_network_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_GSM_NETWORK_PROXY_H_
-#define SHILL_MOCK_MODEM_GSM_NETWORK_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_GSM_NETWORK_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_GSM_NETWORK_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_gsm_network_proxy_interface.h"
+#include "shill/cellular/modem_gsm_network_proxy_interface.h"
 
 namespace shill {
 
@@ -43,4 +43,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_GSM_NETWORK_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_GSM_NETWORK_PROXY_H_
diff --git a/mock_modem_info.cc b/cellular/mock_modem_info.cc
similarity index 97%
rename from mock_modem_info.cc
rename to cellular/mock_modem_info.cc
index 9fa8402..262dd0e 100644
--- a/mock_modem_info.cc
+++ b/cellular/mock_modem_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_info.h"
+#include "shill/cellular/mock_modem_info.h"
 
 namespace shill {
 
diff --git a/mock_modem_info.h b/cellular/mock_modem_info.h
similarity index 92%
rename from mock_modem_info.h
rename to cellular/mock_modem_info.h
index 1b1f45b..093ed76 100644
--- a/mock_modem_info.h
+++ b/cellular/mock_modem_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_INFO_H_
-#define SHILL_MOCK_MODEM_INFO_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_INFO_H_
+#define SHILL_CELLULAR_MOCK_MODEM_INFO_H_
 
 #include <memory>
 #include <string>
@@ -11,13 +11,13 @@
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
+#include "shill/cellular/modem_info.h"
 #include "shill/mock_control.h"
 #include "shill/mock_event_dispatcher.h"
 #include "shill/mock_glib.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_metrics.h"
 #include "shill/mock_pending_activation_store.h"
-#include "shill/modem_info.h"
 
 namespace shill {
 
@@ -79,4 +79,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_INFO_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_INFO_H_
diff --git a/mock_modem_manager_proxy.cc b/cellular/mock_modem_manager_proxy.cc
similarity index 85%
rename from mock_modem_manager_proxy.cc
rename to cellular/mock_modem_manager_proxy.cc
index 5d9480d..459fc86 100644
--- a/mock_modem_manager_proxy.cc
+++ b/cellular/mock_modem_manager_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_manager_proxy.h"
+#include "shill/cellular/mock_modem_manager_proxy.h"
 
 namespace shill {
 
diff --git a/mock_modem_manager_proxy.h b/cellular/mock_modem_manager_proxy.h
similarity index 71%
rename from mock_modem_manager_proxy.h
rename to cellular/mock_modem_manager_proxy.h
index 8a9f5a3..aca92db 100644
--- a/mock_modem_manager_proxy.h
+++ b/cellular/mock_modem_manager_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_MANAGER_PROXY_H_
-#define SHILL_MOCK_MODEM_MANAGER_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_MANAGER_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_MANAGER_PROXY_H_
 
 #include <vector>
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_manager_proxy_interface.h"
+#include "shill/cellular/modem_manager_proxy_interface.h"
 
 namespace shill {
 
@@ -27,4 +27,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_MANAGER_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_MANAGER_PROXY_H_
diff --git a/mock_modem_proxy.cc b/cellular/mock_modem_proxy.cc
similarity index 93%
rename from mock_modem_proxy.cc
rename to cellular/mock_modem_proxy.cc
index 9045c41..47ae5f1 100644
--- a/mock_modem_proxy.cc
+++ b/cellular/mock_modem_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_proxy.h"
+#include "shill/cellular/mock_modem_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_proxy.h b/cellular/mock_modem_proxy.h
similarity index 83%
rename from mock_modem_proxy.h
rename to cellular/mock_modem_proxy.h
index 9abada0..ae1bade 100644
--- a/mock_modem_proxy.h
+++ b/cellular/mock_modem_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_PROXY_H_
-#define SHILL_MOCK_MODEM_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_PROXY_H_
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_proxy_interface.h"
+#include "shill/cellular/modem_proxy_interface.h"
 
 namespace shill {
 
@@ -33,4 +33,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_PROXY_H_
diff --git a/mock_modem_simple_proxy.cc b/cellular/mock_modem_simple_proxy.cc
similarity index 91%
rename from mock_modem_simple_proxy.cc
rename to cellular/mock_modem_simple_proxy.cc
index e3b0404..9e9dc94 100644
--- a/mock_modem_simple_proxy.cc
+++ b/cellular/mock_modem_simple_proxy.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_modem_simple_proxy.h"
+#include "shill/cellular/mock_modem_simple_proxy.h"
 
 #include "shill/testing.h"
 
diff --git a/mock_modem_simple_proxy.h b/cellular/mock_modem_simple_proxy.h
similarity index 79%
rename from mock_modem_simple_proxy.h
rename to cellular/mock_modem_simple_proxy.h
index 9a8958f..df7b951 100644
--- a/mock_modem_simple_proxy.h
+++ b/cellular/mock_modem_simple_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_MODEM_SIMPLE_PROXY_H_
-#define SHILL_MOCK_MODEM_SIMPLE_PROXY_H_
+#ifndef SHILL_CELLULAR_MOCK_MODEM_SIMPLE_PROXY_H_
+#define SHILL_CELLULAR_MOCK_MODEM_SIMPLE_PROXY_H_
 
 #include <base/macros.h>
 #include <gmock/gmock.h>
 
-#include "shill/modem_simple_proxy_interface.h"
+#include "shill/cellular/modem_simple_proxy_interface.h"
 
 namespace shill {
 
@@ -30,4 +30,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_MODEM_SIMPLE_PROXY_H_
+#endif  // SHILL_CELLULAR_MOCK_MODEM_SIMPLE_PROXY_H_
diff --git a/mock_out_of_credits_detector.cc b/cellular/mock_out_of_credits_detector.cc
similarity index 89%
rename from mock_out_of_credits_detector.cc
rename to cellular/mock_out_of_credits_detector.cc
index a83aa0c..76e9ccf 100644
--- a/mock_out_of_credits_detector.cc
+++ b/cellular/mock_out_of_credits_detector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/mock_out_of_credits_detector.h"
+#include "shill/cellular/mock_out_of_credits_detector.h"
 
 #include <gmock/gmock.h>
 
diff --git a/mock_out_of_credits_detector.h b/cellular/mock_out_of_credits_detector.h
similarity index 81%
rename from mock_out_of_credits_detector.h
rename to cellular/mock_out_of_credits_detector.h
index 29106bc..7fed4e5 100644
--- a/mock_out_of_credits_detector.h
+++ b/cellular/mock_out_of_credits_detector.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MOCK_OUT_OF_CREDITS_DETECTOR_H_
-#define SHILL_MOCK_OUT_OF_CREDITS_DETECTOR_H_
+#ifndef SHILL_CELLULAR_MOCK_OUT_OF_CREDITS_DETECTOR_H_
+#define SHILL_CELLULAR_MOCK_OUT_OF_CREDITS_DETECTOR_H_
 
 #include <gmock/gmock.h>
 
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/out_of_credits_detector.h"
 
 namespace shill {
 
@@ -34,4 +34,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MOCK_OUT_OF_CREDITS_DETECTOR_H_
+#endif  // SHILL_CELLULAR_MOCK_OUT_OF_CREDITS_DETECTOR_H_
diff --git a/modem.cc b/cellular/modem.cc
similarity index 98%
rename from modem.cc
rename to cellular/modem.cc
index 0993419..3076623 100644
--- a/modem.cc
+++ b/cellular/modem.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 #include <base/bind.h>
 #include <base/strings/stringprintf.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 #include "shill/logging.h"
 #include "shill/manager.h"
 #include "shill/net/rtnl_handler.h"
diff --git a/modem.h b/cellular/modem.h
similarity index 95%
rename from modem.h
rename to cellular/modem.h
index 7ea3865..b01ce77 100644
--- a/modem.h
+++ b/cellular/modem.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_H_
-#define SHILL_MODEM_H_
+#ifndef SHILL_CELLULAR_MODEM_H_
+#define SHILL_CELLULAR_MODEM_H_
 
 #include <memory>
 #include <string>
@@ -13,10 +13,10 @@
 #include <base/files/file_util.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/cellular.h"
-#include "shill/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/modem_info.h"
 #include "shill/dbus_properties_proxy_interface.h"
-#include "shill/modem_info.h"
 #include "shill/refptr_types.h"
 
 namespace shill {
@@ -177,4 +177,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_H_
+#endif  // SHILL_CELLULAR_MODEM_H_
diff --git a/modem_1.cc b/cellular/modem_1.cc
similarity index 96%
rename from modem_1.cc
rename to cellular/modem_1.cc
index 85c633b..c62b56d 100644
--- a/modem_1.cc
+++ b/cellular/modem_1.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 #include <ModemManager/ModemManager.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 #include "shill/device_info.h"
 
 using std::string;
diff --git a/modem_1_unittest.cc b/cellular/modem_1_unittest.cc
similarity index 95%
rename from modem_1_unittest.cc
rename to cellular/modem_1_unittest.cc
index 8c9d4ca..44ac752 100644
--- a/modem_1_unittest.cc
+++ b/cellular/modem_1_unittest.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 #include <base/files/scoped_temp_dir.h>
 #include <ModemManager/ModemManager.h>
 
-#include "shill/cellular_capability.h"
+#include "shill/cellular/cellular_capability.h"
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/dbus_property_matchers.h"
 #include "shill/event_dispatcher.h"
 #include "shill/manager.h"
-#include "shill/mock_cellular.h"
 #include "shill/mock_dbus_properties_proxy.h"
 #include "shill/mock_device_info.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_proxy_factory.h"
 #include "shill/net/mock_rtnl_handler.h"
 #include "shill/net/rtnl_handler.h"
diff --git a/modem_cdma_proxy.cc b/cellular/modem_cdma_proxy.cc
similarity index 97%
rename from modem_cdma_proxy.cc
rename to cellular/modem_cdma_proxy.cc
index 15e7bdd..3cfd275 100644
--- a/modem_cdma_proxy.cc
+++ b/cellular/modem_cdma_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_cdma_proxy.h"
+#include "shill/cellular/modem_cdma_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/logging.h"
 
diff --git a/modem_cdma_proxy.h b/cellular/modem_cdma_proxy.h
similarity index 94%
rename from modem_cdma_proxy.h
rename to cellular/modem_cdma_proxy.h
index 7b31290..68b75d8 100644
--- a/modem_cdma_proxy.h
+++ b/cellular/modem_cdma_proxy.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_CDMA_PROXY_H_
-#define SHILL_MODEM_CDMA_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_CDMA_PROXY_H_
+#define SHILL_CELLULAR_MODEM_CDMA_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.Modem.Cdma.h"
+#include "shill/cellular/modem_cdma_proxy_interface.h"
 #include "shill/dbus_properties.h"
-#include "shill/modem_cdma_proxy_interface.h"
 
 namespace shill {
 
@@ -94,4 +94,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_CDMA_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_CDMA_PROXY_H_
diff --git a/modem_cdma_proxy_interface.h b/cellular/modem_cdma_proxy_interface.h
similarity index 91%
rename from modem_cdma_proxy_interface.h
rename to cellular/modem_cdma_proxy_interface.h
index 51f44e1..481b412 100644
--- a/modem_cdma_proxy_interface.h
+++ b/cellular/modem_cdma_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_CDMA_PROXY_INTERFACE_H_
-#define SHILL_MODEM_CDMA_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_CDMA_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_CDMA_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_CDMA_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_CDMA_PROXY_INTERFACE_H_
diff --git a/modem_classic.cc b/cellular/modem_classic.cc
similarity index 95%
rename from modem_classic.cc
rename to cellular/modem_classic.cc
index 8f085cc..81ffb88 100644
--- a/modem_classic.cc
+++ b/cellular/modem_classic.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 #include <mm/mm-modem.h>
 
-#include "shill/cellular.h"
+#include "shill/cellular/cellular.h"
 
 using std::string;
 using std::vector;
diff --git a/modem_gobi_proxy.cc b/cellular/modem_gobi_proxy.cc
similarity index 94%
rename from modem_gobi_proxy.cc
rename to cellular/modem_gobi_proxy.cc
index d77f31c..eeba73c 100644
--- a/modem_gobi_proxy.cc
+++ b/cellular/modem_gobi_proxy.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_gobi_proxy.h"
+#include "shill/cellular/modem_gobi_proxy.h"
 
 #include <memory>
 
 #include <base/bind.h>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/modem_gobi_proxy.h b/cellular/modem_gobi_proxy.h
similarity index 88%
rename from modem_gobi_proxy.h
rename to cellular/modem_gobi_proxy.h
index b7730f3..41157ae 100644
--- a/modem_gobi_proxy.h
+++ b/cellular/modem_gobi_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GOBI_PROXY_H_
-#define SHILL_MODEM_GOBI_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_GOBI_PROXY_H_
+#define SHILL_CELLULAR_MODEM_GOBI_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 
+#include "shill/cellular/modem_gobi_proxy_interface.h"
 #include "shill/dbus_proxies/modem-gobi.h"
-#include "shill/modem_gobi_proxy_interface.h"
 
 namespace shill {
 
@@ -56,4 +56,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GOBI_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_GOBI_PROXY_H_
diff --git a/modem_gobi_proxy_interface.h b/cellular/modem_gobi_proxy_interface.h
similarity index 81%
rename from modem_gobi_proxy_interface.h
rename to cellular/modem_gobi_proxy_interface.h
index 3a24405..dfc8cd8 100644
--- a/modem_gobi_proxy_interface.h
+++ b/cellular/modem_gobi_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GOBI_PROXY_INTERFACE_H_
-#define SHILL_MODEM_GOBI_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_GOBI_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_GOBI_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -27,4 +27,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GOBI_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_GOBI_PROXY_INTERFACE_H_
diff --git a/modem_gsm_card_proxy.cc b/cellular/modem_gsm_card_proxy.cc
similarity index 98%
rename from modem_gsm_card_proxy.cc
rename to cellular/modem_gsm_card_proxy.cc
index 49f0807..a60fe9c 100644
--- a/modem_gsm_card_proxy.cc
+++ b/cellular/modem_gsm_card_proxy.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_gsm_card_proxy.h"
+#include "shill/cellular/modem_gsm_card_proxy.h"
 
 #include <memory>
 
 #include <base/bind.h>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/modem_gsm_card_proxy.h b/cellular/modem_gsm_card_proxy.h
similarity index 94%
rename from modem_gsm_card_proxy.h
rename to cellular/modem_gsm_card_proxy.h
index 808b1c8..c26561b 100644
--- a/modem_gsm_card_proxy.h
+++ b/cellular/modem_gsm_card_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GSM_CARD_PROXY_H_
-#define SHILL_MODEM_GSM_CARD_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_H_
+#define SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.Modem.Gsm.Card.h"
-#include "shill/modem_gsm_card_proxy_interface.h"
+#include "shill/cellular/modem_gsm_card_proxy_interface.h"
 
 namespace shill {
 
@@ -97,4 +97,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GSM_CARD_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_H_
diff --git a/modem_gsm_card_proxy_interface.h b/cellular/modem_gsm_card_proxy_interface.h
similarity index 91%
rename from modem_gsm_card_proxy_interface.h
rename to cellular/modem_gsm_card_proxy_interface.h
index 37a076f..df0b2e0 100644
--- a/modem_gsm_card_proxy_interface.h
+++ b/cellular/modem_gsm_card_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GSM_CARD_PROXY_INTERFACE_H_
-#define SHILL_MODEM_GSM_CARD_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GSM_CARD_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_GSM_CARD_PROXY_INTERFACE_H_
diff --git a/modem_gsm_network_proxy.cc b/cellular/modem_gsm_network_proxy.cc
similarity index 97%
rename from modem_gsm_network_proxy.cc
rename to cellular/modem_gsm_network_proxy.cc
index 278df00..4edfe00 100644
--- a/modem_gsm_network_proxy.cc
+++ b/cellular/modem_gsm_network_proxy.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_gsm_network_proxy.h"
+#include "shill/cellular/modem_gsm_network_proxy.h"
 
 #include <memory>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/modem_gsm_network_proxy.h b/cellular/modem_gsm_network_proxy.h
similarity index 94%
rename from modem_gsm_network_proxy.h
rename to cellular/modem_gsm_network_proxy.h
index a4dd3e0..15fc385 100644
--- a/modem_gsm_network_proxy.h
+++ b/cellular/modem_gsm_network_proxy.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GSM_NETWORK_PROXY_H_
-#define SHILL_MODEM_GSM_NETWORK_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_H_
+#define SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_H_
 
 #include <string>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.Modem.Gsm.Network.h"
-#include "shill/modem_gsm_network_proxy_interface.h"
+#include "shill/cellular/modem_gsm_network_proxy_interface.h"
 
 namespace shill {
 
@@ -93,4 +93,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GSM_NETWORK_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_H_
diff --git a/modem_gsm_network_proxy_interface.h b/cellular/modem_gsm_network_proxy_interface.h
similarity index 92%
rename from modem_gsm_network_proxy_interface.h
rename to cellular/modem_gsm_network_proxy_interface.h
index 28caf93..740e6d4 100644
--- a/modem_gsm_network_proxy_interface.h
+++ b/cellular/modem_gsm_network_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
-#define SHILL_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
 
 #include <map>
 #include <string>
@@ -70,4 +70,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_GSM_NETWORK_PROXY_INTERFACE_H_
diff --git a/modem_info.cc b/cellular/modem_info.cc
similarity index 95%
rename from modem_info.cc
rename to cellular/modem_info.cc
index 8c36f0e..04d1455 100644
--- a/modem_info.cc
+++ b/cellular/modem_info.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_info.h"
+#include "shill/cellular/modem_info.h"
 
 #include <base/files/file_path.h>
 #include <chromeos/dbus/service_constants.h>
 
+#include "shill/cellular/modem_manager.h"
 #include "shill/logging.h"
 #include "shill/manager.h"
-#include "shill/modem_manager.h"
 #include "shill/pending_activation_store.h"
 
 using base::FilePath;
diff --git a/modem_info.h b/cellular/modem_info.h
similarity index 94%
rename from modem_info.h
rename to cellular/modem_info.h
index 03bf6ec..7b886ab 100644
--- a/modem_info.h
+++ b/cellular/modem_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_INFO_H_
-#define SHILL_MODEM_INFO_H_
+#ifndef SHILL_CELLULAR_MODEM_INFO_H_
+#define SHILL_CELLULAR_MODEM_INFO_H_
 
 #include <memory>
 #include <string>
@@ -90,4 +90,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_INFO_H_
+#endif  // SHILL_CELLULAR_MODEM_INFO_H_
diff --git a/modem_info_unittest.cc b/cellular/modem_info_unittest.cc
similarity index 96%
rename from modem_info_unittest.cc
rename to cellular/modem_info_unittest.cc
index 9530c21..8224919 100644
--- a/modem_info_unittest.cc
+++ b/cellular/modem_info_unittest.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_info.h"
+#include "shill/cellular/modem_info.h"
 
 #include <base/stl_util.h>
 #include <gtest/gtest.h>
 
+#include "shill/cellular/modem_manager.h"
 #include "shill/manager.h"
 #include "shill/mock_control.h"
 #include "shill/mock_dbus_service_proxy.h"
 #include "shill/mock_glib.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_metrics.h"
-#include "shill/modem_manager.h"
 
 using testing::_;
 using testing::Return;
diff --git a/modem_manager.cc b/cellular/modem_manager.cc
similarity index 96%
rename from modem_manager.cc
rename to cellular/modem_manager.cc
index 0759b5c..1d5ca30 100644
--- a/modem_manager.cc
+++ b/cellular/modem_manager.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_manager.h"
+#include "shill/cellular/modem_manager.h"
 
 #include <base/stl_util.h>
 #include <mm/mm-modem.h>
 
+#include "shill/cellular/modem.h"
+#include "shill/cellular/modem_manager_proxy.h"
 #include "shill/dbus_manager.h"
 #include "shill/error.h"
 #include "shill/logging.h"
 #include "shill/manager.h"
-#include "shill/modem.h"
-#include "shill/modem_manager_proxy.h"
 #include "shill/proxy_factory.h"
 
 using std::string;
diff --git a/modem_manager.h b/cellular/modem_manager.h
similarity index 95%
rename from modem_manager.h
rename to cellular/modem_manager.h
index 566b753..cd43df5 100644
--- a/modem_manager.h
+++ b/cellular/modem_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_MANAGER_H_
-#define SHILL_MODEM_MANAGER_H_
+#ifndef SHILL_CELLULAR_MODEM_MANAGER_H_
+#define SHILL_CELLULAR_MODEM_MANAGER_H_
 
 #include <map>
 #include <memory>
@@ -14,10 +14,10 @@
 #include <base/memory/weak_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
-#include "shill/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/dbus_objectmanager_proxy_interface.h"
+#include "shill/cellular/modem_info.h"
 #include "shill/dbus_properties_proxy_interface.h"
 #include "shill/glib.h"
-#include "shill/modem_info.h"
 
 namespace shill {
 
@@ -176,4 +176,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_MANAGER_H_
+#endif  // SHILL_CELLULAR_MODEM_MANAGER_H_
diff --git a/modem_manager_1.cc b/cellular/modem_manager_1.cc
similarity index 97%
rename from modem_manager_1.cc
rename to cellular/modem_manager_1.cc
index 24432e8..9caab76 100644
--- a/modem_manager_1.cc
+++ b/cellular/modem_manager_1.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_manager.h"
+#include "shill/cellular/modem_manager.h"
 
 #include <base/bind.h>
 #include <base/stl_util.h>
 #include <ModemManager/ModemManager.h>
 
+#include "shill/cellular/modem.h"
 #include "shill/error.h"
 #include "shill/logging.h"
-#include "shill/modem.h"
 #include "shill/proxy_factory.h"
 
 using base::Bind;
diff --git a/modem_manager_proxy.cc b/cellular/modem_manager_proxy.cc
similarity index 94%
rename from modem_manager_proxy.cc
rename to cellular/modem_manager_proxy.cc
index e593e7f..cc017a6 100644
--- a/modem_manager_proxy.cc
+++ b/cellular/modem_manager_proxy.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_manager_proxy.h"
+#include "shill/cellular/modem_manager_proxy.h"
 
+#include "shill/cellular/modem_manager.h"
 #include "shill/logging.h"
-#include "shill/modem_manager.h"
 
 using std::string;
 using std::vector;
diff --git a/modem_manager_proxy.h b/cellular/modem_manager_proxy.h
similarity index 88%
rename from modem_manager_proxy.h
rename to cellular/modem_manager_proxy.h
index 419b7a7..a8b850c 100644
--- a/modem_manager_proxy.h
+++ b/cellular/modem_manager_proxy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_MANAGER_PROXY_H_
-#define SHILL_MODEM_MANAGER_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_MANAGER_PROXY_H_
+#define SHILL_CELLULAR_MODEM_MANAGER_PROXY_H_
 
 #include <string>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <base/macros.h>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.h"
-#include "shill/modem_manager_proxy_interface.h"
+#include "shill/cellular/modem_manager_proxy_interface.h"
 
 namespace shill {
 
@@ -61,4 +61,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_MANAGER_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_MANAGER_PROXY_H_
diff --git a/modem_manager_proxy_interface.h b/cellular/modem_manager_proxy_interface.h
similarity index 75%
rename from modem_manager_proxy_interface.h
rename to cellular/modem_manager_proxy_interface.h
index cadb704..a5eba33 100644
--- a/modem_manager_proxy_interface.h
+++ b/cellular/modem_manager_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_MANAGER_PROXY_INTERFACE_H_
-#define SHILL_MODEM_MANAGER_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_MANAGER_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_MANAGER_PROXY_INTERFACE_H_
 
 #include <vector>
 
@@ -22,4 +22,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_MANAGER_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_MANAGER_PROXY_INTERFACE_H_
diff --git a/modem_manager_unittest.cc b/cellular/modem_manager_unittest.cc
similarity index 97%
rename from modem_manager_unittest.cc
rename to cellular/modem_manager_unittest.cc
index b578a83..ececf60 100644
--- a/modem_manager_unittest.cc
+++ b/cellular/modem_manager_unittest.cc
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_manager.h"
+#include "shill/cellular/modem_manager.h"
 
 #include <base/stl_util.h>
 #include <ModemManager/ModemManager.h>
 
+#include "shill/cellular/mock_dbus_objectmanager_proxy.h"
+#include "shill/cellular/mock_modem.h"
+#include "shill/cellular/mock_modem_info.h"
+#include "shill/cellular/mock_modem_manager_proxy.h"
 #include "shill/manager.h"
 #include "shill/mock_control.h"
-#include "shill/mock_dbus_objectmanager_proxy.h"
 #include "shill/mock_dbus_service_proxy.h"
 #include "shill/mock_manager.h"
-#include "shill/mock_modem.h"
-#include "shill/mock_modem_info.h"
-#include "shill/mock_modem_manager_proxy.h"
 #include "shill/mock_proxy_factory.h"
-#include "shill/modem.h"
 #include "shill/testing.h"
 
 using std::string;
diff --git a/modem_proxy.cc b/cellular/modem_proxy.cc
similarity index 97%
rename from modem_proxy.cc
rename to cellular/modem_proxy.cc
index be79ccb..f2b5695 100644
--- a/modem_proxy.cc
+++ b/cellular/modem_proxy.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_proxy.h"
+#include "shill/cellular/modem_proxy.h"
 
 #include <memory>
 
 #include <base/bind.h>
 #include <base/strings/stringprintf.h>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/modem_proxy.h b/cellular/modem_proxy.h
similarity index 92%
rename from modem_proxy.h
rename to cellular/modem_proxy.h
index 158df02..909b7d9 100644
--- a/modem_proxy.h
+++ b/cellular/modem_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_PROXY_H_
-#define SHILL_MODEM_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_PROXY_H_
+#define SHILL_CELLULAR_MODEM_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.Modem.h"
-#include "shill/modem_proxy_interface.h"
+#include "shill/cellular/modem_proxy_interface.h"
 
 namespace shill {
 
@@ -70,4 +70,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_PROXY_H_
diff --git a/modem_proxy_interface.h b/cellular/modem_proxy_interface.h
similarity index 89%
rename from modem_proxy_interface.h
rename to cellular/modem_proxy_interface.h
index f709159..77891d5 100644
--- a/modem_proxy_interface.h
+++ b/cellular/modem_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_PROXY_INTERFACE_H_
-#define SHILL_MODEM_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_PROXY_INTERFACE_H_
 
 #include <string>
 
@@ -44,4 +44,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_PROXY_INTERFACE_H_
diff --git a/modem_simple_proxy.cc b/cellular/modem_simple_proxy.cc
similarity index 96%
rename from modem_simple_proxy.cc
rename to cellular/modem_simple_proxy.cc
index 8d597a2..01bf849 100644
--- a/modem_simple_proxy.cc
+++ b/cellular/modem_simple_proxy.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem_simple_proxy.h"
+#include "shill/cellular/modem_simple_proxy.h"
 
 #include <memory>
 
 #include <base/bind.h>
 
-#include "shill/cellular_error.h"
+#include "shill/cellular/cellular_error.h"
 #include "shill/dbus_async_call_helper.h"
 #include "shill/error.h"
 #include "shill/logging.h"
diff --git a/modem_simple_proxy.h b/cellular/modem_simple_proxy.h
similarity index 90%
rename from modem_simple_proxy.h
rename to cellular/modem_simple_proxy.h
index 438f767..6056a24 100644
--- a/modem_simple_proxy.h
+++ b/cellular/modem_simple_proxy.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_SIMPLE_PROXY_H_
-#define SHILL_MODEM_SIMPLE_PROXY_H_
+#ifndef SHILL_CELLULAR_MODEM_SIMPLE_PROXY_H_
+#define SHILL_CELLULAR_MODEM_SIMPLE_PROXY_H_
 
 #include <string>
 
 #include <base/macros.h>
 
 #include "dbus_proxies/org.freedesktop.ModemManager.Modem.Simple.h"
-#include "shill/modem_simple_proxy_interface.h"
+#include "shill/cellular/modem_simple_proxy_interface.h"
 
 namespace shill {
 
@@ -61,4 +61,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_SIMPLE_PROXY_H_
+#endif  // SHILL_CELLULAR_MODEM_SIMPLE_PROXY_H_
diff --git a/modem_simple_proxy_interface.h b/cellular/modem_simple_proxy_interface.h
similarity index 83%
rename from modem_simple_proxy_interface.h
rename to cellular/modem_simple_proxy_interface.h
index bd6932a..6fd35e9 100644
--- a/modem_simple_proxy_interface.h
+++ b/cellular/modem_simple_proxy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_MODEM_SIMPLE_PROXY_INTERFACE_H_
-#define SHILL_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#ifndef SHILL_CELLULAR_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#define SHILL_CELLULAR_MODEM_SIMPLE_PROXY_INTERFACE_H_
 
 #include "shill/callbacks.h"
 #include "shill/dbus_properties.h"
@@ -29,4 +29,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_MODEM_SIMPLE_PROXY_INTERFACE_H_
+#endif  // SHILL_CELLULAR_MODEM_SIMPLE_PROXY_INTERFACE_H_
diff --git a/modem_unittest.cc b/cellular/modem_unittest.cc
similarity index 96%
rename from modem_unittest.cc
rename to cellular/modem_unittest.cc
index 4cf735e..e0434fa 100644
--- a/modem_unittest.cc
+++ b/cellular/modem_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/modem.h"
+#include "shill/cellular/modem.h"
 
 #include <vector>
 
@@ -13,15 +13,15 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-#include "shill/cellular.h"
-#include "shill/cellular_capability_gsm.h"
+#include "shill/cellular/cellular.h"
+#include "shill/cellular/cellular_capability_gsm.h"
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_modem.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/dbus_property_matchers.h"
 #include "shill/event_dispatcher.h"
 #include "shill/manager.h"
-#include "shill/mock_cellular.h"
 #include "shill/mock_device_info.h"
-#include "shill/mock_modem.h"
-#include "shill/mock_modem_info.h"
 #include "shill/net/mock_rtnl_handler.h"
 #include "shill/net/rtnl_handler.h"
 #include "shill/proxy_factory.h"
diff --git a/no_out_of_credits_detector.h b/cellular/no_out_of_credits_detector.h
similarity index 85%
rename from no_out_of_credits_detector.h
rename to cellular/no_out_of_credits_detector.h
index 8393d42..8958796 100644
--- a/no_out_of_credits_detector.h
+++ b/cellular/no_out_of_credits_detector.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_NO_OUT_OF_CREDITS_DETECTOR_H_
-#define SHILL_NO_OUT_OF_CREDITS_DETECTOR_H_
+#ifndef SHILL_CELLULAR_NO_OUT_OF_CREDITS_DETECTOR_H_
+#define SHILL_CELLULAR_NO_OUT_OF_CREDITS_DETECTOR_H_
 
 #include <base/macros.h>
 
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/out_of_credits_detector.h"
 
 namespace shill {
 
@@ -38,4 +38,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_NO_OUT_OF_CREDITS_DETECTOR_H_
+#endif  // SHILL_CELLULAR_NO_OUT_OF_CREDITS_DETECTOR_H_
diff --git a/out_of_credits_detector.cc b/cellular/out_of_credits_detector.cc
similarity index 89%
rename from out_of_credits_detector.cc
rename to cellular/out_of_credits_detector.cc
index f7361ee..fb6bac5 100644
--- a/out_of_credits_detector.cc
+++ b/cellular/out_of_credits_detector.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/out_of_credits_detector.h"
 
 #include <string>
 
-#include "shill/active_passive_out_of_credits_detector.h"
-#include "shill/cellular_service.h"
+#include "shill/cellular/active_passive_out_of_credits_detector.h"
+#include "shill/cellular/cellular_service.h"
+#include "shill/cellular/no_out_of_credits_detector.h"
+#include "shill/cellular/subscription_state_out_of_credits_detector.h"
 #include "shill/logging.h"
-#include "shill/no_out_of_credits_detector.h"
-#include "shill/subscription_state_out_of_credits_detector.h"
 
 namespace shill {
 
diff --git a/out_of_credits_detector.h b/cellular/out_of_credits_detector.h
similarity index 95%
rename from out_of_credits_detector.h
rename to cellular/out_of_credits_detector.h
index 79aa389..8238d9b 100644
--- a/out_of_credits_detector.h
+++ b/cellular/out_of_credits_detector.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_OUT_OF_CREDITS_DETECTOR_H_
-#define SHILL_OUT_OF_CREDITS_DETECTOR_H_
+#ifndef SHILL_CELLULAR_OUT_OF_CREDITS_DETECTOR_H_
+#define SHILL_CELLULAR_OUT_OF_CREDITS_DETECTOR_H_
 
 #include <base/macros.h>
 
@@ -90,4 +90,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_OUT_OF_CREDITS_DETECTOR_H_
+#endif  // SHILL_CELLULAR_OUT_OF_CREDITS_DETECTOR_H_
diff --git a/subscription_state_out_of_credits_detector.cc b/cellular/subscription_state_out_of_credits_detector.cc
similarity index 91%
rename from subscription_state_out_of_credits_detector.cc
rename to cellular/subscription_state_out_of_credits_detector.cc
index fa7c073..5cea687 100644
--- a/subscription_state_out_of_credits_detector.cc
+++ b/cellular/subscription_state_out_of_credits_detector.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/subscription_state_out_of_credits_detector.h"
+#include "shill/cellular/subscription_state_out_of_credits_detector.h"
 
 #include <string>
 
 #include "ModemManager/ModemManager.h"
 
-#include "shill/cellular_service.h"
+#include "shill/cellular/cellular_service.h"
 #include "shill/logging.h"
 
 using std::string;
diff --git a/subscription_state_out_of_credits_detector.h b/cellular/subscription_state_out_of_credits_detector.h
similarity index 80%
rename from subscription_state_out_of_credits_detector.h
rename to cellular/subscription_state_out_of_credits_detector.h
index 92f7449..aed85b9 100644
--- a/subscription_state_out_of_credits_detector.h
+++ b/cellular/subscription_state_out_of_credits_detector.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
-#define SHILL_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
+#ifndef SHILL_CELLULAR_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
+#define SHILL_CELLULAR_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
 
-#include "shill/out_of_credits_detector.h"
+#include "shill/cellular/out_of_credits_detector.h"
 
 namespace shill {
 
@@ -33,4 +33,4 @@
 
 }  // namespace shill
 
-#endif  // SHILL_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
+#endif  // SHILL_CELLULAR_SUBSCRIPTION_STATE_OUT_OF_CREDITS_DETECTOR_H_
diff --git a/subscription_state_out_of_credits_detector_unittest.cc b/cellular/subscription_state_out_of_credits_detector_unittest.cc
similarity index 93%
rename from subscription_state_out_of_credits_detector_unittest.cc
rename to cellular/subscription_state_out_of_credits_detector_unittest.cc
index a119b5e..6720316 100644
--- a/subscription_state_out_of_credits_detector_unittest.cc
+++ b/cellular/subscription_state_out_of_credits_detector_unittest.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "shill/subscription_state_out_of_credits_detector.h"
+#include "shill/cellular/subscription_state_out_of_credits_detector.h"
 
 #include <memory>
 
 #include <gtest/gtest.h>
 #include "ModemManager/ModemManager.h"
 
+#include "shill/cellular/mock_cellular.h"
+#include "shill/cellular/mock_cellular_service.h"
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/event_dispatcher.h"
-#include "shill/mock_cellular.h"
-#include "shill/mock_cellular_service.h"
 #include "shill/mock_connection.h"
 #include "shill/mock_connection_health_checker.h"
 #include "shill/mock_device_info.h"
 #include "shill/mock_manager.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_proxy_factory.h"
 #include "shill/mock_traffic_monitor.h"
 
diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index fada965..85c79e9 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -25,6 +25,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include "shill/cellular/mock_modem_info.h"
 #include "shill/logging.h"
 #include "shill/manager.h"
 #include "shill/mock_control.h"
@@ -33,7 +34,6 @@
 #include "shill/mock_log.h"
 #include "shill/mock_manager.h"
 #include "shill/mock_metrics.h"
-#include "shill/mock_modem_info.h"
 #include "shill/mock_routing_table.h"
 #include "shill/mock_vpn_provider.h"
 #include "shill/net/ip_address.h"
diff --git a/manager.h b/manager.h
index d0ddd65..49a506f 100644
--- a/manager.h
+++ b/manager.h
@@ -18,6 +18,7 @@
 #include <chromeos/dbus/service_constants.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
+#include "shill/cellular/modem_info.h"
 #include "shill/crypto_util_proxy.h"
 #include "shill/device.h"
 #include "shill/device_info.h"
@@ -25,7 +26,6 @@
 #include "shill/geolocation_info.h"
 #include "shill/hook_table.h"
 #include "shill/metrics.h"
-#include "shill/modem_info.h"
 #include "shill/power_manager.h"
 #include "shill/profile.h"
 #include "shill/property_store.h"
diff --git a/proxy_factory.cc b/proxy_factory.cc
index 85f4177..2174aec 100644
--- a/proxy_factory.cc
+++ b/proxy_factory.cc
@@ -15,22 +15,22 @@
 #include "shill/supplicant_process_proxy.h"
 
 #if !defined(DISABLE_CELLULAR)
-#include "shill/dbus_objectmanager_proxy.h"  // NOLINT(build/include_alpha)
-#include "shill/mm1_bearer_proxy.h"
-#include "shill/mm1_modem_location_proxy.h"
-#include "shill/mm1_modem_modem3gpp_proxy.h"
-#include "shill/mm1_modem_modemcdma_proxy.h"
-#include "shill/mm1_modem_proxy.h"
-#include "shill/mm1_modem_simple_proxy.h"
-#include "shill/mm1_modem_time_proxy.h"
-#include "shill/mm1_sim_proxy.h"
-#include "shill/modem_cdma_proxy.h"
-#include "shill/modem_gobi_proxy.h"
-#include "shill/modem_gsm_card_proxy.h"
-#include "shill/modem_gsm_network_proxy.h"
-#include "shill/modem_manager_proxy.h"
-#include "shill/modem_proxy.h"
-#include "shill/modem_simple_proxy.h"
+#include "shill/cellular/dbus_objectmanager_proxy.h"
+#include "shill/cellular/mm1_bearer_proxy.h"
+#include "shill/cellular/mm1_modem_location_proxy.h"
+#include "shill/cellular/mm1_modem_modem3gpp_proxy.h"
+#include "shill/cellular/mm1_modem_modemcdma_proxy.h"
+#include "shill/cellular/mm1_modem_proxy.h"
+#include "shill/cellular/mm1_modem_simple_proxy.h"
+#include "shill/cellular/mm1_modem_time_proxy.h"
+#include "shill/cellular/mm1_sim_proxy.h"
+#include "shill/cellular/modem_cdma_proxy.h"
+#include "shill/cellular/modem_gobi_proxy.h"
+#include "shill/cellular/modem_gsm_card_proxy.h"
+#include "shill/cellular/modem_gsm_network_proxy.h"
+#include "shill/cellular/modem_manager_proxy.h"
+#include "shill/cellular/modem_proxy.h"
+#include "shill/cellular/modem_simple_proxy.h"
 #endif
 
 #if !defined(DISABLE_WIMAX)
diff --git a/shill.gyp b/shill.gyp
index 21f33a6..95a503e 100644
--- a/shill.gyp
+++ b/shill.gyp
@@ -245,45 +245,45 @@
             ],
           },
           'sources': [
-            'active_passive_out_of_credits_detector.cc',
-            'cellular.cc',
-            'cellular_bearer.cc',
-            'cellular_capability.cc',
-            'cellular_capability_cdma.cc',
-            'cellular_capability_classic.cc',
-            'cellular_capability_gsm.cc',
-            'cellular_capability_universal.cc',
-            'cellular_capability_universal_cdma.cc',
-            'cellular_error.cc',
-            'cellular_error_mm1.cc',
-            'cellular_service.cc',
-            'dbus_objectmanager_proxy.cc',
-            'mm1_bearer_proxy.cc',
-            'mm1_modem_location_proxy.cc',
-            'mm1_modem_modem3gpp_proxy.cc',
-            'mm1_modem_modemcdma_proxy.cc',
-            'mm1_modem_proxy.cc',
-            'mm1_modem_simple_proxy.cc',
-            'mm1_modem_time_proxy.cc',
-            'mm1_sim_proxy.cc',
-            'mobile_operator_info.cc',
-            'mobile_operator_info_impl.cc',
-            'modem.cc',
-            'modem_1.cc',
-            'modem_cdma_proxy.cc',
-            'modem_classic.cc',
-            'modem_gobi_proxy.cc',
-            'modem_gsm_card_proxy.cc',
-            'modem_gsm_network_proxy.cc',
-            'modem_info.cc',
-            'modem_manager.cc',
-            'modem_manager_1.cc',
-            'modem_manager_proxy.cc',
-            'modem_proxy.cc',
-            'modem_simple_proxy.cc',
-            'out_of_credits_detector.cc',
+            'cellular/active_passive_out_of_credits_detector.cc',
+            'cellular/cellular.cc',
+            'cellular/cellular_bearer.cc',
+            'cellular/cellular_capability.cc',
+            'cellular/cellular_capability_cdma.cc',
+            'cellular/cellular_capability_classic.cc',
+            'cellular/cellular_capability_gsm.cc',
+            'cellular/cellular_capability_universal.cc',
+            'cellular/cellular_capability_universal_cdma.cc',
+            'cellular/cellular_error.cc',
+            'cellular/cellular_error_mm1.cc',
+            'cellular/cellular_service.cc',
+            'cellular/dbus_objectmanager_proxy.cc',
+            'cellular/mm1_bearer_proxy.cc',
+            'cellular/mm1_modem_location_proxy.cc',
+            'cellular/mm1_modem_modem3gpp_proxy.cc',
+            'cellular/mm1_modem_modemcdma_proxy.cc',
+            'cellular/mm1_modem_proxy.cc',
+            'cellular/mm1_modem_simple_proxy.cc',
+            'cellular/mm1_modem_time_proxy.cc',
+            'cellular/mm1_sim_proxy.cc',
+            'cellular/mobile_operator_info.cc',
+            'cellular/mobile_operator_info_impl.cc',
+            'cellular/modem.cc',
+            'cellular/modem_1.cc',
+            'cellular/modem_cdma_proxy.cc',
+            'cellular/modem_classic.cc',
+            'cellular/modem_gobi_proxy.cc',
+            'cellular/modem_gsm_card_proxy.cc',
+            'cellular/modem_gsm_network_proxy.cc',
+            'cellular/modem_info.cc',
+            'cellular/modem_manager.cc',
+            'cellular/modem_manager_1.cc',
+            'cellular/modem_manager_proxy.cc',
+            'cellular/modem_proxy.cc',
+            'cellular/modem_simple_proxy.cc',
+            'cellular/out_of_credits_detector.cc',
+            'cellular/subscription_state_out_of_credits_detector.cc',
             'protobuf_lite_streams.cc',
-            'subscription_state_out_of_credits_detector.cc',
           ],
         }],
         ['USE_vpn == 1', {
@@ -604,7 +604,6 @@
             'mock_connectivity_trial.cc',
             'mock_control.cc',
             'mock_crypto_util_proxy.cc',
-            'mock_dbus_objectmanager_proxy.cc',
             'mock_dbus_properties_proxy.cc',
             'mock_dbus_service_proxy.cc',
             'mock_device.cc',
@@ -716,43 +715,44 @@
                 ],
               },
               'sources': [
-                'active_passive_out_of_credits_detector_unittest.cc',
-                'cellular_bearer_unittest.cc',
-                'cellular_capability_cdma_unittest.cc',
-                'cellular_capability_classic_unittest.cc',
-                'cellular_capability_gsm_unittest.cc',
-                'cellular_capability_universal_cdma_unittest.cc',
-                'cellular_capability_universal_unittest.cc',
-                'cellular_error_unittest.cc',
-                'cellular_service_unittest.cc',
-                'cellular_unittest.cc',
-                'mobile_operator_info_unittest.cc',
-                'mock_cellular.cc',
-                'mock_cellular_service.cc',
-                'mock_mm1_bearer_proxy.cc',
-                'mock_mm1_modem_location_proxy.cc',
-                'mock_mm1_modem_modem3gpp_proxy.cc',
-                'mock_mm1_modem_modemcdma_proxy.cc',
-                'mock_mm1_modem_proxy.cc',
-                'mock_mm1_modem_simple_proxy.cc',
-                'mock_mm1_modem_time_proxy.cc',
-                'mock_mm1_sim_proxy.cc',
-                'mock_mobile_operator_info.cc',
-                'mock_modem.cc',
-                'mock_modem_cdma_proxy.cc',
-                'mock_modem_gobi_proxy.cc',
-                'mock_modem_gsm_card_proxy.cc',
-                'mock_modem_gsm_network_proxy.cc',
-                'mock_modem_info.cc',
-                'mock_modem_manager_proxy.cc',
-                'mock_modem_proxy.cc',
-                'mock_modem_simple_proxy.cc',
-                'mock_out_of_credits_detector.cc',
-                'modem_1_unittest.cc',
-                'modem_info_unittest.cc',
-                'modem_manager_unittest.cc',
-                'modem_unittest.cc',
-                'subscription_state_out_of_credits_detector_unittest.cc',
+                'cellular/active_passive_out_of_credits_detector_unittest.cc',
+                'cellular/cellular_bearer_unittest.cc',
+                'cellular/cellular_capability_cdma_unittest.cc',
+                'cellular/cellular_capability_classic_unittest.cc',
+                'cellular/cellular_capability_gsm_unittest.cc',
+                'cellular/cellular_capability_universal_cdma_unittest.cc',
+                'cellular/cellular_capability_universal_unittest.cc',
+                'cellular/cellular_error_unittest.cc',
+                'cellular/cellular_service_unittest.cc',
+                'cellular/cellular_unittest.cc',
+                'cellular/mobile_operator_info_unittest.cc',
+                'cellular/mock_cellular.cc',
+                'cellular/mock_cellular_service.cc',
+                'cellular/mock_dbus_objectmanager_proxy.cc',
+                'cellular/mock_mm1_bearer_proxy.cc',
+                'cellular/mock_mm1_modem_location_proxy.cc',
+                'cellular/mock_mm1_modem_modem3gpp_proxy.cc',
+                'cellular/mock_mm1_modem_modemcdma_proxy.cc',
+                'cellular/mock_mm1_modem_proxy.cc',
+                'cellular/mock_mm1_modem_simple_proxy.cc',
+                'cellular/mock_mm1_modem_time_proxy.cc',
+                'cellular/mock_mm1_sim_proxy.cc',
+                'cellular/mock_mobile_operator_info.cc',
+                'cellular/mock_modem.cc',
+                'cellular/mock_modem_cdma_proxy.cc',
+                'cellular/mock_modem_gobi_proxy.cc',
+                'cellular/mock_modem_gsm_card_proxy.cc',
+                'cellular/mock_modem_gsm_network_proxy.cc',
+                'cellular/mock_modem_info.cc',
+                'cellular/mock_modem_manager_proxy.cc',
+                'cellular/mock_modem_proxy.cc',
+                'cellular/mock_modem_simple_proxy.cc',
+                'cellular/mock_out_of_credits_detector.cc',
+                'cellular/modem_1_unittest.cc',
+                'cellular/modem_info_unittest.cc',
+                'cellular/modem_manager_unittest.cc',
+                'cellular/modem_unittest.cc',
+                'cellular/subscription_state_out_of_credits_detector_unittest.cc',
               ],
             }],
             ['USE_vpn == 1', {