diff --git a/rdpy/protocol/network/__init__.py b/rdpy/network/__init__.py
similarity index 100%
rename from rdpy/protocol/network/__init__.py
rename to rdpy/network/__init__.py
diff --git a/rdpy/utils/const.py b/rdpy/network/const.py
similarity index 100%
rename from rdpy/utils/const.py
rename to rdpy/network/const.py
diff --git a/rdpy/protocol/network/error.py b/rdpy/network/error.py
similarity index 100%
rename from rdpy/protocol/network/error.py
rename to rdpy/network/error.py
diff --git a/rdpy/protocol/network/layer.py b/rdpy/network/layer.py
similarity index 100%
rename from rdpy/protocol/network/layer.py
rename to rdpy/network/layer.py
diff --git a/rdpy/protocol/network/type.py b/rdpy/network/type.py
similarity index 99%
rename from rdpy/protocol/network/type.py
rename to rdpy/network/type.py
index 0385345..5f23257 100644
--- a/rdpy/protocol/network/type.py
+++ b/rdpy/network/type.py
@@ -6,7 +6,7 @@ import struct
 from copy import deepcopy
 from StringIO import StringIO
 from error import InvalidValue
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.error import InvalidExpectedDataException
 
 def sizeof(element):
     '''
diff --git a/rdpy/protocol/rdp/ber.py b/rdpy/protocol/rdp/ber.py
index 30fea04..1300cec 100644
--- a/rdpy/protocol/rdp/ber.py
+++ b/rdpy/protocol/rdp/ber.py
@@ -1,9 +1,9 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, String
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.error import InvalidExpectedDataException, InvalidSize
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, String
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.error import InvalidExpectedDataException, InvalidSize
 
 @ConstAttributes
 @TypeAttributes(UInt8)
diff --git a/rdpy/protocol/rdp/gcc.py b/rdpy/protocol/rdp/gcc.py
index 590168d..4387531 100644
--- a/rdpy/protocol/rdp/gcc.py
+++ b/rdpy/protocol/rdp/gcc.py
@@ -3,10 +3,10 @@
 @summary gcc language
 @see: http://msdn.microsoft.com/en-us/library/cc240510.aspx
 '''
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.type import UInt8, UInt16Le, UInt32Le, CompositeType, String, UniString, Stream, sizeof
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import UInt8, UInt16Le, UInt32Le, CompositeType, String, UniString, Stream, sizeof
 import per
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.error import InvalidExpectedDataException
 
 t124_02_98_oid = ( 0, 0, 20, 124, 0, 1 )
 h221_cs_key = "Duca";
diff --git a/rdpy/protocol/rdp/lic.py b/rdpy/protocol/rdp/lic.py
index 3c71aa5..ef049b9 100644
--- a/rdpy/protocol/rdp/lic.py
+++ b/rdpy/protocol/rdp/lic.py
@@ -1,8 +1,8 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.type import CompositeType, UInt8, UInt16Le, UInt32Le, String, sizeof
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import CompositeType, UInt8, UInt16Le, UInt32Le, String, sizeof
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(UInt8)
diff --git a/rdpy/protocol/rdp/mcs.py b/rdpy/protocol/rdp/mcs.py
index 231e9c2..2d0fd8d 100644
--- a/rdpy/protocol/rdp/mcs.py
+++ b/rdpy/protocol/rdp/mcs.py
@@ -2,11 +2,11 @@
 @author: sylvain
 '''
 
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import sizeof, Stream, UInt8, UInt16Be
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import sizeof, Stream, UInt8, UInt16Be
+from rdpy.network.error import InvalidExpectedDataException, InvalidValue, InvalidSize
 from rdpy.protocol.rdp.ber import writeLength
-from rdpy.protocol.network.error import InvalidExpectedDataException, InvalidValue, InvalidSize
 
 import ber, gcc, per
 
diff --git a/rdpy/protocol/rdp/per.py b/rdpy/protocol/rdp/per.py
index 90044ae..cf4f99a 100644
--- a/rdpy/protocol/rdp/per.py
+++ b/rdpy/protocol/rdp/per.py
@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, String
-from rdpy.protocol.network.error import InvalidValue, InvalidExpectedDataException
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, String
+from rdpy.network.error import InvalidValue, InvalidExpectedDataException
 
 def readLength(s):
     '''
