Rearrange network device handling bits

shell/model/devices/Makefile.am

@@ -1,8 +1,8 @@
+SUBDIRS = network
+
 sugardir = $(pkgdatadir)/shell/model/devices
 sugar_PYTHON =			\
 	__init__.py		\
 	device.py		\
 	devicesmodel.py		\
-	battery.py		\
-	wirednetwork.py		\
-	wirelessnetwork.py
+	battery.py

shell/model/devices/devicesmodel.py

@@ -1,8 +1,8 @@
 import gobject
 
 from model.devices import device
-from model.devices import wirednetwork
-from model.devices import wirelessnetwork
+from model.devices.network import wired
+from model.devices.network import wireless
 from model.devices import battery
 from hardware import hardwaremanager
 from hardware import nmclient
@@ -59,7 +59,7 @@ class DevicesModel(gobject.GObject):
         return self._devices[nm_device.get_op()]
 
     def _add_network_device(self, nm_device):
-        self.add_device(wirelessnetwork.Device(nm_device))
+        self.add_device(wireless.Device(nm_device))
         nm_device.connect('state-changed',
                           self._network_device_state_changed_cb)
 

shell/model/devices/network/Makefile.am

@@ -0,0 +1,5 @@
+sugardir = $(pkgdatadir)/shell/model/devices/network
+sugar_PYTHON =	\
+	__init__.py	\
+	wired.py	\
+	wireless.py

shell/model/devices/network/wired.py

@@ -9,4 +9,4 @@ class Device(device.Device):
         return self._nm_device.get_op()
 
     def get_type(self):
-        return 'wirednetwork'
+        return 'network.wired'

shell/model/devices/network/wireless.py

@@ -70,7 +70,7 @@ class Device(device.Device):
             return _nm_state_to_state[nm_state]
 
     def get_type(self):
-        return 'wirelessnetwork'
+        return 'network.wireless'
 
     def get_id(self):
         return self._nm_device.get_op()