diff --git a/py25/bacpypes/bsllservice.py b/py25/bacpypes/bsllservice.py
index 304b7f0..055da3a 100755
--- a/py25/bacpypes/bsllservice.py
+++ b/py25/bacpypes/bsllservice.py
@@ -11,15 +11,15 @@ from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
 from .comm import Client, bind, ApplicationServiceElement
 from .tcp import TCPClientDirector, TCPServerDirector, StreamToPacket
 
-from .pdu import PDU, unpack_ip_addr
+from .pdu import Address, LocalBroadcast, PDU, unpack_ip_addr
 from .npdu import NPDU
 from .netservice import NetworkAdapter
 
 from .bsll import AUTHENTICATION_FAILURE, AUTHENTICATION_HASH, \
     AUTHENTICATION_NO_SERVICE, AUTHENTICATION_REQUIRED, AccessChallenge, \
-    AccessRequest, AccessResponse, Address, BSLCI, BSLPDU, \
+    AccessRequest, AccessResponse, BSLCI, BSLPDU, \
     CLIENT_SERVER_SERVICE_ID, DEVICE_TO_DEVICE_SERVICE_ID, DeviceToDeviceAPDU, \
-    LANE_SERVICE_ID, LocalBroadcast, NO_DEVICE_TO_DEVICE_SERVICE, \
+    LANE_SERVICE_ID, NO_DEVICE_TO_DEVICE_SERVICE, \
     NO_LANE_SERVICE, NO_PROXY_SERVICE, NO_ROUTER_TO_ROUTER_SERVICE, \
     PROXY_SERVICE_ID, ProxyToServerBroadcastNPDU, ProxyToServerUnicastNPDU, \
     ROUTER_TO_ROUTER_SERVICE_ID, Result, RouterToRouterNPDU, SUCCESS, \
diff --git a/py27/bacpypes/bsllservice.py b/py27/bacpypes/bsllservice.py
index f0c952e..356259f 100755
--- a/py27/bacpypes/bsllservice.py
+++ b/py27/bacpypes/bsllservice.py
@@ -11,15 +11,15 @@ from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
 from .comm import Client, bind, ApplicationServiceElement
 from .tcp import TCPClientDirector, TCPServerDirector, StreamToPacket
 
-from .pdu import PDU, unpack_ip_addr
+from .pdu import Address, LocalBroadcast, PDU, unpack_ip_addr
 from .npdu import NPDU
 from .netservice import NetworkAdapter
 
 from .bsll import AUTHENTICATION_FAILURE, AUTHENTICATION_HASH, \
     AUTHENTICATION_NO_SERVICE, AUTHENTICATION_REQUIRED, AccessChallenge, \
-    AccessRequest, AccessResponse, Address, BSLCI, BSLPDU, \
+    AccessRequest, AccessResponse, BSLCI, BSLPDU, \
     CLIENT_SERVER_SERVICE_ID, DEVICE_TO_DEVICE_SERVICE_ID, DeviceToDeviceAPDU, \
-    LANE_SERVICE_ID, LocalBroadcast, NO_DEVICE_TO_DEVICE_SERVICE, \
+    LANE_SERVICE_ID, NO_DEVICE_TO_DEVICE_SERVICE, \
     NO_LANE_SERVICE, NO_PROXY_SERVICE, NO_ROUTER_TO_ROUTER_SERVICE, \
     PROXY_SERVICE_ID, ProxyToServerBroadcastNPDU, ProxyToServerUnicastNPDU, \
     ROUTER_TO_ROUTER_SERVICE_ID, Result, RouterToRouterNPDU, SUCCESS, \
diff --git a/py34/bacpypes/bsllservice.py b/py34/bacpypes/bsllservice.py
index f0c952e..356259f 100755
--- a/py34/bacpypes/bsllservice.py
+++ b/py34/bacpypes/bsllservice.py
@@ -11,15 +11,15 @@ from .debugging import ModuleLogger, DebugContents, bacpypes_debugging
 from .comm import Client, bind, ApplicationServiceElement
 from .tcp import TCPClientDirector, TCPServerDirector, StreamToPacket
 
-from .pdu import PDU, unpack_ip_addr
+from .pdu import Address, LocalBroadcast, PDU, unpack_ip_addr
 from .npdu import NPDU
 from .netservice import NetworkAdapter
 
 from .bsll import AUTHENTICATION_FAILURE, AUTHENTICATION_HASH, \
     AUTHENTICATION_NO_SERVICE, AUTHENTICATION_REQUIRED, AccessChallenge, \
-    AccessRequest, AccessResponse, Address, BSLCI, BSLPDU, \
+    AccessRequest, AccessResponse, BSLCI, BSLPDU, \
     CLIENT_SERVER_SERVICE_ID, DEVICE_TO_DEVICE_SERVICE_ID, DeviceToDeviceAPDU, \
-    LANE_SERVICE_ID, LocalBroadcast, NO_DEVICE_TO_DEVICE_SERVICE, \
+    LANE_SERVICE_ID, NO_DEVICE_TO_DEVICE_SERVICE, \
     NO_LANE_SERVICE, NO_PROXY_SERVICE, NO_ROUTER_TO_ROUTER_SERVICE, \
     PROXY_SERVICE_ID, ProxyToServerBroadcastNPDU, ProxyToServerUnicastNPDU, \
     ROUTER_TO_ROUTER_SERVICE_ID, Result, RouterToRouterNPDU, SUCCESS, \