diff --git a/.gitignore b/.gitignore
index 8f299c7..ef15af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 *.pyc
 *.pyo
 ~*
+*.bak
+*.egg-info
+dist
diff --git a/addp.py b/addp.py
deleted file mode 100644
index a931a9a..0000000
--- a/addp.py
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Advanced Device Discovery Protocol (ADDP)
-
-http://www.digi.com/wiki/developer/index.php/Advanced_Device_Discovery_Protocol_(ADDP)
-
-Almost all info for this module comes from:
-  http://qbeukes.blogspot.com/2009/11/advanced-digi-discovery-protocol_21.html
-"""
-
-import struct
-
-typ_codes = {
-	0x0001: "Discovery Request",
-	0x0002: "Discovery Response",
-	0x0003: "Static Network Configuration Request",
-	0x0004: "Static Network Configuration Response",
-	0x0005: "Reboot Request",
-	0x0006: "Reboot Response",
-	0x0007: "DHCP Network Configuration Request",
-	0x0008: "DHCP Network Configuration Response"}
-
-# {code: (desc, encoder, decoder)}
-fld_codes = {
-	0x01: ("MAC address", lambda x: struct.pack("6B", *x), lambda x: struct.unpack("6B", x)),
-	0x02: ("IP address", lambda x: struct.pack("4B", *x), lambda x: struct.unpack("4B", x)),
-	0x03: ("Netmask", lambda x: struct.pack("4B", *x), lambda x: struct.unpack("4B", x)),
-	0x04: ("Network Name", lambda x: x, lambda x: x),
-	0x05: ("Domain", lambda x: x, lambda x: x),
-	0x06: ("HW Type", lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
-	0x07: ("HW Revision", lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
-	0x08: ("Firmware", lambda x: x, lambda x: x),
-	0x09: ("Result message", lambda x: x, lambda x: x),
-	0x0a: ("Result flag", lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
-	0x0b: ("IP Gateway", lambda x: struct.pack("BBBB", *x), lambda x: struct.unpack("BBBB", x)),
-	0x0c: ("Configuration error code", lambda x: struct.pack(">H", x), lambda x: struct.unpack('>H', x)[0]),
-	0x0d: ("device name", lambda x: x, lambda x: x),
-	0x0e: ("Real Port number", lambda x: struct.pack(">L", x), lambda x: struct.unpack('>L', x)[0]),
-	0x0f: ("DNS IP address", lambda x: struct.pack("BBBB", *x), lambda x: struct.unpack("BBBB", x)),
-	0x10: ("UNKNOWN16", lambda x: struct.pack("BBBB", *x), lambda x: code_16_parser(x)),
-	0x11: ("Error code", lambda x: struct.pack("B", x), lambda x: error_codes[ord(x)]),
-	0x12: ("Serial Port Count", lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
-	0x13: ("Encrypted Real Port number", lambda x: struct.pack(">L", x), lambda x: struct.unpack('>L', x)[0]),
-	0x19: ("UNKNOWN19", lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
-	0x1a: ("Device-ID", lambda x: x, lambda x: "%08X-%08X-%08X-%08X"%struct.unpack('>4L', x))}
-
-error_codes = {
-	0x00: "Success",
-	0x01: "Authentication Failure",
-	0x03: "Invalid Value",
-	0x06: "Unable to save value"}
-
-def build_frame(typ, body):
-	return "DIGI" + struct.pack('>HH', typ, len(body)) + body
-
-def build_fields(flds):
-	body = ""
-	for c, v in flds.items():
-		val = fld_codes[c][1](v)
-		body += struct.pack("BB", c, len(val)) + val
-	return body
-
-def parse_frame(d):
-	info = {}
-	if d[:4] != 'DIGI':	
-	    print 'Invalid magic header:', repr(d[:4])	
-	    return None	
-
-	hdr = d[4:8]
-	bdy = d[8:]
-	(typ, ln) = struct.unpack(">HH", hdr)
-
-	if len(bdy) != ln:
-		print 'Invalid format: lengths did not match:'
-		print 'expected: %d, got: %d' % (ln, len(bdy))
-		print repr(d)
-		return None
-
-	if typ not in typ_codes:
-		print 'Unknown message code:', typ
-		return None
-
-	info['code'] = typ
-	info['msg_len'] = ln
-	info['message'] = typ_codes[typ]
-	info['msg_type'] = 'request'
-
-	if typ == 0x01:
-		# discovery req
-		info['mac'] = struct.unpack("BBBBBB", bdy)
-
-	elif typ == 0x03:
-		# change ip req
-		info['ip_addr'] = struct.unpack("BBBB", bdy[:4])
-		info['subnet'] = struct.unpack("BBBB", bdy[4:8])
-		info['gatway'] = struct.unpack("BBBB", bdy[8:12])
-		info['mac'] = struct.unpack("BBBBBB", bdy[12:18])
-		info['auth'] = bdy[18:]
-
-	elif typ == 0x05:
-		# reboot req
-		info['mac'] = struct.unpack("BBBBBB", bdy[:6])
-		info['auth'] = bdy[6:]
-
-	elif typ == 0x07:
-		# dhcp req
-		#info['byte'] = struct.unpack("B", bdy[:1])
-		info['mac'] = struct.unpack("BBBBBB", bdy[1:7])
-		info['auth'] = bdy[7:]
-
-	elif typ in [0x02, 0x04, 0x06, 0x08]:
-		info['msg_type'] = 'response'
-		vals = parse_response(bdy)
-		info = dict(info.items() + vals.items())
-
-	return info
-
-def build_request(typ, **kwargs):
-	if typ == 0x01:
-		# discover - requires mac
-		mac = kwargs['mac']
-		body = struct.pack("6B", *mac)
-	if typ == 0x03:
-		# static network configuration
-		mac = kwargs['mac']
-		auth = kwargs['auth']
-		ipaddr = kwargs['ipaddr']
-		subnet = kwargs['subnet']
-		gateway = kwargs['gateway']
-		body = struct.pack("4B", *ipaddr)
-		body += struct.pack("4B", *subnet)
-		body += struct.pack("4B", *gateway)
-		body += struct.pack("6B", *mac)
-		body += struct.pack("B", len(auth)) + auth
-	if typ == 0x05:
-		# reboot - requires mac, auth
-		mac = kwargs['mac']
-		auth = kwargs['auth']
-		body = struct.pack("6B", *mac)
-		body += struct.pack("B", len(auth)) + auth
-	if typ == 0x07:
-		# dhcp - requires mac, auth, 
-		mac = kwargs['mac']
-		auth = kwargs['auth']
-		body = struct.pack("B", 1)
-		body += struct.pack("6B", *mac)
-		body += struct.pack("B", len(auth)) + auth
-	return build_frame(typ, body)
-
-def build_response(info):
-	resp = None
-	if info['code'] == 0x01:
-		flds = {0x01: (0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
-				0x02: (1, 1, 1, 1),
-				0x03: (255, 255, 255, 0),
-				0x04: "test",
-				0x0b: (1, 1, 1, 1),
-				0x0d: "ADDP Emulator",
-				#0x10: 0,
-				0x07: 0,
-				0x08: "V.1 04-25-2013",
-				0x0e: 771,
-				0x13: 1027,
-				0x12: 1}
-		resp = build_frame(0x02, build_fields(flds))
-	elif info['code'] == 0x05:
-		flds = {0x01: (0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
-				0x09: "Operation FOO",
-				0x0a: 0,
-				0x11: 0}
-		resp = build_frame(0x06, build_fields(flds))
-
-	return resp
-
-def parse_response(body):
-	info = {}
-	while body != "":
-		code = ord(body[0])
-		ln = ord(body[1])
-		fld = body[2:ln+2]
-		body = body[ln+2:]
-
-		info[fld_codes[code][0]] = fld_codes[code][2](fld)
-
-	return info
-
-def code_16_parser(x):
-	if len(x) == 1:
-		return ord(x)
-	elif len(x) == 4:
-		return struct.unpack("BBBB", x)
-	else:
-		return x
diff --git a/addp/__init__.py b/addp/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/addp/addp.py b/addp/addp.py
new file mode 100644
index 0000000..a1fb226
--- /dev/null
+++ b/addp/addp.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+"""
+Advanced Device Discovery Protocol (ADDP)
+
+http://www.digi.com/wiki/developer/index.php/Advanced_Device_Discovery_Protocol_(ADDP)
+
+Almost all info for this module comes from:
+  http://qbeukes.blogspot.com/2009/11/advanced-digi-discovery-protocol_21.html
+"""
+
+import struct
+import sys
+
+typ_codes = {
+        0x0001: "Discovery Request",
+        0x0002: "Discovery Response",
+        0x0003: "Static Network Configuration Request",
+        0x0004: "Static Network Configuration Response",
+        0x0005: "Reboot Request",
+        0x0006: "Reboot Response",
+        0x0007: "DHCP Network Configuration Request",
+        0x0008: "DHCP Network Configuration Response"}
+
+MAC_ADDRESS = "MAC address"
+IP_ADDRESS = "IP address"
+NETMASK = "Netmask"
+NETWORK_NAME = "Network Name"
+DOMAIN = "Domain"
+HW_TYPE = "HW Type"
+HW_REVISION = "HW Revision"
+FIRMWARE = "Firmware"
+RESULT_MESSAGE = "Result message"
+RESULT_FLAG = "Result flag"
+IP_GATEWAY = "IP Gateway"
+CONFIGURATION_ERROR_CODE = "Configuration error code"
+DEVICE_NAME = "device name"
+REAL_PORT_NUMBER = "Real Port number"
+DNS_IP_ADDRESS = "DNS IP address"
+UNKNOWN16 = "UNKNOWN16"
+ERROR_CODE = "Error code"
+SERIAL_PORT_COUNT = "Serial Port Count"
+ENCRYPTED_REAL_PORT_NUMBER = "Encrypted Real Port number"
+UNKNOWN19 = "UNKNOWN19"
+DEVICE_ID = "Device-ID"
+ADDP_ADDR = "addp_ip"
+# {code: (desc, encoder, decoder)}
+fld_codes = {
+	0x01: (MAC_ADDRESS, lambda x: struct.pack("6B", *x), lambda x: struct.unpack("6B", x)),
+	0x02: (IP_ADDRESS, lambda x: struct.pack("4B", *x), lambda x: struct.unpack("4B", x)),
+	0x03: (NETMASK, lambda x: struct.pack("4B", *x), lambda x: struct.unpack("4B", x)),
+	0x04: (NETWORK_NAME, lambda x: x, lambda x: x),
+	0x05: (DOMAIN, lambda x: x, lambda x: x),
+	0x06: (HW_TYPE, lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
+	0x07: (HW_REVISION, lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
+	0x08: (FIRMWARE, lambda x: x, lambda x: x),
+	0x09: (RESULT_MESSAGE, lambda x: x, lambda x: x),
+	0x0a: (RESULT_FLAG, lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
+	0x0b: (IP_GATEWAY, lambda x: struct.pack("BBBB", *x), lambda x: struct.unpack("BBBB", x)),
+	0x0c: (CONFIGURATION_ERROR_CODE, lambda x: struct.pack(">H", x), lambda x: struct.unpack('>H', x)[0]),
+	0x0d: (DEVICE_NAME, lambda x: x, lambda x: x),
+	0x0e: (REAL_PORT_NUMBER, lambda x: struct.pack(">L", x), lambda x: struct.unpack('>L', x)[0]),
+	0x0f: (DNS_IP_ADDRESS, lambda x: struct.pack("BBBB", *x), lambda x: struct.unpack("BBBB", x)),
+	0x10: (UNKNOWN16, lambda x: struct.pack("BBBB", *x), lambda x: code_16_parser(x)),
+	0x11: (ERROR_CODE, lambda x: struct.pack("B", x), lambda x: error_codes[ord(x)]),
+	0x12: (SERIAL_PORT_COUNT, lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
+	0x13: (ENCRYPTED_REAL_PORT_NUMBER, lambda x: struct.pack(">L", x), lambda x: struct.unpack('>L', x)[0]),
+	0x19: (UNKNOWN19, lambda x: struct.pack("B", x), lambda x: struct.unpack("B", x)[0]),
+	0x1a: (DEVICE_ID, lambda x: x, lambda x: "%08X-%08X-%08X-%08X"%struct.unpack('>4L', x))}
+
+error_codes = {
+        0x00: "Success",
+        0x01: "Authentication Failure",
+        0x03: "Invalid Value",
+        0x06: "Unable to save value"}
+
+def _ord(byte):
+    if sys.version_info >= (3, 0):
+        return byte
+    
+    return ord(byte)
+
+def build_frame(typ, body):
+    return b'DIGI' + struct.pack('>HH', typ, len(body)) + body
+
+def build_fields(flds):
+    body = ""
+    for c, v in list(flds.items()):
+        val = fld_codes[c][1](v)
+        body += struct.pack("BB", c, len(val)) + val
+
+    return body
+
+def parse_frame(d):
+    info = {}
+    if d[:4] != b'DIGI':
+        print('Invalid magic header:', repr(d[:4]))	
+        return None	
+
+    hdr = d[4:8]
+    bdy = d[8:]
+    (typ, ln) = struct.unpack(">HH", hdr)
+
+    if len(bdy) != ln:
+        print('Invalid format: lengths did not match:')
+        print('expected: %d, got: %d' % (ln, len(bdy)))
+        print(repr(d))
+        return None
+
+    if typ not in typ_codes:
+        print('Unknown message code:', typ)
+        return None
+
+    info['code'] = typ
+    info['msg_len'] = ln
+    info['message'] = typ_codes[typ]
+    info['msg_type'] = 'request'
+
+    if typ == 0x01:
+        # discovery req
+        info['msg_type'] = 'request'
+        info['mac'] = struct.unpack("BBBBBB", bdy)
+
+    elif typ == 0x03:
+        # change ip req
+        info['ip_addr'] = struct.unpack("BBBB", bdy[:4])
+        info['subnet'] = struct.unpack("BBBB", bdy[4:8])
+        info['gatway'] = struct.unpack("BBBB", bdy[8:12])
+        info['mac'] = struct.unpack("BBBBBB", bdy[12:18])
+        info['auth'] = bdy[18:]
+
+    elif typ == 0x05:
+        # reboot req
+        info['msg_type'] = 'request'
+        info['mac'] = struct.unpack("BBBBBB", bdy[:6])
+        info['auth'] = bdy[6:]
+
+    elif typ == 0x07:
+        # dhcp req
+        #info['byte'] = struct.unpack("B", bdy[:1])
+        info['mac'] = struct.unpack("BBBBBB", bdy[1:7])
+        info['auth'] = bdy[7:]
+
+    elif typ in [0x02, 0x04, 0x06, 0x08]:
+        info['msg_type'] = 'response'
+        vals = parse_response(bdy)
+        info = dict(list(info.items()) + list(vals.items()))
+
+    return info
+
+def build_request(typ, **kwargs):
+    if typ == 0x01:
+        # discover - requires mac
+        mac = kwargs['mac']
+        body = struct.pack("6B", *mac)
+    if typ == 0x03:
+        # static network configuration
+        mac = kwargs['mac']
+        auth = kwargs['auth']
+        ipaddr = kwargs['ipaddr']
+        subnet = kwargs['subnet']
+        gateway = kwargs['gateway']
+        body = struct.pack("4B", *ipaddr)
+        body += struct.pack("4B", *subnet)
+        body += struct.pack("4B", *gateway)
+        body += struct.pack("6B", *mac)
+        body += struct.pack("B", len(auth)) + auth
+    if typ == 0x05:
+        # reboot - requires mac, auth
+        mac = kwargs['mac']
+        auth = kwargs['auth']
+        body = struct.pack("6B", *mac)
+        body += struct.pack("B", len(auth)) + auth
+    if typ == 0x07:
+        # dhcp - requires mac, auth, 
+        mac = kwargs['mac']
+        auth = kwargs['auth']
+        body = struct.pack("B", 1)
+        body += struct.pack("6B", *mac)
+        body += struct.pack("B", len(auth)) + auth
+
+    return build_frame(typ, body)
+
+def build_response(info):
+    resp = None
+    if info['code'] == 0x01:
+        flds = {0x01: (0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+                0x02: (1, 1, 1, 1),
+                0x03: (255, 255, 255, 0),
+                0x04: "test",
+                0x0b: (1, 1, 1, 1),
+                0x0d: "ADDP Emulator",
+                #0x10: 0,
+                0x07: 0,
+                0x08: "V.1 04-25-2013",
+                0x0e: 771,
+                0x13: 1027,
+                0x12: 1}
+        resp = build_frame(0x02, build_fields(flds))
+    elif info['code'] == 0x05:
+        flds = {0x01: (0x00, 0x00, 0x00, 0x00, 0x00, 0x00),
+                0x09: "Operation FOO",
+                0x0a: 0,
+                0x11: 0}
+        resp = build_frame(0x06, build_fields(flds))
+
+    return resp
+
+def parse_response(body):
+    info = {}
+    while body != b"":
+        code = _ord(body[0])
+        ln = _ord(body[1])
+        fld = body[2:ln+2]
+        body = body[ln+2:]
+
+        try:
+            info[fld_codes[code][0]] = fld_codes[code][2](fld)
+        except KeyError:
+            pass
+
+    return info
+
+def code_16_parser(x):
+    if len(x) == 1:
+        return ord(x)
+    elif len(x) == 4:
+        return struct.unpack("BBBB", x)
+    else:
+        return x
diff --git a/device.py b/addp/device.py
similarity index 90%
rename from device.py
rename to addp/device.py
index 5a5eab1..c0b3ec9 100644
--- a/device.py
+++ b/addp/device.py
@@ -33,7 +33,7 @@
 		try:
 			data, addr = sock.recvfrom(2048)
 		except KeyboardInterrupt:
-			print 'Exiting...'
+			print('Exiting...')
 			sys.exit(0)
 
 		if data is None or data == '':
@@ -42,7 +42,7 @@
 		info = parse_frame(data)
 
 		if info:
-			print 'Responing to discover from', addr
+			print('Responing to discover from', addr)
 			ret = build_response(info)
 			if ret and ret != "":
 				sock.sendto(ret, addr)
diff --git a/discover.py b/addp/discover.py
similarity index 70%
rename from discover.py
rename to addp/discover.py
index d0e4cf2..88e7fa3 100644
--- a/discover.py
+++ b/addp/discover.py
@@ -30,18 +30,18 @@ def send_discovery():
 
 	responses = []
 	while True:
-		try:
-			data, addr = sock.recvfrom(2048)
-		except:
-			break
-
-		if data is None or data == '':
-			break
-
-		info = parse_frame(data)
-		if info:
-			info['addp_ip'] = addr[0]
-			responses.append(info)
+            try:
+                data, addr = sock.recvfrom(2048)
+            except:
+                break
+
+            if data is None or data == '':
+                break
+
+            info = parse_frame(data)
+            if info:
+                info['addp_ip'] = addr[0]
+                responses.append(info)
 
 	sock.close()
 	return responses
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..a56514a
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,7 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="addp",
+    version="1.0.1",
+    packages=find_packages(),
+)