Rename Message class to CXMessage

diff --git a/centrixd/cxproto.py b/centrixd/cxproto.py
index 5a779d5..4103d45 100644
--- a/centrixd/cxproto.py
+++ b/centrixd/cxproto.py
@@ -5,15 +5,12 @@ from twisted.internet import reactor
 from louie import dispatcher
 from threading import Thread

-
 from cxutils import log
 from xmlserialize import serialize
+from data import CXMessage

 CXPORT = 9222

-class CXMessage(object):
-    pass
-
 class CXProto(Protocol):
     status = None

diff --git a/client_test.py b/client_test.py
index db50921..993328e 100755
--- a/client_test.py
+++ b/client_test.py
@@ -4,17 +4,17 @@ from twisted.internet import reactor
 from twisted.protocols.basic import LineReceiver
 from twisted.internet.protocol import ClientFactory

-import data
+from centrixd import data

 class Centrixc(LineReceiver):
     def sendMessage(self,msg_type,**kwargs):
-        self.sendLine(data.Message(msg_type,**kwargs).to_xml())
+        self.sendLine(data.CXMessage(msg_type,**kwargs).to_xml())

     def connectionMade(self):
         self.sendMessage('register_machine')

     def lineReceived(self,line):
-        print data.Message.parse(line)
+        print data.CXMessage.parse(line)
         self.sendMessage('quit')
         self.transport.loseConnection()

diff --git a/test.py b/test.py
index cdd8a40..a93ed78 100755
--- a/test.py
+++ b/test.py
@@ -13,7 +13,7 @@ import discovery
 import templates
 import configs
 import configsets
-import data
+from centrixd import data
 import machines
 # import xmlserialize as XML

@@ -31,14 +31,14 @@ signal.signal(signal.SIGINT, on_sigint)

 class Centrixd(LineReceiver):
     def lineReceived(self,line):
-        msg = data.Message.parse(line)
+        msg = data.CXMessage.parse(line)
         print "Message received:", msg
         if msg.type == 'register_machine':
-            self.sendLine(data.Message('OK').to_xml())
+            self.sendLine(data.CXMessage('OK').to_xml())
         elif msg.type == 'quit':
             self.transport.loseConnection()
         else:
-            self.sendLine(data.Message('unknown').to_xml())
+            self.sendLine(data.CXMessage('unknown').to_xml())

 #####################################
 # Setup