diff --git a/rdpy/protocol/rdp/sil.py b/rdpy/protocol/rdp/sil.py
index bbba03b..3c83f4f 100644
--- a/rdpy/protocol/rdp/sil.py
+++ b/rdpy/protocol/rdp/sil.py
@@ -2,10 +2,10 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import CompositeType, UniString, String, UInt8, UInt16Le, UInt16Be, UInt32Le, sizeof, ArrayType
-from rdpy.utils.const import ConstAttributes, TypeAttributes
-from rdpy.protocol.network.error import InvalidExpectedDataException
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import CompositeType, UniString, String, UInt8, UInt16Le, UInt16Be, UInt32Le, sizeof, ArrayType
+from rdpy.network.const import ConstAttributes, TypeAttributes
+from rdpy.network.error import InvalidExpectedDataException
 
 import gcc
 import lic
diff --git a/rdpy/protocol/rdp/tpdu.py b/rdpy/protocol/rdp/tpdu.py
index 2cc0a85..622ec15 100644
--- a/rdpy/protocol/rdp/tpdu.py
+++ b/rdpy/protocol/rdp/tpdu.py
@@ -1,10 +1,10 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.layer import LayerAutomata
-from rdpy.protocol.network.type import UInt8, UInt16Le, UInt16Be, UInt32Le, CompositeType, sizeof
-from rdpy.protocol.network.error import InvalidExpectedDataException
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.layer import LayerAutomata
+from rdpy.network.type import UInt8, UInt16Le, UInt16Be, UInt32Le, CompositeType, sizeof
+from rdpy.network.error import InvalidExpectedDataException
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(UInt8)
diff --git a/rdpy/protocol/rdp/tpkt.py b/rdpy/protocol/rdp/tpkt.py
index 5ed9de3..f8de06c 100644
--- a/rdpy/protocol/rdp/tpkt.py
+++ b/rdpy/protocol/rdp/tpkt.py
@@ -1,8 +1,8 @@
 '''
 @author: sylvain
 '''
-from rdpy.protocol.network.layer import RawLayer
-from rdpy.protocol.network.type import UInt8, UInt16Be, sizeof
+from rdpy.network.layer import RawLayer
+from rdpy.network.type import UInt8, UInt16Be, sizeof
 
 class TPKT(RawLayer):
     '''
diff --git a/rdpy/protocol/rfb/message.py b/rdpy/protocol/rfb/message.py
index 5b01072..3baf936 100644
--- a/rdpy/protocol/rfb/message.py
+++ b/rdpy/protocol/rfb/message.py
@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 
-from rdpy.protocol.network.type import UInt8, UInt16Be, UInt32Be, SInt32Be, String, CompositeType
-from rdpy.utils.const import ConstAttributes, TypeAttributes
+from rdpy.network.type import UInt8, UInt16Be, UInt32Be, SInt32Be, String, CompositeType
+from rdpy.network.const import ConstAttributes, TypeAttributes
 
 @ConstAttributes
 @TypeAttributes(String)
diff --git a/rdpy/protocol/rfb/rfb.py b/rdpy/protocol/rfb/rfb.py
index 9ce12bf..7cf821f 100644
--- a/rdpy/protocol/rfb/rfb.py
+++ b/rdpy/protocol/rfb/rfb.py
@@ -2,8 +2,8 @@
 @author: sylvain
 '''
 from twisted.internet import protocol
-from rdpy.protocol.network.type import String, UInt8, UInt16Be, UInt32Be
-from rdpy.protocol.network.layer import RawLayer
+from rdpy.network.type import String, UInt8, UInt16Be, UInt32Be
+from rdpy.network.layer import RawLayer
 from message import *
 
 class ProtocolMode(object):
diff --git a/rdpy/rdpclient.py b/rdpy/rdpclient.py
index cf3b1f3..64e2282 100644
--- a/rdpy/rdpclient.py
+++ b/rdpy/rdpclient.py
@@ -11,5 +11,5 @@ if __name__ == '__main__':
     from twisted.internet import reactor
     #reactor.connectTCP("127.0.0.1", 5901, factory.RfbFactory(protocol))
     #reactor.connectTCP("192.168.1.90", 3389, factory.RfbFactory(tpkt.TPKT(tpdu.TPDU(mcs.MCS()))))
-    reactor.connectTCP("192.168.135.182", 3389, rdp.Factory())
+    reactor.connectTCP("192.168.135.198", 3389, rdp.Factory())
     reactor.run()
\ No newline at end of file
diff --git a/rdpy/utils/__init__.py b/rdpy/utils/__init__.py
deleted file mode 100644
index e69de29..0000000