diff --git a/README.md b/README.md
index 533405b..c9e652a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Needed tools
 
-    - Python 3.5
+    - Python >=3.7
     - pip
 
 ## Requires
@@ -11,8 +11,8 @@
     - requests
 
 ## Install
-```console
-pip install -e git+https://github.com/bandwidthcom/python-bandwidth-iris#egg=iris_sdk
+```sh
+pip install bandwidth-numbers-sdk
 ```
 
 ## Testing
@@ -20,21 +20,19 @@ pip install -e git+https://github.com/bandwidthcom/python-bandwidth-iris#egg=iri
 Tests require the *mock* and *requests_mock* packages. You can install them
 with
 
-```console
-pip install -r requirements.txt
+```sh
+pip install -r test-requirements.txt
 ```
 The tests can be run by issuing
-```console
-python -m unittest discover
+```sh
+pytest
 ```
 
 ## Usage
 
 ```python
-from iris_sdk import Account, Client
-```
+from bandwidth_numbers import Account, Client
 
-```python
 client = Client(url="https://dashboard.bandwidth.com/api", account_id=123456, username="foo",
     password="bar")
 ```
@@ -124,7 +122,7 @@ account.available_npa_nxx.list({"state": "NJ"})
 ### Cities
 
 ```python
-from iris_sdk import Cities
+from bandwidth_numbers import Cities
 
 cities = Cities(client=client)
 cities.list({"state": "NC"})
@@ -133,7 +131,7 @@ cities.list({"state": "NC"})
 ### Covered rate centers
 
 ```python
-from iris_sdk import CoveredRateCenters
+from bandwidth_numbers import CoveredRateCenters
 
 rate_centers = CoveredRateCenters(client=client)
 rate_centers.list({"page": 1, "size": 10})
@@ -421,7 +419,7 @@ portin.loas.metadata.delete()
 ### Rate Centers
 
 ```python
-from iris_sdk import RateCenters
+from bandwidth_numbers import RateCenters
 rc = RateCenters(client=client)
 centers = rc.list({"state": "CA", "available": "true"})
 ```
@@ -607,7 +605,7 @@ subscription.delete()
 #### Getting a phone number
 
 ```python
-from iris_sdk import Tns
+from bandwidth_numbers import Tns
 
 tns = Tns(client=client)
 tn = tns.get(id)
diff --git a/bandwidth_numbers/__init__.py b/bandwidth_numbers/__init__.py
new file mode 100644
index 0000000..6f41142
--- /dev/null
+++ b/bandwidth_numbers/__init__.py
@@ -0,0 +1,11 @@
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
+from bandwidth_numbers.models.cities import Cities
+from bandwidth_numbers.models.covered_rate_centers import CoveredRateCenters
+from bandwidth_numbers.models.rate_centers import RateCenters
+from bandwidth_numbers.models.tns import Tns
+from bandwidth_numbers.models.users import Users
+from bandwidth_numbers.utils.rest import RestError
+
+__all__ = ["Client", "Account", "Tns", "Users", "Cities", "RateCenters",
+    "RestError", "CoveredRateCenters", ]
diff --git a/iris_sdk/client.py b/bandwidth_numbers/client.py
similarity index 93%
rename from iris_sdk/client.py
rename to bandwidth_numbers/client.py
index 91dfa5e..54b4e2d 100644
--- a/iris_sdk/client.py
+++ b/bandwidth_numbers/client.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.utils.config import Config
-from iris_sdk.utils.rest import RestClient
+from bandwidth_numbers.utils.config import Config
+from bandwidth_numbers.utils.rest import RestClient
 
 class Client(object):
 
diff --git a/iris_sdk/include/__init__.py b/bandwidth_numbers/include/__init__.py
similarity index 100%
rename from iris_sdk/include/__init__.py
rename to bandwidth_numbers/include/__init__.py
diff --git a/iris_sdk/include/xml_consts.py b/bandwidth_numbers/include/xml_consts.py
similarity index 100%
rename from iris_sdk/include/xml_consts.py
rename to bandwidth_numbers/include/xml_consts.py
diff --git a/iris_sdk/models/__init__.py b/bandwidth_numbers/models/__init__.py
similarity index 100%
rename from iris_sdk/models/__init__.py
rename to bandwidth_numbers/models/__init__.py
diff --git a/iris_sdk/models/account.py b/bandwidth_numbers/models/account.py
similarity index 70%
rename from iris_sdk/models/account.py
rename to bandwidth_numbers/models/account.py
index bb773e4..8a908fd 100644
--- a/iris_sdk/models/account.py
+++ b/bandwidth_numbers/models/account.py
@@ -3,27 +3,27 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.account_users import AccountUsers
-from iris_sdk.models.available_npa_nxx import AvailableNpaNxx
-from iris_sdk.models.available_numbers import AvailableNumbers
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.account import AccountData
-from iris_sdk.models.disc_numbers import DiscNumbers
-from iris_sdk.models.disconnects import Disconnects
-from iris_sdk.models.in_service_numbers import InServiceNumbers
-from iris_sdk.models.line_option_orders import LineOptionOrder
-from iris_sdk.models.import_tn_checker import ImportTnChecker
-from iris_sdk.models.lnpchecker import LnpChecker
-from iris_sdk.models.orders import Orders
-from iris_sdk.models.lidbs import Lidbs
-from iris_sdk.models.dldas import Dldas
-from iris_sdk.models.subscriptions import Subscriptions
-from iris_sdk.models.portins import PortIns
-from iris_sdk.models.portouts import PortOuts
-from iris_sdk.models.reservation import Reservation
-from iris_sdk.models.site_hosts import SiteHosts
-from iris_sdk.models.sites import Sites
-from iris_sdk.models.tn_option_orders import TnOptionOrders
+from bandwidth_numbers.models.account_users import AccountUsers
+from bandwidth_numbers.models.available_npa_nxx import AvailableNpaNxx
+from bandwidth_numbers.models.available_numbers import AvailableNumbers
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.account import AccountData
+from bandwidth_numbers.models.disc_numbers import DiscNumbers
+from bandwidth_numbers.models.disconnects import Disconnects
+from bandwidth_numbers.models.in_service_numbers import InServiceNumbers
+from bandwidth_numbers.models.line_option_orders import LineOptionOrder
+from bandwidth_numbers.models.import_tn_checker import ImportTnChecker
+from bandwidth_numbers.models.lnpchecker import LnpChecker
+from bandwidth_numbers.models.orders import Orders
+from bandwidth_numbers.models.lidbs import Lidbs
+from bandwidth_numbers.models.dldas import Dldas
+from bandwidth_numbers.models.subscriptions import Subscriptions
+from bandwidth_numbers.models.portins import PortIns
+from bandwidth_numbers.models.portouts import PortOuts
+from bandwidth_numbers.models.reservation import Reservation
+from bandwidth_numbers.models.site_hosts import SiteHosts
+from bandwidth_numbers.models.sites import Sites
+from bandwidth_numbers.models.tn_option_orders import TnOptionOrders
 
 XPATH_ACCOUNT = "/accounts/{}"
 
diff --git a/iris_sdk/models/account_users.py b/bandwidth_numbers/models/account_users.py
similarity index 73%
rename from iris_sdk/models/account_users.py
rename to bandwidth_numbers/models/account_users.py
index 3a560ba..2699559 100644
--- a/iris_sdk/models/account_users.py
+++ b/bandwidth_numbers/models/account_users.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.account_users import AccountUsersData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.account_users import AccountUsersData
 
 XML_NAME_USERS_ACC = "Users"
 XPATH_USERS_ACC = "/users"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         AccountUsersData.__init__(self)
 
     def list(self):
-        return self._get_data().user
\ No newline at end of file
+        return self._get_data().user
diff --git a/iris_sdk/models/activation_status.py b/bandwidth_numbers/models/activation_status.py
similarity index 77%
rename from iris_sdk/models/activation_status.py
rename to bandwidth_numbers/models/activation_status.py
index de375dd..1aeb54e 100644
--- a/iris_sdk/models/activation_status.py
+++ b/bandwidth_numbers/models/activation_status.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.activation_status import ActivationStatusData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.activation_status import ActivationStatusData
 
 XPATH_ACTIVATION_STATUS = "/activationStatus"
 
@@ -24,4 +24,4 @@ def get(self):
 
     def save(self):
         self.id = 1
-        self._save()
\ No newline at end of file
+        self._save()
diff --git a/iris_sdk/models/available_npa_nxx.py b/bandwidth_numbers/models/available_npa_nxx.py
similarity index 78%
rename from iris_sdk/models/available_npa_nxx.py
rename to bandwidth_numbers/models/available_npa_nxx.py
index e78ae64..6c8b106 100644
--- a/iris_sdk/models/available_npa_nxx.py
+++ b/bandwidth_numbers/models/available_npa_nxx.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.available_npa_nxx import AvailableNpaNxxData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.available_npa_nxx import AvailableNpaNxxData
 
 XML_NAME_AVAILABLE_NPA_NXX = "SearchResultForAvailableNpaNxx"
 XPATH_AVAILABLE_NPA_NXX = "/availableNpaNxx"
@@ -22,4 +22,4 @@ def __init__(self, parent=None, client=None):
 
     def list(self, params):
         return self.get(params=params).available_npa_nxx_list.\
-            available_npa_nxx
\ No newline at end of file
+            available_npa_nxx
diff --git a/iris_sdk/models/available_numbers.py b/bandwidth_numbers/models/available_numbers.py
similarity index 72%
rename from iris_sdk/models/available_numbers.py
rename to bandwidth_numbers/models/available_numbers.py
index 4145e10..a382bb2 100644
--- a/iris_sdk/models/available_numbers.py
+++ b/bandwidth_numbers/models/available_numbers.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.include.xml_consts import XML_PARAM_TN_DETAIL, XML_TRUE
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.available_numbers import AvailableNumbersData
+from bandwidth_numbers.include.xml_consts import XML_PARAM_TN_DETAIL, XML_TRUE
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.available_numbers import AvailableNumbersData
 
 XML_NAME_AVAILABLE_NUMBERS = "SearchResult"
 XPATH_AVAILABLE_NUMBERS = "/availableNumbers"
@@ -26,4 +26,4 @@ def list(self, params):
         if params.get(XML_PARAM_TN_DETAIL, "") == XML_TRUE:
             return self.telephone_number_detail_list.telephone_number_detail
         else:
-            return self.telephone_number_list.telephone_number
\ No newline at end of file
+            return self.telephone_number_list.telephone_number
diff --git a/iris_sdk/models/base_resource.py b/bandwidth_numbers/models/base_resource.py
similarity index 98%
rename from iris_sdk/models/base_resource.py
rename to bandwidth_numbers/models/base_resource.py
index f3d55ed..64e9d03 100644
--- a/iris_sdk/models/base_resource.py
+++ b/bandwidth_numbers/models/base_resource.py
@@ -4,9 +4,9 @@
 from io import BytesIO
 from xml.etree.ElementTree import Element, ElementTree, fromstring, SubElement
 
-from iris_sdk.models.maps.base_map import BaseMap
-from iris_sdk.utils.rest import HTTP_OK
-from iris_sdk.utils.strings import Converter
+from bandwidth_numbers.models.maps.base_map import BaseMap
+from bandwidth_numbers.utils.rest import HTTP_OK
+from bandwidth_numbers.utils.strings import Converter
 
 BASE_MAP_SUFFIX = "Map"
 BASE_PROP_CLIENT = "client"
diff --git a/iris_sdk/models/cities.py b/bandwidth_numbers/models/cities.py
similarity index 72%
rename from iris_sdk/models/cities.py
rename to bandwidth_numbers/models/cities.py
index a3f987b..eb7aa2a 100644
--- a/iris_sdk/models/cities.py
+++ b/bandwidth_numbers/models/cities.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.cities import CitiesData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.cities import CitiesData
 
 XML_NAME_CITIES = "CityResponse"
 XPATH_RATE_CITIES = "/cities"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         CitiesData.__init__(self)
 
     def list(self, params):
-        return self._get_data(params=params).cities.city
\ No newline at end of file
+        return self._get_data(params=params).cities.city
diff --git a/iris_sdk/models/covered_rate_centers.py b/bandwidth_numbers/models/covered_rate_centers.py
similarity index 74%
rename from iris_sdk/models/covered_rate_centers.py
rename to bandwidth_numbers/models/covered_rate_centers.py
index c6bdd10..9dbc5cf 100644
--- a/iris_sdk/models/covered_rate_centers.py
+++ b/bandwidth_numbers/models/covered_rate_centers.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.covered_rate_centers import CoveredRateCentersData
-from iris_sdk.models.rate_center import RateCenter
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.covered_rate_centers import CoveredRateCentersData
+from bandwidth_numbers.models.rate_center import RateCenter
 
 XPATH_COVERED_RATE_CENTERS = "/coveredratecenters"
 
@@ -23,4 +23,4 @@ def get(self, id):
         return RateCenter(self).get(id)
 
     def list(self, params):
-        return self._get_data(params=params).covered_rate_center
\ No newline at end of file
+        return self._get_data(params=params).covered_rate_center
diff --git a/iris_sdk/models/data/__init__.py b/bandwidth_numbers/models/data/__init__.py
similarity index 100%
rename from iris_sdk/models/data/__init__.py
rename to bandwidth_numbers/models/data/__init__.py
diff --git a/bandwidth_numbers/models/data/a2p_settings.py b/bandwidth_numbers/models/data/a2p_settings.py
new file mode 100644
index 0000000..8939627
--- /dev/null
+++ b/bandwidth_numbers/models/data/a2p_settings.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+  
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.a2p_settings import A2pSettingsMap
+
+class A2pSettings(A2pSettingsMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/account.py b/bandwidth_numbers/models/data/account.py
new file mode 100644
index 0000000..17646eb
--- /dev/null
+++ b/bandwidth_numbers/models/data/account.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.data.contact import Contact
+from bandwidth_numbers.models.data.tier_list import TierList
+from bandwidth_numbers.models.maps.account import AccountMap
+
+class AccountData(AccountMap, BaseData):
+
+    def __init__(self):
+        self.address = Address()
+        self.contact = Contact()
+        self.tiers = TierList()
diff --git a/bandwidth_numbers/models/data/account_user.py b/bandwidth_numbers/models/data/account_user.py
new file mode 100644
index 0000000..8a00f4a
--- /dev/null
+++ b/bandwidth_numbers/models/data/account_user.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.roles_list import RolesList
+from bandwidth_numbers.models.maps.account_user import AccountUserMap
+
+class AccountUser(AccountUserMap, BaseData):
+
+    def __init__(self):
+        self.roles = RolesList()
diff --git a/bandwidth_numbers/models/data/account_users.py b/bandwidth_numbers/models/data/account_users.py
new file mode 100644
index 0000000..59ee1aa
--- /dev/null
+++ b/bandwidth_numbers/models/data/account_users.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.account_user import AccountUser
+from bandwidth_numbers.models.maps.account_users import AccountUsersMap
+
+class AccountUsersData(AccountUsersMap, BaseData):
+
+    def __init__(self):
+        self.user = BaseResourceList(AccountUser)
diff --git a/iris_sdk/models/data/activation_status.py b/bandwidth_numbers/models/data/activation_status.py
similarity index 50%
rename from iris_sdk/models/data/activation_status.py
rename to bandwidth_numbers/models/data/activation_status.py
index 61430ad..e9ca79d 100644
--- a/iris_sdk/models/data/activation_status.py
+++ b/bandwidth_numbers/models/data/activation_status.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.activation_status import ActivationStatusMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.activation_status import ActivationStatusMap
 
 class ActivationStatusData(ActivationStatusMap, BaseData):
 
     def __init__(self):
         self.activated_telephone_numbers_list = TelephoneNumberList()
-        self.not_yet_activated_telephone_numbers_list = TelephoneNumberList()
\ No newline at end of file
+        self.not_yet_activated_telephone_numbers_list = TelephoneNumberList()
diff --git a/bandwidth_numbers/models/data/address.py b/bandwidth_numbers/models/data/address.py
new file mode 100644
index 0000000..06803c3
--- /dev/null
+++ b/bandwidth_numbers/models/data/address.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.address import AddressMap
+
+class Address(AddressMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/available_npa_nxx.py b/bandwidth_numbers/models/data/available_npa_nxx.py
new file mode 100644
index 0000000..b03d06b
--- /dev/null
+++ b/bandwidth_numbers/models/data/available_npa_nxx.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.available_npa_nxx_list import AvailableNpaNxxList
+from bandwidth_numbers.models.maps.available_npa_nxx import AvailableNpaNxxMap
+
+class AvailableNpaNxxData(AvailableNpaNxxMap, BaseData):
+
+    def __init__(self):
+        self.available_npa_nxx_list = AvailableNpaNxxList()
diff --git a/bandwidth_numbers/models/data/available_npa_nxx_list.py b/bandwidth_numbers/models/data/available_npa_nxx_list.py
new file mode 100644
index 0000000..2755ab5
--- /dev/null
+++ b/bandwidth_numbers/models/data/available_npa_nxx_list.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.npa_nxx import NpaNxx
+from bandwidth_numbers.models.maps.available_npa_nxx_list import AvailableNpaNxxListMap
+
+class AvailableNpaNxxList(AvailableNpaNxxListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.available_npa_nxx.items
+
+    def __init__(self):
+        self.available_npa_nxx = BaseResourceList(NpaNxx)
diff --git a/iris_sdk/models/data/available_numbers.py b/bandwidth_numbers/models/data/available_numbers.py
similarity index 51%
rename from iris_sdk/models/data/available_numbers.py
rename to bandwidth_numbers/models/data/available_numbers.py
index 01a368d..468cf66 100644
--- a/iris_sdk/models/data/available_numbers.py
+++ b/bandwidth_numbers/models/data/available_numbers.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.data.telephone_number_detail_list import \
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.data.telephone_number_detail_list import \
     TelephoneNumberDetailList
-from iris_sdk.models.maps.available_numbers import AvailableNumbersMap
+from bandwidth_numbers.models.maps.available_numbers import AvailableNumbersMap
 
 class AvailableNumbersData(AvailableNumbersMap):
 
@@ -17,4 +17,4 @@ def total_count(self, total_count):
 
     def __init__(self):
         self.telephone_number_detail_list = TelephoneNumberDetailList()
-        self.telephone_number_list = TelephoneNumberList()
\ No newline at end of file
+        self.telephone_number_list = TelephoneNumberList()
diff --git a/bandwidth_numbers/models/data/callback_subscription.py b/bandwidth_numbers/models/data/callback_subscription.py
new file mode 100644
index 0000000..4491dea
--- /dev/null
+++ b/bandwidth_numbers/models/data/callback_subscription.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.callback_subscription import CallbackSubscriptionMap
+
+class CallbackSubscription(CallbackSubscriptionMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/calling_name.py b/bandwidth_numbers/models/data/calling_name.py
new file mode 100644
index 0000000..fb223c8
--- /dev/null
+++ b/bandwidth_numbers/models/data/calling_name.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.calling_name import CallingNameMap
+
+class CallingName(CallingNameMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/cities.py b/bandwidth_numbers/models/data/cities.py
new file mode 100644
index 0000000..e073b07
--- /dev/null
+++ b/bandwidth_numbers/models/data/cities.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.cities_list import CitiesList
+from bandwidth_numbers.models.maps.cities import CitiesMap
+
+class CitiesData(CitiesMap, BaseData):
+
+    def __init__(self):
+        self.cities = CitiesList()
diff --git a/bandwidth_numbers/models/data/cities_list.py b/bandwidth_numbers/models/data/cities_list.py
new file mode 100644
index 0000000..b746a63
--- /dev/null
+++ b/bandwidth_numbers/models/data/cities_list.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.city import City
+from bandwidth_numbers.models.maps.cities_list import CitiesListMap
+
+class CitiesList(CitiesListMap, BaseData):
+
+    def __init__(self):
+        self.city = BaseResourceList(City)
diff --git a/bandwidth_numbers/models/data/cities_short_list.py b/bandwidth_numbers/models/data/cities_short_list.py
new file mode 100644
index 0000000..e49d13c
--- /dev/null
+++ b/bandwidth_numbers/models/data/cities_short_list.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.cities_short_list import CitiesShortListMap
+
+class CitiesShortList(CitiesShortListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.city.items
+
+    def __init__(self):
+        self.city = BaseResourceSimpleList()
diff --git a/iris_sdk/models/data/city.py b/bandwidth_numbers/models/data/city.py
similarity index 53%
rename from iris_sdk/models/data/city.py
rename to bandwidth_numbers/models/data/city.py
index 3f942c2..d306500 100644
--- a/iris_sdk/models/data/city.py
+++ b/bandwidth_numbers/models/data/city.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.city import CityMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.city import CityMap
 
 class City(CityMap, BaseData):
 
@@ -10,4 +10,4 @@ def city(self):
         return self.name
     @city.setter
     def city(self, city):
-        self.name = city
\ No newline at end of file
+        self.name = city
diff --git a/iris_sdk/models/data/completed_numbers.py b/bandwidth_numbers/models/data/completed_numbers.py
similarity index 58%
rename from iris_sdk/models/data/completed_numbers.py
rename to bandwidth_numbers/models/data/completed_numbers.py
index f493838..1f39038 100644
--- a/iris_sdk/models/data/completed_numbers.py
+++ b/bandwidth_numbers/models/data/completed_numbers.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.data.full_numbers import FullNumbers
-from iris_sdk.models.maps.completed_numbers import CompletedNumbersMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.data.full_numbers import FullNumbers
+from bandwidth_numbers.models.maps.completed_numbers import CompletedNumbersMap
 
 class CompletedNumbers(CompletedNumbersMap, BaseData):
 
diff --git a/bandwidth_numbers/models/data/contact.py b/bandwidth_numbers/models/data/contact.py
new file mode 100644
index 0000000..38fec62
--- /dev/null
+++ b/bandwidth_numbers/models/data/contact.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.contact import ContactMap
+
+class Contact(ContactMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/covered_rate_centers.py b/bandwidth_numbers/models/data/covered_rate_centers.py
new file mode 100644
index 0000000..086a30d
--- /dev/null
+++ b/bandwidth_numbers/models/data/covered_rate_centers.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.rate_center import RateCenter
+from bandwidth_numbers.models.maps.covered_rate_centers import CoveredRateCentersMap
+
+class CoveredRateCentersData(CoveredRateCentersMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.links = Links()
+        self.covered_rate_center = BaseResourceList(RateCenter, parent)
diff --git a/bandwidth_numbers/models/data/disc_numbers.py b/bandwidth_numbers/models/data/disc_numbers.py
new file mode 100644
index 0000000..3240c8d
--- /dev/null
+++ b/bandwidth_numbers/models/data/disc_numbers.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.disc_numbers import DiscNumbersMap
+
+class DiscNumbersData(DiscNumbersMap, BaseData):
+
+    def __init__(self):
+        self.links = Links()
+        self.telephone_numbers = TelephoneNumberList()
diff --git a/iris_sdk/models/data/disconnect.py b/bandwidth_numbers/models/data/disconnect.py
similarity index 58%
rename from iris_sdk/models/data/disconnect.py
rename to bandwidth_numbers/models/data/disconnect.py
index 8eeea3f..ba7e42d 100644
--- a/iris_sdk/models/data/disconnect.py
+++ b/bandwidth_numbers/models/data/disconnect.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.error_list import ErrorList
-from iris_sdk.models.data.disconnect_telephone_number_order_type import \
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.error_list import ErrorList
+from bandwidth_numbers.models.data.disconnect_telephone_number_order_type import \
     DisconnectTelephoneNumberOrderType
-from iris_sdk.models.telephone_number import TelephoneNumber
-from iris_sdk.models.maps.disconnect import DisconnectMap
+from bandwidth_numbers.models.telephone_number import TelephoneNumber
+from bandwidth_numbers.models.maps.disconnect import DisconnectMap
 
 class DisconnectData(DisconnectMap, BaseData):
 
diff --git a/bandwidth_numbers/models/data/disconnect_telephone_number_order_type.py b/bandwidth_numbers/models/data/disconnect_telephone_number_order_type.py
new file mode 100644
index 0000000..7a84a5e
--- /dev/null
+++ b/bandwidth_numbers/models/data/disconnect_telephone_number_order_type.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.disconnect_telephone_number_order_type import \
+    DisconnectTelephoneNumberOrderTypeMap
+
+class DisconnectTelephoneNumberOrderType(
+        DisconnectTelephoneNumberOrderTypeMap, BaseData):
+
+    def __init__(self):
+        self.telephone_number_list = TelephoneNumberList()
diff --git a/bandwidth_numbers/models/data/disconnects.py b/bandwidth_numbers/models/data/disconnects.py
new file mode 100644
index 0000000..ad64a07
--- /dev/null
+++ b/bandwidth_numbers/models/data/disconnects.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.maps.disconnects import DisconnectsMap
+from bandwidth_numbers.models.disconnect import Disconnect
+
+class DisconnectsData(DisconnectsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.links = Links()
+        self.order_id_user_id_date = BaseResourceList(Disconnect, parent)
diff --git a/iris_sdk/models/data/dlda.py b/bandwidth_numbers/models/data/dlda.py
similarity index 52%
rename from iris_sdk/models/data/dlda.py
rename to bandwidth_numbers/models/data/dlda.py
index 79fc796..5a09539 100644
--- a/iris_sdk/models/data/dlda.py
+++ b/bandwidth_numbers/models/data/dlda.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.dlda import DldaMap
-from iris_sdk.models.data.dlda_tn_groups import DldaTnGroups
-from iris_sdk.models.data.error_list import ErrorList
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.dlda import DldaMap
+from bandwidth_numbers.models.data.dlda_tn_groups import DldaTnGroups
+from bandwidth_numbers.models.data.error_list import ErrorList
 
 class DldaData(DldaMap, BaseData):
 
@@ -16,4 +16,4 @@ def count_of_tns(self, count_of_tns):
 
     def __init__(self):
         self.dlda_tn_groups = DldaTnGroups()
-        self.error_list = ErrorList()
\ No newline at end of file
+        self.error_list = ErrorList()
diff --git a/bandwidth_numbers/models/data/dlda_order_response.py b/bandwidth_numbers/models/data/dlda_order_response.py
new file mode 100644
index 0000000..8d7ab5a
--- /dev/null
+++ b/bandwidth_numbers/models/data/dlda_order_response.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.dlda_order_response import DldaOrderResponseMap
+
+class DldaOrderResponseData(DldaOrderResponseMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/dlda_tn_group.py b/bandwidth_numbers/models/data/dlda_tn_group.py
new file mode 100644
index 0000000..1cd646c
--- /dev/null
+++ b/bandwidth_numbers/models/data/dlda_tn_group.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.dlda_tn_group import DldaTnGroupMap
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.data.listing_name import ListingName
+
+class DldaTnGroupData(DldaTnGroupMap, BaseData):
+
+    def __init__(self):
+        self.telephone_numbers = TelephoneNumberList()
+        self.listing_name = ListingName()
+        self.address = Address()
diff --git a/bandwidth_numbers/models/data/dlda_tn_groups.py b/bandwidth_numbers/models/data/dlda_tn_groups.py
new file mode 100644
index 0000000..57496a9
--- /dev/null
+++ b/bandwidth_numbers/models/data/dlda_tn_groups.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.dlda_tn_groups import DldaTnGroupsMap
+from bandwidth_numbers.models.data.dlda_tn_group import DldaTnGroupData
+
+class DldaTnGroups(DldaTnGroupsMap, BaseData):
+
+    def __init__(self):
+        self.dlda_tn_group = BaseResourceList(DldaTnGroupData)
diff --git a/bandwidth_numbers/models/data/dldas.py b/bandwidth_numbers/models/data/dldas.py
new file mode 100644
index 0000000..2bb89ab
--- /dev/null
+++ b/bandwidth_numbers/models/data/dldas.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.dldas import DldasMap
+from bandwidth_numbers.models.dlda import Dlda
+
+class DldasData(DldasMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.order_id_user_id_date = BaseResourceList(Dlda, parent)
diff --git a/bandwidth_numbers/models/data/email_subscription.py b/bandwidth_numbers/models/data/email_subscription.py
new file mode 100644
index 0000000..f07f8bb
--- /dev/null
+++ b/bandwidth_numbers/models/data/email_subscription.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.email_subscription import EmailSubscriptionMap
+
+class EmailSubscription(EmailSubscriptionMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/error.py b/bandwidth_numbers/models/data/error.py
new file mode 100644
index 0000000..57794b8
--- /dev/null
+++ b/bandwidth_numbers/models/data/error.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.error import ErrorMap
+
+class Error(ErrorMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/error_list.py b/bandwidth_numbers/models/data/error_list.py
new file mode 100644
index 0000000..3bec718
--- /dev/null
+++ b/bandwidth_numbers/models/data/error_list.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.error import Error
+from bandwidth_numbers.models.maps.error_list import ErrorListMap
+
+class ErrorList(ErrorListMap, BaseData):
+
+    def __init__(self):
+        self.error = BaseResourceList(Error)
diff --git a/bandwidth_numbers/models/data/feature_dlda.py b/bandwidth_numbers/models/data/feature_dlda.py
new file mode 100644
index 0000000..2ce4b39
--- /dev/null
+++ b/bandwidth_numbers/models/data/feature_dlda.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.data.listing_name import ListingName
+from bandwidth_numbers.models.maps.feature_dlda import FeatureDldaMap
+
+class FeatureDlda(FeatureDldaMap, BaseData):
+
+    def __init__(self):
+        self.address = Address()
+        self.listing_name = ListingName()
diff --git a/bandwidth_numbers/models/data/feature_lidb.py b/bandwidth_numbers/models/data/feature_lidb.py
new file mode 100644
index 0000000..e7eae57
--- /dev/null
+++ b/bandwidth_numbers/models/data/feature_lidb.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.feature_lidb import FeatureLidbMap
+
+class FeatureLidb(FeatureLidbMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/features.py b/bandwidth_numbers/models/data/features.py
new file mode 100644
index 0000000..e5d9c2e
--- /dev/null
+++ b/bandwidth_numbers/models/data/features.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.feature_dlda import FeatureDlda
+from bandwidth_numbers.models.data.feature_lidb import FeatureLidb
+from bandwidth_numbers.models.maps.features import FeaturesMap
+
+class Features(FeaturesMap, BaseData):
+
+    def __init__(self):
+        self.dlda = FeatureDlda()
+        self.lidb = FeatureLidb()
diff --git a/bandwidth_numbers/models/data/file_data.py b/bandwidth_numbers/models/data/file_data.py
new file mode 100644
index 0000000..bcf218e
--- /dev/null
+++ b/bandwidth_numbers/models/data/file_data.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.file_meta_data import FileMetaDataData
+from bandwidth_numbers.models.maps.file_data import FileDataMap
+
+class FileData(FileDataMap, BaseData):
+
+    def __init__(self):
+        self.file_meta_data = FileMetaDataData()
diff --git a/bandwidth_numbers/models/data/file_meta_data.py b/bandwidth_numbers/models/data/file_meta_data.py
new file mode 100644
index 0000000..e2edf23
--- /dev/null
+++ b/bandwidth_numbers/models/data/file_meta_data.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.file_meta_data import FileMetaDataMap
+
+class FileMetaDataData(FileMetaDataMap, BaseData):
+    pass
diff --git a/iris_sdk/models/data/full_numbers.py b/bandwidth_numbers/models/data/full_numbers.py
similarity index 66%
rename from iris_sdk/models/data/full_numbers.py
rename to bandwidth_numbers/models/data/full_numbers.py
index c85dd6b..f5feca4 100644
--- a/iris_sdk/models/data/full_numbers.py
+++ b/bandwidth_numbers/models/data/full_numbers.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.full_numbers import FullNumbersMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.full_numbers import FullNumbersMap
 
 class FullNumbers(FullNumbersMap, BaseData):
 
diff --git a/bandwidth_numbers/models/data/history.py b/bandwidth_numbers/models/data/history.py
new file mode 100644
index 0000000..8813e86
--- /dev/null
+++ b/bandwidth_numbers/models/data/history.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.order_history import OrderHistoryData
+from bandwidth_numbers.models.maps.history import HistoryMap
+
+class HistoryData(HistoryMap, BaseData):
+
+    def __init__(self):
+        self.order_history = BaseResourceList(OrderHistoryData)
diff --git a/bandwidth_numbers/models/data/host.py b/bandwidth_numbers/models/data/host.py
new file mode 100644
index 0000000..ab6246c
--- /dev/null
+++ b/bandwidth_numbers/models/data/host.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.host import HostMap
+
+class Host(HostMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/hosts.py b/bandwidth_numbers/models/data/hosts.py
new file mode 100644
index 0000000..04f1456
--- /dev/null
+++ b/bandwidth_numbers/models/data/hosts.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.host import Host
+from bandwidth_numbers.models.maps.hosts import HostsMap
+
+class Hosts(HostsMap, BaseData):
+
+    @property
+    def items(self):
+        return self.host.items
+
+    def __init__(self):
+        self.host = BaseResourceList(Host)
+
+    def add(self):
+        return self.host.add()
diff --git a/bandwidth_numbers/models/data/import_tn_checker.py b/bandwidth_numbers/models/data/import_tn_checker.py
new file mode 100644
index 0000000..b00850a
--- /dev/null
+++ b/bandwidth_numbers/models/data/import_tn_checker.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.import_tn_checker_list import TelephoneNumbers
+from bandwidth_numbers.models.maps.import_tn_checker import ImportTnCheckerMap
+
+class ImportTnCheckerData(ImportTnCheckerMap, BaseData):
+
+    def __init__(self):
+        self.telephone_numbers = TelephoneNumbers()
diff --git a/iris_sdk/models/data/import_tn_checker_list.py b/bandwidth_numbers/models/data/import_tn_checker_list.py
similarity index 67%
rename from iris_sdk/models/data/import_tn_checker_list.py
rename to bandwidth_numbers/models/data/import_tn_checker_list.py
index 82f9e14..4fde15f 100644
--- a/iris_sdk/models/data/import_tn_checker_list.py
+++ b/bandwidth_numbers/models/data/import_tn_checker_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.import_tn_checker_list import TnListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.import_tn_checker_list import TnListMap
 
 class TelephoneNumbers(TnListMap, BaseData):
 
diff --git a/iris_sdk/models/data/import_tn_checker_payload.py b/bandwidth_numbers/models/data/import_tn_checker_payload.py
similarity index 59%
rename from iris_sdk/models/data/import_tn_checker_payload.py
rename to bandwidth_numbers/models/data/import_tn_checker_payload.py
index bc0a17f..fe5e1f9 100644
--- a/iris_sdk/models/data/import_tn_checker_payload.py
+++ b/bandwidth_numbers/models/data/import_tn_checker_payload.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.data.import_tn_checker_list import TelephoneNumbers
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.data.import_tn_checker_list import TelephoneNumbers
 
 class ImportTnCheckerResponse(TelephoneNumbers, BaseData):
 
diff --git a/bandwidth_numbers/models/data/import_tn_checker_response.py b/bandwidth_numbers/models/data/import_tn_checker_response.py
new file mode 100644
index 0000000..6b8bb91
--- /dev/null
+++ b/bandwidth_numbers/models/data/import_tn_checker_response.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.import_tn_checker_payload import ImportTnCheckerResponse
+from bandwidth_numbers.models.maps.import_tn_checker_response import ImportTnCheckerResponseMap
+
+class ImportTnCheckerResponseData(ImportTnCheckerResponseMap, BaseData):
+
+    def __init__(self):
+        self.import_tn_checker_payload = ImportTnCheckerResponse()
diff --git a/bandwidth_numbers/models/data/in_service_numbers.py b/bandwidth_numbers/models/data/in_service_numbers.py
new file mode 100644
index 0000000..4fdf598
--- /dev/null
+++ b/bandwidth_numbers/models/data/in_service_numbers.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.in_service_numbers import InServiceNumbersMap
+
+class InServiceNumbersData(InServiceNumbersMap, BaseData):
+
+    def __init__(self):
+        self.links = Links()
+        self.telephone_numbers = TelephoneNumberList()
diff --git a/iris_sdk/models/data/lidb.py b/bandwidth_numbers/models/data/lidb.py
similarity index 50%
rename from iris_sdk/models/data/lidb.py
rename to bandwidth_numbers/models/data/lidb.py
index fd021ec..9beebca 100644
--- a/iris_sdk/models/data/lidb.py
+++ b/bandwidth_numbers/models/data/lidb.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.lidb import LidbMap
-from iris_sdk.models.data.lidb_tn_groups import LidbTnGroups
-from iris_sdk.models.data.error_list import ErrorList
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.lidb import LidbMap
+from bandwidth_numbers.models.data.lidb_tn_groups import LidbTnGroups
+from bandwidth_numbers.models.data.error_list import ErrorList
 
 class LidbData(LidbMap, BaseData):
 
@@ -16,4 +16,4 @@ def count_of_tns(self, count_of_tns):
 
     def __init__(self):
         self.lidb_tn_groups = LidbTnGroups()
-        self.error_list = ErrorList()
\ No newline at end of file
+        self.error_list = ErrorList()
diff --git a/bandwidth_numbers/models/data/lidb_tn_group.py b/bandwidth_numbers/models/data/lidb_tn_group.py
new file mode 100644
index 0000000..515cbf0
--- /dev/null
+++ b/bandwidth_numbers/models/data/lidb_tn_group.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.lidb_tn_group import LidbTnGroupMap
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+
+class LidbTnGroupData(LidbTnGroupMap, BaseData):
+
+    def __init__(self):
+        self.telephone_numbers = TelephoneNumberList()
diff --git a/bandwidth_numbers/models/data/lidb_tn_groups.py b/bandwidth_numbers/models/data/lidb_tn_groups.py
new file mode 100644
index 0000000..c907fb9
--- /dev/null
+++ b/bandwidth_numbers/models/data/lidb_tn_groups.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.lidb_tn_group import LidbTnGroupData
+from bandwidth_numbers.models.maps.lidb_tn_groups import LidbTnGroupsMap
+
+class LidbTnGroups(LidbTnGroupsMap, BaseData):
+
+    def __init__(self):
+        self.lidb_tn_group = BaseResourceList(LidbTnGroupData)
diff --git a/bandwidth_numbers/models/data/lidbs.py b/bandwidth_numbers/models/data/lidbs.py
new file mode 100644
index 0000000..2b278a5
--- /dev/null
+++ b/bandwidth_numbers/models/data/lidbs.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.lidbs import LidbsMap
+from bandwidth_numbers.models.lidb import Lidb
+
+class LidbsData(LidbsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.order_id_user_id_date = BaseResourceList(Lidb, parent)
diff --git a/bandwidth_numbers/models/data/line_option_order.py b/bandwidth_numbers/models/data/line_option_order.py
new file mode 100644
index 0000000..28b8ecf
--- /dev/null
+++ b/bandwidth_numbers/models/data/line_option_order.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.line_option_order import LineOptionOrderMap
+from bandwidth_numbers.models.data.tn_line_options import TnLineOptionsData
+
+class LineOptionOrderData(LineOptionOrderMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.tn_line_options = BaseResourceList(TnLineOptionsData)
diff --git a/bandwidth_numbers/models/data/line_option_order_response.py b/bandwidth_numbers/models/data/line_option_order_response.py
new file mode 100644
index 0000000..212d07c
--- /dev/null
+++ b/bandwidth_numbers/models/data/line_option_order_response.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.line_option_order_response import LineOptionOrderResponseMap
+from bandwidth_numbers.models.data.line_options import LineOptionsData
+
+class LineOptionOrderResponseData(LineOptionOrderResponseMap, BaseData):
+
+    def __init__(self):
+        self.line_options = BaseResourceList(LineOptionsData)
diff --git a/bandwidth_numbers/models/data/line_options.py b/bandwidth_numbers/models/data/line_options.py
new file mode 100644
index 0000000..ee5e89a
--- /dev/null
+++ b/bandwidth_numbers/models/data/line_options.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.line_options import LineOptionsMap
+from bandwidth_numbers.models.data.error_list import ErrorList
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+
+class LineOptionsData(LineOptionsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.complete_numbers = TelephoneNumberList()
+        self.errors = ErrorList()
diff --git a/iris_sdk/models/data/links.py b/bandwidth_numbers/models/data/links.py
similarity index 83%
rename from iris_sdk/models/data/links.py
rename to bandwidth_numbers/models/data/links.py
index 1451f14..8d99d7c 100644
--- a/iris_sdk/models/data/links.py
+++ b/bandwidth_numbers/models/data/links.py
@@ -5,9 +5,9 @@
 
 from urllib.parse import parse_qs, urlparse
 
-from iris_sdk.include.xml_consts import XML_PARAM_PAGE
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.links import LinksMap
+from bandwidth_numbers.include.xml_consts import XML_PARAM_PAGE
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.links import LinksMap
 
 LINK_PREFIX = "<"
 LINK_SUFFIX = ">"
@@ -45,4 +45,4 @@ def next(self, next):
         try:
             self._next = params[XML_PARAM_PAGE]
         except:
-            self._next = None
\ No newline at end of file
+            self._next = None
diff --git a/bandwidth_numbers/models/data/listing_name.py b/bandwidth_numbers/models/data/listing_name.py
new file mode 100644
index 0000000..ad13bfd
--- /dev/null
+++ b/bandwidth_numbers/models/data/listing_name.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.listing_name import ListingNameMap
+
+class ListingName(ListingNameMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/lnp_losing_carriers.py b/bandwidth_numbers/models/data/lnp_losing_carriers.py
new file mode 100644
index 0000000..6461a6a
--- /dev/null
+++ b/bandwidth_numbers/models/data/lnp_losing_carriers.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.losing_carrier_tn_list import LosingCarrierTnList
+from bandwidth_numbers.models.maps.lnp_losing_carriers import LnpLosingCarriersMap
+
+class LnpLosingCarriers(LnpLosingCarriersMap, BaseData):
+
+    def __init__(self):
+        self.losing_carrier_tn_list = LosingCarrierTnList()
diff --git a/bandwidth_numbers/models/data/lnp_rate_center.py b/bandwidth_numbers/models/data/lnp_rate_center.py
new file mode 100644
index 0000000..a103624
--- /dev/null
+++ b/bandwidth_numbers/models/data/lnp_rate_center.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.tier_list import TierList
+from bandwidth_numbers.models.data.tn_list import TnList
+from bandwidth_numbers.models.maps.lnp_rate_center import LnpRateCenterMap
+
+class LnpRateCenter(LnpRateCenterMap, BaseData):
+
+    def __init__(self):
+        self.tiers = TierList()
+        self.tn_list = TnList()
diff --git a/iris_sdk/models/data/lnp_rate_center_list.py b/bandwidth_numbers/models/data/lnp_rate_center_list.py
similarity index 51%
rename from iris_sdk/models/data/lnp_rate_center_list.py
rename to bandwidth_numbers/models/data/lnp_rate_center_list.py
index 25e2701..f65685e 100644
--- a/iris_sdk/models/data/lnp_rate_center_list.py
+++ b/bandwidth_numbers/models/data/lnp_rate_center_list.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.lnp_rate_center import LnpRateCenter
-from iris_sdk.models.maps.lnp_rate_center_list import LnpRateCenterListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.lnp_rate_center import LnpRateCenter
+from bandwidth_numbers.models.maps.lnp_rate_center_list import LnpRateCenterListMap
 
 class LnpRateCenterList(LnpRateCenterListMap, BaseData):
 
@@ -11,4 +11,4 @@ def items(self):
         return self.rate_center_group.items
 
     def __init__(self):
-        self.rate_center_group = BaseResourceList(LnpRateCenter)
\ No newline at end of file
+        self.rate_center_group = BaseResourceList(LnpRateCenter)
diff --git a/bandwidth_numbers/models/data/lnpchecker.py b/bandwidth_numbers/models/data/lnpchecker.py
new file mode 100644
index 0000000..99f306c
--- /dev/null
+++ b/bandwidth_numbers/models/data/lnpchecker.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.tn_list import TnList
+from bandwidth_numbers.models.maps.lnpchecker import LnpCheckerMap
+
+class LnpCheckerData(LnpCheckerMap, BaseData):
+
+    def __init__(self):
+        self.tn_list = TnList()
diff --git a/bandwidth_numbers/models/data/lnpchecker_response.py b/bandwidth_numbers/models/data/lnpchecker_response.py
new file mode 100644
index 0000000..7481d66
--- /dev/null
+++ b/bandwidth_numbers/models/data/lnpchecker_response.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.lnp_losing_carriers import LnpLosingCarriers
+from bandwidth_numbers.models.data.lnp_rate_center_list import LnpRateCenterList
+from bandwidth_numbers.models.data.tn_list import TnList
+from bandwidth_numbers.models.maps.lnpchecker_response import LnpCheckerResponseMap
+
+class LnpCheckerResponseData(LnpCheckerResponseMap, BaseData):
+
+    def __init__(self):
+        self.partner_supported_rate_centers = LnpRateCenterList()
+        self.portable_numbers = TnList()
+        self.supported_losing_carriers = LnpLosingCarriers()
+        self.supported_rate_centers = LnpRateCenterList()
+        self.unsupported_rate_centers = LnpRateCenterList()
diff --git a/bandwidth_numbers/models/data/loas.py b/bandwidth_numbers/models/data/loas.py
new file mode 100644
index 0000000..05d2d91
--- /dev/null
+++ b/bandwidth_numbers/models/data/loas.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList, \
+    BaseResourceSimpleList
+from bandwidth_numbers.models.data.file_data import FileData
+from bandwidth_numbers.models.maps.loas import LoasMap
+
+class LoasData(LoasMap, BaseData):
+
+    def __init__(self):
+        self.file_data = BaseResourceList(FileData)
+        self.file_names = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/local_rate_center_list.py b/bandwidth_numbers/models/data/local_rate_center_list.py
new file mode 100644
index 0000000..57efec0
--- /dev/null
+++ b/bandwidth_numbers/models/data/local_rate_center_list.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.local_rate_center_list import LocalRateCenterListMap
+
+class LocalRateCenterList(LocalRateCenterListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.local_rate_center_id.items
+
+    def __init__(self):
+        self.local_rate_center_id = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/location.py b/bandwidth_numbers/models/data/location.py
new file mode 100644
index 0000000..1331d98
--- /dev/null
+++ b/bandwidth_numbers/models/data/location.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.tn_rate_centers_list import TnRateCentersList
+from bandwidth_numbers.models.maps.location import LocationMap
+
+class Location(LocationMap, BaseData):
+
+    def __init__(self):
+        self.rate_centers = BaseResourceList(TnRateCentersList)
diff --git a/bandwidth_numbers/models/data/losing_carrier_tn_list.py b/bandwidth_numbers/models/data/losing_carrier_tn_list.py
new file mode 100644
index 0000000..6698633
--- /dev/null
+++ b/bandwidth_numbers/models/data/losing_carrier_tn_list.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.tn_list import TnList
+from bandwidth_numbers.models.maps.losing_carrier_tn_list import LosingCarrierTnListMap
+
+class LosingCarrierTnList(LosingCarrierTnListMap, BaseData):
+
+    def __init__(self):
+        self.tn_list = TnList()
diff --git a/bandwidth_numbers/models/data/movetns.py b/bandwidth_numbers/models/data/movetns.py
new file mode 100644
index 0000000..ade8f0a
--- /dev/null
+++ b/bandwidth_numbers/models/data/movetns.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.movetns import MovetnsMap
+
+class MovetnsData(MovetnsMap, BaseData):
+
+    def __init__(self):
+        self.full_number = BaseResourceSimpleList()
+
+    def add(self, phone_number):
+        return self.full_number.add(phone_number)
diff --git a/bandwidth_numbers/models/data/note.py b/bandwidth_numbers/models/data/note.py
new file mode 100644
index 0000000..dc25956
--- /dev/null
+++ b/bandwidth_numbers/models/data/note.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.note import NoteMap
+
+class NoteData(NoteMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/notes.py b/bandwidth_numbers/models/data/notes.py
new file mode 100644
index 0000000..d8b07d2
--- /dev/null
+++ b/bandwidth_numbers/models/data/notes.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.note import Note
+from bandwidth_numbers.models.maps.notes import NotesMap
+
+class NotesData(NotesMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.note = BaseResourceList(Note, parent)
diff --git a/bandwidth_numbers/models/data/npa_nxx.py b/bandwidth_numbers/models/data/npa_nxx.py
new file mode 100644
index 0000000..e6af57c
--- /dev/null
+++ b/bandwidth_numbers/models/data/npa_nxx.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.npa_nxx import NpaNxxMap
+
+class NpaNxx(NpaNxxMap, BaseData):
+    pass
diff --git a/iris_sdk/models/data/npanxx_list.py b/bandwidth_numbers/models/data/npanxx_list.py
similarity index 53%
rename from iris_sdk/models/data/npanxx_list.py
rename to bandwidth_numbers/models/data/npanxx_list.py
index 82192a5..679de44 100644
--- a/iris_sdk/models/data/npanxx_list.py
+++ b/bandwidth_numbers/models/data/npanxx_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.npanxx_list import NpanxxListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.npanxx_list import NpanxxListMap
 
 class NpanxxList(NpanxxListMap, BaseData):
 
@@ -14,4 +14,4 @@ def npa_nxx_x(self):
         return self.npanxx
 
     def __init__(self):
-        self.npanxx = BaseResourceSimpleList()
\ No newline at end of file
+        self.npanxx = BaseResourceSimpleList()
diff --git a/iris_sdk/models/data/ord/__init__.py b/bandwidth_numbers/models/data/ord/__init__.py
similarity index 100%
rename from iris_sdk/models/data/ord/__init__.py
rename to bandwidth_numbers/models/data/ord/__init__.py
diff --git a/bandwidth_numbers/models/data/ord/area_code_search_order.py b/bandwidth_numbers/models/data/ord/area_code_search_order.py
new file mode 100644
index 0000000..d5e1ddc
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/area_code_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.area_code_search_order import \
+    AreaCodeSearchOrderMap
+
+class AreaCodeSearchOrder(AreaCodeSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/city_search_order.py b/bandwidth_numbers/models/data/ord/city_search_order.py
new file mode 100644
index 0000000..2af6a98
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/city_search_order.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.city_search_order import CitySearchOrderMap
+
+class CitySearchOrder(CitySearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/existing_search_order.py b/bandwidth_numbers/models/data/ord/existing_search_order.py
new file mode 100644
index 0000000..3504593
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/existing_search_order.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.ord.existing_search_order import \
+    ExistingSearchOrderMap
+from bandwidth_numbers.models.data.reservation_list import ReservationList
+
+class ExistingSearchOrder(ExistingSearchOrderMap, BaseData):
+
+    def __init__(self):
+        self.reservation_id_list = ReservationList()
+        self.telephone_number_list = TelephoneNumberList()
diff --git a/bandwidth_numbers/models/data/ord/lata_search_order.py b/bandwidth_numbers/models/data/ord/lata_search_order.py
new file mode 100644
index 0000000..01f312f
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/lata_search_order.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.lata_search_order import LataSearchOrderMap
+
+class LataSearchOrder(LataSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/npa_search_order.py b/bandwidth_numbers/models/data/ord/npa_search_order.py
new file mode 100644
index 0000000..e2b5752
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/npa_search_order.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.npa_search_order import NpaSearchOrderMap
+
+class NpaSearchOrder(NpaSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/rate_center_search_order.py b/bandwidth_numbers/models/data/ord/rate_center_search_order.py
new file mode 100644
index 0000000..125e0a7
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/rate_center_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.rate_center_search_order import \
+    RateCenterSearchOrderMap
+
+class RateCenterSearchOrder(RateCenterSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/state_search_order.py b/bandwidth_numbers/models/data/ord/state_search_order.py
new file mode 100644
index 0000000..7055cea
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/state_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.state_search_order import \
+    StateSearchOrderMap
+
+class StateSearchOrder(StateSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/vanity_search_order.py b/bandwidth_numbers/models/data/ord/vanity_search_order.py
new file mode 100644
index 0000000..b7420b9
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/vanity_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.vanity_search_order import \
+    VanitySearchOrderMap
+
+class VanitySearchOrder(VanitySearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/wildcard_search_order.py b/bandwidth_numbers/models/data/ord/wildcard_search_order.py
new file mode 100644
index 0000000..6004696
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/wildcard_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.wildcard_search_order import \
+    WildcardSearchOrderMap
+
+class WildcardSearchOrder(WildcardSearchOrderMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/ord/zip_search_order.py b/bandwidth_numbers/models/data/ord/zip_search_order.py
new file mode 100644
index 0000000..110000b
--- /dev/null
+++ b/bandwidth_numbers/models/data/ord/zip_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.ord.zip_search_order import \
+    ZipSearchOrderMap
+
+class ZipSearchOrder(ZipSearchOrderMap, BaseData):
+    pass
diff --git a/iris_sdk/models/data/order.py b/bandwidth_numbers/models/data/order.py
similarity index 59%
rename from iris_sdk/models/data/order.py
rename to bandwidth_numbers/models/data/order.py
index 69fef48..8ddd9f1 100644
--- a/iris_sdk/models/data/order.py
+++ b/bandwidth_numbers/models/data/order.py
@@ -1,29 +1,29 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.error_list import ErrorList
-from iris_sdk.models.data.ord.area_code_search_order import \
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.error_list import ErrorList
+from bandwidth_numbers.models.data.ord.area_code_search_order import \
     AreaCodeSearchOrder
-from iris_sdk.models.data.ord.city_search_order import \
+from bandwidth_numbers.models.data.ord.city_search_order import \
     CitySearchOrder
-from iris_sdk.models.data.ord.existing_search_order import \
+from bandwidth_numbers.models.data.ord.existing_search_order import \
     ExistingSearchOrder
-from iris_sdk.models.data.ord.lata_search_order import \
+from bandwidth_numbers.models.data.ord.lata_search_order import \
     LataSearchOrder
-from iris_sdk.models.data.ord.npa_search_order import \
+from bandwidth_numbers.models.data.ord.npa_search_order import \
     NpaSearchOrder
-from iris_sdk.models.data.ord.rate_center_search_order import \
+from bandwidth_numbers.models.data.ord.rate_center_search_order import \
     RateCenterSearchOrder
-from iris_sdk.models.data.ord.state_search_order import \
+from bandwidth_numbers.models.data.ord.state_search_order import \
     StateSearchOrder
-from iris_sdk.models.data.ord.vanity_search_order import \
+from bandwidth_numbers.models.data.ord.vanity_search_order import \
     VanitySearchOrder
-from iris_sdk.models.data.ord.wildcard_search_order import \
+from bandwidth_numbers.models.data.ord.wildcard_search_order import \
     WildcardSearchOrder
-from iris_sdk.models.data.ord.zip_search_order import \
+from bandwidth_numbers.models.data.ord.zip_search_order import \
     ZipSearchOrder
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.order import OrderMap
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.maps.order import OrderMap
 
 class OrderData(OrderMap, BaseData):
 
@@ -53,4 +53,4 @@ def add_reservation(self, id):
 
     def add_tn(self, number):
         return self.existing_telephone_number_order_type.\
-            telephone_number_list.add(number)
\ No newline at end of file
+            telephone_number_list.add(number)
diff --git a/bandwidth_numbers/models/data/order_history.py b/bandwidth_numbers/models/data/order_history.py
new file mode 100644
index 0000000..5d33bdd
--- /dev/null
+++ b/bandwidth_numbers/models/data/order_history.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.order_history import OrderHistoryMap
+
+class OrderHistoryData(OrderHistoryMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/order_response.py b/bandwidth_numbers/models/data/order_response.py
new file mode 100644
index 0000000..91fb142
--- /dev/null
+++ b/bandwidth_numbers/models/data/order_response.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.error_list import ErrorList
+from bandwidth_numbers.models.data.full_numbers import FullNumbers
+from bandwidth_numbers.models.data.completed_numbers import CompletedNumbers
+from bandwidth_numbers.models.maps.order_response import OrderResponseMap
+
+class OrderResponseData(OrderResponseMap, BaseData):
+
+    def __init__(self):
+        self.completed_numbers = CompletedNumbers()
+        self.error_list = ErrorList()
+        self.failed_numbers = FullNumbers()
diff --git a/bandwidth_numbers/models/data/order_tns.py b/bandwidth_numbers/models/data/order_tns.py
new file mode 100644
index 0000000..849d5bd
--- /dev/null
+++ b/bandwidth_numbers/models/data/order_tns.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.order_tns import OrderTnsMap
+
+class OrderTnsData(OrderTnsMap, BaseData):
+
+    def __init__(self):
+        self.telephone_number = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/orders.py b/bandwidth_numbers/models/data/orders.py
new file mode 100644
index 0000000..b699c6a
--- /dev/null
+++ b/bandwidth_numbers/models/data/orders.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.maps.orders import OrdersMap
+from bandwidth_numbers.models.order import Order
+
+class OrdersData(OrdersMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.links = Links()
+        self.order_id_user_id_date = BaseResourceList(Order, parent)
diff --git a/iris_sdk/models/data/permission.py b/bandwidth_numbers/models/data/permission.py
similarity index 52%
rename from iris_sdk/models/data/permission.py
rename to bandwidth_numbers/models/data/permission.py
index a4f867b..65692ab 100644
--- a/iris_sdk/models/data/permission.py
+++ b/bandwidth_numbers/models/data/permission.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.permission import PermissionMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.permission import PermissionMap
 
 class Permission(PermissionMap, BaseData):
 
@@ -10,4 +10,4 @@ def name(self):
         return self.permission_name
     @name.setter
     def name(self, name):
-        self.permission_name = name
\ No newline at end of file
+        self.permission_name = name
diff --git a/bandwidth_numbers/models/data/permissions_list.py b/bandwidth_numbers/models/data/permissions_list.py
new file mode 100644
index 0000000..b19f97b
--- /dev/null
+++ b/bandwidth_numbers/models/data/permissions_list.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.permission import Permission
+from bandwidth_numbers.models.maps.permissions_list import PermissionsListMap
+
+class PermissionsList(PermissionsListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.permission.items
+
+    def __init__(self):
+        self.permission = BaseResourceList(Permission)
diff --git a/iris_sdk/models/data/phone_number_list.py b/bandwidth_numbers/models/data/phone_number_list.py
similarity index 55%
rename from iris_sdk/models/data/phone_number_list.py
rename to bandwidth_numbers/models/data/phone_number_list.py
index 928ab7b..e16a4ac 100644
--- a/iris_sdk/models/data/phone_number_list.py
+++ b/bandwidth_numbers/models/data/phone_number_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.phone_number_list import PhoneNumberListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.phone_number_list import PhoneNumberListMap
 
 class PhoneNumberList(PhoneNumberListMap, BaseData):
 
@@ -13,4 +13,4 @@ def __init__(self):
         self.phone_number = BaseResourceSimpleList()
 
     def add(self, phone_number=None):
-        return self.phone_number.add(phone_number)
\ No newline at end of file
+        return self.phone_number.add(phone_number)
diff --git a/iris_sdk/models/data/portin.py b/bandwidth_numbers/models/data/portin.py
similarity index 53%
rename from iris_sdk/models/data/portin.py
rename to bandwidth_numbers/models/data/portin.py
index 75f6a69..e219801 100644
--- a/iris_sdk/models/data/portin.py
+++ b/bandwidth_numbers/models/data/portin.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.error import Error
-from iris_sdk.models.data.phone_number_list import PhoneNumberList
-from iris_sdk.models.data.subscriber import Subscriber
-from iris_sdk.models.data.wireless_info import WirelessInfo
-from iris_sdk.models.maps.portin import PortInMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.error import Error
+from bandwidth_numbers.models.data.phone_number_list import PhoneNumberList
+from bandwidth_numbers.models.data.subscriber import Subscriber
+from bandwidth_numbers.models.data.wireless_info import WirelessInfo
+from bandwidth_numbers.models.maps.portin import PortInMap
 
 class PortInData(PortInMap, BaseData):
 
@@ -24,4 +24,4 @@ def __init__(self):
         self.wireless_info = WirelessInfo()
 
     def add_tn(self, number):
-        return self.list_of_phone_numbers.items.add(number)
\ No newline at end of file
+        return self.list_of_phone_numbers.items.add(number)
diff --git a/bandwidth_numbers/models/data/portins.py b/bandwidth_numbers/models/data/portins.py
new file mode 100644
index 0000000..48bcb39
--- /dev/null
+++ b/bandwidth_numbers/models/data/portins.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.maps.portins import PortInsMap
+from bandwidth_numbers.models.portin import PortIn
+
+class PortInsData(PortInsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.links = Links()
+        self.lnp_port_info_for_given_status = BaseResourceList(PortIn, parent)
diff --git a/bandwidth_numbers/models/data/portouts.py b/bandwidth_numbers/models/data/portouts.py
new file mode 100644
index 0000000..5ea1045
--- /dev/null
+++ b/bandwidth_numbers/models/data/portouts.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.maps.portins import PortInsMap
+from bandwidth_numbers.models.portout import PortOut
+
+class PortOutsData(PortInsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.links = Links()
+        self.lnp_port_info_for_given_status = BaseResourceList(PortOut, parent)
diff --git a/bandwidth_numbers/models/data/rate_center.py b/bandwidth_numbers/models/data/rate_center.py
new file mode 100644
index 0000000..d424e1b
--- /dev/null
+++ b/bandwidth_numbers/models/data/rate_center.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.cities_short_list import CitiesShortList
+from bandwidth_numbers.models.data.local_rate_center_list import LocalRateCenterList
+from bandwidth_numbers.models.data.npanxx_list import NpanxxList
+from bandwidth_numbers.models.data.tier_list import TierList
+from bandwidth_numbers.models.data.zip_code_list import ZipCodeList
+from bandwidth_numbers.models.maps.rate_center import RateCenterMap
+
+class RateCenterData(RateCenterMap, BaseData):
+
+    def __init__(self):
+        self.cities = CitiesShortList()
+        self.local_rate_centers = LocalRateCenterList()
+        self.npa_nxx_xs = NpanxxList()
+        self.tiers = TierList()
+        self.zip_codes = ZipCodeList()
diff --git a/iris_sdk/models/data/rate_centers.py b/bandwidth_numbers/models/data/rate_centers.py
similarity index 52%
rename from iris_sdk/models/data/rate_centers.py
rename to bandwidth_numbers/models/data/rate_centers.py
index 0d4bbf1..8594a32 100644
--- a/iris_sdk/models/data/rate_centers.py
+++ b/bandwidth_numbers/models/data/rate_centers.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.rate_centers_list import RateCentersList
-from iris_sdk.models.maps.rate_centers import RateCentersMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.rate_centers_list import RateCentersList
+from bandwidth_numbers.models.maps.rate_centers import RateCentersMap
 
 class RateCentersData(RateCentersMap, BaseData):
 
@@ -14,4 +14,4 @@ def total_count(self, total_count):
         self.result_count = total_count
 
     def __init__(self):
-        self.rate_centers = RateCentersList()
\ No newline at end of file
+        self.rate_centers = RateCentersList()
diff --git a/bandwidth_numbers/models/data/rate_centers_list.py b/bandwidth_numbers/models/data/rate_centers_list.py
new file mode 100644
index 0000000..d5bfe56
--- /dev/null
+++ b/bandwidth_numbers/models/data/rate_centers_list.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.rate_center import RateCenterData
+from bandwidth_numbers.models.maps.rate_centers_list import RateCentersListMap
+
+class RateCentersList(RateCentersListMap, BaseData):
+
+    def __init__(self):
+        self.rate_center = BaseResourceList(RateCenterData)
diff --git a/iris_sdk/models/data/reservation.py b/bandwidth_numbers/models/data/reservation.py
similarity index 54%
rename from iris_sdk/models/data/reservation.py
rename to bandwidth_numbers/models/data/reservation.py
index 71485a0..122452b 100644
--- a/iris_sdk/models/data/reservation.py
+++ b/bandwidth_numbers/models/data/reservation.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.reservation import ReservationMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.reservation import ReservationMap
 
 class ReservationData(ReservationMap, BaseData):
 
@@ -10,4 +10,4 @@ def account(self):
         return self.account_id
     @account.setter
     def account(self, account):
-        self.account_id = account
\ No newline at end of file
+        self.account_id = account
diff --git a/iris_sdk/models/data/reservation_list.py b/bandwidth_numbers/models/data/reservation_list.py
similarity index 56%
rename from iris_sdk/models/data/reservation_list.py
rename to bandwidth_numbers/models/data/reservation_list.py
index 606451c..1697fa7 100644
--- a/iris_sdk/models/data/reservation_list.py
+++ b/bandwidth_numbers/models/data/reservation_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.reservation_list import ReservationListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.reservation_list import ReservationListMap
 
 class ReservationList(ReservationListMap, BaseData):
 
@@ -13,4 +13,4 @@ def __init__(self):
         self.reservation_id = BaseResourceSimpleList()
 
     def add(self, id=None):
-        return self.reservation_id.add(id)
\ No newline at end of file
+        return self.reservation_id.add(id)
diff --git a/bandwidth_numbers/models/data/response_status.py b/bandwidth_numbers/models/data/response_status.py
new file mode 100644
index 0000000..567f4f6
--- /dev/null
+++ b/bandwidth_numbers/models/data/response_status.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.response_status import ResponseStatusMap
+
+class ResponseStatus(ResponseStatusMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/role.py b/bandwidth_numbers/models/data/role.py
new file mode 100644
index 0000000..da8949d
--- /dev/null
+++ b/bandwidth_numbers/models/data/role.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.permissions_list import PermissionsList
+from bandwidth_numbers.models.maps.role import RoleMap
+
+class Role(RoleMap, BaseData):
+
+    @property
+    def name(self):
+        return self.role_name
+    @name.setter
+    def name(self, name):
+        self.role_name = name
+
+    def __init__(self):
+        self.permissions = PermissionsList()
diff --git a/bandwidth_numbers/models/data/roles_list.py b/bandwidth_numbers/models/data/roles_list.py
new file mode 100644
index 0000000..9f79df8
--- /dev/null
+++ b/bandwidth_numbers/models/data/roles_list.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.role import Role
+from bandwidth_numbers.models.maps.roles_list import RolesListMap
+
+class RolesList(RolesListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.role.items
+
+    def __init__(self):
+        self.role = BaseResourceList(Role)
diff --git a/iris_sdk/models/data/sip_peer.py b/bandwidth_numbers/models/data/sip_peer.py
similarity index 51%
rename from iris_sdk/models/data/sip_peer.py
rename to bandwidth_numbers/models/data/sip_peer.py
index e601b6d..a88533c 100644
--- a/iris_sdk/models/data/sip_peer.py
+++ b/bandwidth_numbers/models/data/sip_peer.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.data.calling_name import CallingName
-from iris_sdk.models.data.hosts import Hosts
-from iris_sdk.models.data.termination_hosts import TerminationHosts
-from iris_sdk.models.maps.sip_peer import SipPeerMap
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.data.calling_name import CallingName
+from bandwidth_numbers.models.data.hosts import Hosts
+from bandwidth_numbers.models.data.termination_hosts import TerminationHosts
+from bandwidth_numbers.models.maps.sip_peer import SipPeerMap
 
 class SipPeerData(SipPeerMap):
 
@@ -20,4 +20,4 @@ def __init__(self):
         self.calling_name = CallingName()
         self.sms_hosts = Hosts()
         self.termination_hosts = TerminationHosts()
-        self.voice_hosts = Hosts()
\ No newline at end of file
+        self.voice_hosts = Hosts()
diff --git a/bandwidth_numbers/models/data/sip_peer_host.py b/bandwidth_numbers/models/data/sip_peer_host.py
new file mode 100644
index 0000000..24d5007
--- /dev/null
+++ b/bandwidth_numbers/models/data/sip_peer_host.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.hosts import Hosts
+from bandwidth_numbers.models.data.termination_hosts import TerminationHosts
+from bandwidth_numbers.models.maps.sip_peer_host import SipPeerHostMap
+
+class SipPeerHost(SipPeerHostMap, BaseData):
+
+    def __init__(self):
+        self.sms_hosts = Hosts()
+        self.termination_hosts = Hosts()
+        self.voice_hosts = Hosts()
diff --git a/bandwidth_numbers/models/data/sip_peer_hosts.py b/bandwidth_numbers/models/data/sip_peer_hosts.py
new file mode 100644
index 0000000..71be2c9
--- /dev/null
+++ b/bandwidth_numbers/models/data/sip_peer_hosts.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.sip_peer_host import SipPeerHost
+from bandwidth_numbers.models.maps.sip_peer_hosts import SipPeerHostsMap
+
+class SipPeerHosts(SipPeerHostsMap, BaseData):
+
+    @property
+    def items(self):
+        return self.sip_peer_host.items
+
+    def __init__(self):
+        self.sip_peer_host = BaseResourceList(SipPeerHost)
diff --git a/bandwidth_numbers/models/data/sip_peer_telephone_number.py b/bandwidth_numbers/models/data/sip_peer_telephone_number.py
new file mode 100644
index 0000000..f875641
--- /dev/null
+++ b/bandwidth_numbers/models/data/sip_peer_telephone_number.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.tn_attributes import TnAttributes
+from bandwidth_numbers.models.maps.sip_peer_telephone_number import \
+    SipPeerTelephoneNumberMap
+
+class SipPeerTelephoneNumberData(SipPeerTelephoneNumberMap, BaseData):
+
+    def __init__(self):
+        self.tn_attributes = TnAttributes()
diff --git a/iris_sdk/models/data/sip_peer_telephone_numbers.py b/bandwidth_numbers/models/data/sip_peer_telephone_numbers.py
similarity index 56%
rename from iris_sdk/models/data/sip_peer_telephone_numbers.py
rename to bandwidth_numbers/models/data/sip_peer_telephone_numbers.py
index 4892aa1..2a2e0b1 100644
--- a/iris_sdk/models/data/sip_peer_telephone_numbers.py
+++ b/bandwidth_numbers/models/data/sip_peer_telephone_numbers.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.sip_peer_telephone_numbers import \
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.sip_peer_telephone_numbers import \
     SipPeerTelephoneNumbersMap
-from iris_sdk.models.sip_peer_telephone_number import \
+from bandwidth_numbers.models.sip_peer_telephone_number import \
     SipPeerTelephoneNumber
 
 class SipPeerTelephoneNumbers(SipPeerTelephoneNumbersMap, BaseData):
@@ -14,4 +14,4 @@ def items(self):
 
     def __init__(self, parent=None):
         self.sip_peer_telephone_number = BaseResourceList(
-            SipPeerTelephoneNumber, parent)
\ No newline at end of file
+            SipPeerTelephoneNumber, parent)
diff --git a/bandwidth_numbers/models/data/sip_peer_tns.py b/bandwidth_numbers/models/data/sip_peer_tns.py
new file mode 100644
index 0000000..daef590
--- /dev/null
+++ b/bandwidth_numbers/models/data/sip_peer_tns.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.sip_peer_telephone_numbers import \
+    SipPeerTelephoneNumbers
+from bandwidth_numbers.models.maps.sip_peer_tns import SipPeerTnsMap
+
+class SipPeerTnsData(SipPeerTnsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.sip_peer_telephone_numbers = SipPeerTelephoneNumbers(parent)
diff --git a/iris_sdk/models/data/sip_peer_totaltns.py b/bandwidth_numbers/models/data/sip_peer_totaltns.py
similarity index 52%
rename from iris_sdk/models/data/sip_peer_totaltns.py
rename to bandwidth_numbers/models/data/sip_peer_totaltns.py
index e5c05bb..9939d90 100644
--- a/iris_sdk/models/data/sip_peer_totaltns.py
+++ b/bandwidth_numbers/models/data/sip_peer_totaltns.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.sip_peer_totaltns import SipPeerTotaltnsMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.sip_peer_totaltns import SipPeerTotaltnsMap
 
 class SipPeerTotaltnsData(SipPeerTotaltnsMap, BaseData):
 
@@ -10,4 +10,4 @@ def count(self):
         return self.sip_peer_telephone_numbers_count
     @count.setter
     def count(self, count):
-        self.sip_peer_telephone_numbers_count = count
\ No newline at end of file
+        self.sip_peer_telephone_numbers_count = count
diff --git a/bandwidth_numbers/models/data/sip_peers.py b/bandwidth_numbers/models/data/sip_peers.py
new file mode 100644
index 0000000..8652cb1
--- /dev/null
+++ b/bandwidth_numbers/models/data/sip_peers.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.sip_peers import SipPeersMap
+from bandwidth_numbers.models.sip_peer import SipPeer
+
+class SipPeersData(SipPeersMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.sip_peer = BaseResourceList(SipPeer, self)
diff --git a/bandwidth_numbers/models/data/site.py b/bandwidth_numbers/models/data/site.py
new file mode 100644
index 0000000..ff0505a
--- /dev/null
+++ b/bandwidth_numbers/models/data/site.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.maps.site import SiteMap
+
+class SiteData(SiteMap):
+
+    def __init__(self):
+        self.address = Address()
diff --git a/bandwidth_numbers/models/data/site_host.py b/bandwidth_numbers/models/data/site_host.py
new file mode 100644
index 0000000..9a6479c
--- /dev/null
+++ b/bandwidth_numbers/models/data/site_host.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.sip_peer_hosts import SipPeerHosts
+from bandwidth_numbers.models.maps.site_host import SiteHostMap
+
+class SiteHost(SiteHostMap, BaseData):
+
+    def __init__(self):
+        self.sip_peer_hosts = SipPeerHosts()
diff --git a/bandwidth_numbers/models/data/site_hosts.py b/bandwidth_numbers/models/data/site_hosts.py
new file mode 100644
index 0000000..5d6a360
--- /dev/null
+++ b/bandwidth_numbers/models/data/site_hosts.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.site_host import SiteHost
+from bandwidth_numbers.models.maps.site_hosts import SiteHostsMap
+
+class SiteHostsData(SiteHostsMap, BaseData):
+
+    @property
+    def items(self):
+        return self.site_host.items
+
+    def __init__(self):
+        self.site_host = BaseResourceList(SiteHost)
diff --git a/iris_sdk/models/data/site_totaltns.py b/bandwidth_numbers/models/data/site_totaltns.py
similarity index 53%
rename from iris_sdk/models/data/site_totaltns.py
rename to bandwidth_numbers/models/data/site_totaltns.py
index de74a95..2f02ea6 100644
--- a/iris_sdk/models/data/site_totaltns.py
+++ b/bandwidth_numbers/models/data/site_totaltns.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.site_totaltns import SiteTotaltnsMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.site_totaltns import SiteTotaltnsMap
 
 class SiteTotaltnsData(SiteTotaltnsMap, BaseData):
 
@@ -10,4 +10,4 @@ def count(self):
         return self.total_count
     @count.setter
     def count(self, count):
-        self.total_count = count
\ No newline at end of file
+        self.total_count = count
diff --git a/bandwidth_numbers/models/data/sites.py b/bandwidth_numbers/models/data/sites.py
new file mode 100644
index 0000000..ddd2b4c
--- /dev/null
+++ b/bandwidth_numbers/models/data/sites.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.sites import SitesMap
+from bandwidth_numbers.models.site import Site
+
+class SitesData(SitesMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.site = BaseResourceList(Site, self)
diff --git a/bandwidth_numbers/models/data/subscriber.py b/bandwidth_numbers/models/data/subscriber.py
new file mode 100644
index 0000000..ea038dc
--- /dev/null
+++ b/bandwidth_numbers/models/data/subscriber.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.maps.subscriber import SubscriberMap
+
+class Subscriber(SubscriberMap, BaseData):
+
+    def __init__(self):
+        self.service_address = Address()
diff --git a/bandwidth_numbers/models/data/subscription.py b/bandwidth_numbers/models/data/subscription.py
new file mode 100644
index 0000000..2910aaa
--- /dev/null
+++ b/bandwidth_numbers/models/data/subscription.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.email_subscription import EmailSubscription
+from bandwidth_numbers.models.data.callback_subscription import CallbackSubscription
+from bandwidth_numbers.models.maps.subscription import SubscriptionMap
+
+class SubscriptionData(SubscriptionMap, BaseData):
+
+    def __init__(self):
+        self.email_subscription = EmailSubscription()
+        self.callback_subscription = CallbackSubscription()
diff --git a/bandwidth_numbers/models/data/subscriptions.py b/bandwidth_numbers/models/data/subscriptions.py
new file mode 100644
index 0000000..13eac1e
--- /dev/null
+++ b/bandwidth_numbers/models/data/subscriptions.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.subscriptions import SubscriptionsMap
+from bandwidth_numbers.models.subscription import Subscription
+
+class SubscriptionsData(SubscriptionsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.subscription = BaseResourceList(Subscription, parent)
diff --git a/iris_sdk/models/data/telephone_number.py b/bandwidth_numbers/models/data/telephone_number.py
similarity index 57%
rename from iris_sdk/models/data/telephone_number.py
rename to bandwidth_numbers/models/data/telephone_number.py
index 6265080..7d0f72b 100644
--- a/iris_sdk/models/data/telephone_number.py
+++ b/bandwidth_numbers/models/data/telephone_number.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.telephone_number import TelephoneNumberMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.telephone_number import TelephoneNumberMap
 
 class TelephoneNumberData(TelephoneNumberMap, BaseData):
 
@@ -10,4 +10,4 @@ def last_modified_date(self):
         return self.last_modified
     @last_modified_date.setter
     def last_modified_date(self, last_modified_date):
-        self.last_modified = last_modified_date
\ No newline at end of file
+        self.last_modified = last_modified_date
diff --git a/iris_sdk/models/data/telephone_number_detail_list.py b/bandwidth_numbers/models/data/telephone_number_detail_list.py
similarity index 55%
rename from iris_sdk/models/data/telephone_number_detail_list.py
rename to bandwidth_numbers/models/data/telephone_number_detail_list.py
index 059cf73..6010756 100644
--- a/iris_sdk/models/data/telephone_number_detail_list.py
+++ b/bandwidth_numbers/models/data/telephone_number_detail_list.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.telephone_number_detail_list import \
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.telephone_number_detail_list import \
     TelephoneNumberDetailListMap
-from iris_sdk.models.data.telephone_number import TelephoneNumberData
+from bandwidth_numbers.models.data.telephone_number import TelephoneNumberData
 
 class TelephoneNumberDetailList(TelephoneNumberDetailListMap, BaseData):
 
@@ -12,4 +12,4 @@ def items(self):
         return self.telephone_number_detail.items
 
     def __init__(self):
-        self.telephone_number_detail = BaseResourceList(TelephoneNumberData)
\ No newline at end of file
+        self.telephone_number_detail = BaseResourceList(TelephoneNumberData)
diff --git a/iris_sdk/models/data/telephone_number_detail_list_tn.py b/bandwidth_numbers/models/data/telephone_number_detail_list_tn.py
similarity index 57%
rename from iris_sdk/models/data/telephone_number_detail_list_tn.py
rename to bandwidth_numbers/models/data/telephone_number_detail_list_tn.py
index 6352d0c..fc0284f 100644
--- a/iris_sdk/models/data/telephone_number_detail_list_tn.py
+++ b/bandwidth_numbers/models/data/telephone_number_detail_list_tn.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.telephone_number_detail_list_tn import \
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.telephone_number_detail_list_tn import \
     TelephoneNumberDetailListTnMap
-from iris_sdk.models.telephone_number import TelephoneNumber
+from bandwidth_numbers.models.telephone_number import TelephoneNumber
 
 class TelephoneNumberDetailListTn(TelephoneNumberDetailListTnMap, BaseData):
 
@@ -12,4 +12,4 @@ def items(self):
         return self.telephone_number.items
 
     def __init__(self, parent=None):
-        self.telephone_number = BaseResourceList(TelephoneNumber, parent)
\ No newline at end of file
+        self.telephone_number = BaseResourceList(TelephoneNumber, parent)
diff --git a/iris_sdk/models/data/telephone_number_list.py b/bandwidth_numbers/models/data/telephone_number_list.py
similarity index 55%
rename from iris_sdk/models/data/telephone_number_list.py
rename to bandwidth_numbers/models/data/telephone_number_list.py
index 709415f..8017c02 100644
--- a/iris_sdk/models/data/telephone_number_list.py
+++ b/bandwidth_numbers/models/data/telephone_number_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.telephone_number_list import TelephoneNumberListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.telephone_number_list import TelephoneNumberListMap
 
 class TelephoneNumberList(TelephoneNumberListMap, BaseData):
 
@@ -13,4 +13,4 @@ def __init__(self):
         self.telephone_number = BaseResourceSimpleList()
 
     def add(self, phone_number=None):
-        return self.telephone_number.add(phone_number)
\ No newline at end of file
+        return self.telephone_number.add(phone_number)
diff --git a/bandwidth_numbers/models/data/telephone_numbers.py b/bandwidth_numbers/models/data/telephone_numbers.py
new file mode 100644
index 0000000..b837746
--- /dev/null
+++ b/bandwidth_numbers/models/data/telephone_numbers.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.data.telephone_number_detail_list_tn import \
+    TelephoneNumberDetailListTn
+from bandwidth_numbers.models.maps.telephone_numbers import TelephoneNumbersMap
+
+class TelephoneNumbers(TelephoneNumbersMap, TelephoneNumberDetailListTn):
+
+    def __init__(self, parent=None):
+        TelephoneNumberDetailListTn.__init__(self, parent)
diff --git a/iris_sdk/models/data/termination_hosts.py b/bandwidth_numbers/models/data/termination_hosts.py
similarity index 50%
rename from iris_sdk/models/data/termination_hosts.py
rename to bandwidth_numbers/models/data/termination_hosts.py
index e2b5c8e..6f63410 100644
--- a/iris_sdk/models/data/termination_hosts.py
+++ b/bandwidth_numbers/models/data/termination_hosts.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.host import Host
-from iris_sdk.models.maps.termination_hosts import TerminationHostsMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.host import Host
+from bandwidth_numbers.models.maps.termination_hosts import TerminationHostsMap
 
 class TerminationHosts(TerminationHostsMap, BaseData):
 
@@ -14,4 +14,4 @@ def __init__(self):
         self.termination_host = BaseResourceList(Host)
 
     def add(self):
-        return self.termination_host.add()
\ No newline at end of file
+        return self.termination_host.add()
diff --git a/bandwidth_numbers/models/data/tier_list.py b/bandwidth_numbers/models/data/tier_list.py
new file mode 100644
index 0000000..aa6f458
--- /dev/null
+++ b/bandwidth_numbers/models/data/tier_list.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.tier_list import TierListMap
+
+class TierList(TierListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.tier.items
+
+    def __init__(self):
+        self.tier = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/tn_attributes.py b/bandwidth_numbers/models/data/tn_attributes.py
new file mode 100644
index 0000000..24fdba6
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_attributes.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.tn_attributes import TnAttributesMap
+
+class TnAttributes(TnAttributesMap, BaseData):
+
+    @property
+    def items(self):
+        return self.tn_attribute.items
+
+    def __init__(self, parent=None):
+        self.tn_attribute = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/tn_history.py b/bandwidth_numbers/models/data/tn_history.py
new file mode 100644
index 0000000..88e6f4f
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_history.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.tn_status import TnStatus
+from bandwidth_numbers.models.maps.tn_history import TnHistoryMap
+
+class TnHistoryData(TnHistoryMap):
+
+    def __init__(self):
+        self.telephone_number_status = BaseResourceList(TnStatus)
diff --git a/bandwidth_numbers/models/data/tn_lca.py b/bandwidth_numbers/models/data/tn_lca.py
new file mode 100644
index 0000000..5fa3baa
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_lca.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseResourceSimpleList
+from bandwidth_numbers.models.data.location import Location
+from bandwidth_numbers.models.data.npanxx_list import NpanxxList
+from bandwidth_numbers.models.maps.tn_lca import TnLcaMap
+
+class TnLcaData(TnLcaMap):
+
+    def __init__(self):
+        self.listof_npanxx = NpanxxList()
+        self.location = Location()
diff --git a/bandwidth_numbers/models/data/tn_line_options.py b/bandwidth_numbers/models/data/tn_line_options.py
new file mode 100644
index 0000000..8762005
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_line_options.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.tn_line_options import TnLineOptionsMap
+
+class TnLineOptionsData(TnLineOptionsMap, BaseData):
+    pass
diff --git a/iris_sdk/models/data/tn_list.py b/bandwidth_numbers/models/data/tn_list.py
similarity index 55%
rename from iris_sdk/models/data/tn_list.py
rename to bandwidth_numbers/models/data/tn_list.py
index e1b3de2..dd61c66 100644
--- a/iris_sdk/models/data/tn_list.py
+++ b/bandwidth_numbers/models/data/tn_list.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.tn_list import TnListMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.tn_list import TnListMap
 
 class TnList(TnListMap, BaseData):
 
@@ -13,4 +13,4 @@ def __init__(self):
         self.tn = BaseResourceSimpleList()
 
     def add(self, phone_number=None):
-        return self.tn.add(phone_number)
\ No newline at end of file
+        return self.tn.add(phone_number)
diff --git a/bandwidth_numbers/models/data/tn_option_order.py b/bandwidth_numbers/models/data/tn_option_order.py
new file mode 100644
index 0000000..4851927
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_option_order.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+  
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.tn_option_order import TnOptionOrderMap
+from bandwidth_numbers.models.data.error_list import ErrorList
+from bandwidth_numbers.models.data.warnings import Warnings
+from bandwidth_numbers.models.data.tn_option_order_groups import TnOptionOrderGroupsData
+
+class TnOptionOrderData(TnOptionOrderMap, BaseData):
+
+    def __init__(self):
+        self.error_list = ErrorList()
+        self.warnings = Warnings()
+        self.tn_option_groups = TnOptionOrderGroupsData()
diff --git a/bandwidth_numbers/models/data/tn_option_order_group.py b/bandwidth_numbers/models/data/tn_option_order_group.py
new file mode 100644
index 0000000..a5e07ae
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_option_order_group.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+  
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.tn_option_order_group import TnOptionOrderGroupMap
+from bandwidth_numbers.models.data.telephone_number_list import TelephoneNumberList
+from bandwidth_numbers.models.data.a2p_settings import A2pSettings
+
+class TnOptionOrderGroupData(TnOptionOrderGroupMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.telephone_numbers = TelephoneNumberList()
+        self.a2p_settings = A2pSettings()
diff --git a/bandwidth_numbers/models/data/tn_option_order_groups.py b/bandwidth_numbers/models/data/tn_option_order_groups.py
new file mode 100644
index 0000000..d3a72dd
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_option_order_groups.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.tn_option_order_groups import TnOptionOrderGroupsMap
+from bandwidth_numbers.models.data.tn_option_order_group import TnOptionOrderGroupData
+
+class TnOptionOrderGroupsData(TnOptionOrderGroupsMap, BaseData):
+
+    def __init__(self, parent=None):
+        self.tn_option_group = BaseResourceList(TnOptionOrderGroupData, parent)
diff --git a/iris_sdk/models/data/tn_option_orders.py b/bandwidth_numbers/models/data/tn_option_orders.py
similarity index 54%
rename from iris_sdk/models/data/tn_option_orders.py
rename to bandwidth_numbers/models/data/tn_option_orders.py
index b7a2f20..60c0ebf 100644
--- a/iris_sdk/models/data/tn_option_orders.py
+++ b/bandwidth_numbers/models/data/tn_option_orders.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.tn_option_orders import TnOptionOrdersMap
-from iris_sdk.models.tn_option_order import TnOptionOrder
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.tn_option_orders import TnOptionOrdersMap
+from bandwidth_numbers.models.tn_option_order import TnOptionOrder
 
 class TnOptionOrdersData(TnOptionOrdersMap, BaseData):
 
diff --git a/iris_sdk/models/data/tn_rate_center.py b/bandwidth_numbers/models/data/tn_rate_center.py
similarity index 50%
rename from iris_sdk/models/data/tn_rate_center.py
rename to bandwidth_numbers/models/data/tn_rate_center.py
index 8afa3d7..0aee64d 100644
--- a/iris_sdk/models/data/tn_rate_center.py
+++ b/bandwidth_numbers/models/data/tn_rate_center.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.tn_rate_center import TnRateCenterMap
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.maps.tn_rate_center import TnRateCenterMap
 
 class TnRateCenterData(TnRateCenterMap, BaseData):
 
@@ -10,4 +10,4 @@ def name(self):
         return self.rate_center
     @name.setter
     def name(self, name):
-        self.rate_center = name
\ No newline at end of file
+        self.rate_center = name
diff --git a/bandwidth_numbers/models/data/tn_rate_centers_list.py b/bandwidth_numbers/models/data/tn_rate_centers_list.py
new file mode 100644
index 0000000..7fdf74e
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_rate_centers_list.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.data.tn_rc_list import TelephoneNumberRcList
+from bandwidth_numbers.models.maps.tn_rate_centers_list import TnRateCentersListMap
+
+class TnRateCentersList(TnRateCentersListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.rcs.items
+
+    @property
+    def rcs(self):
+        return self.r_cs
+
+    def __init__(self):
+        self.r_cs = TelephoneNumberRcList()
diff --git a/bandwidth_numbers/models/data/tn_rc_list.py b/bandwidth_numbers/models/data/tn_rc_list.py
new file mode 100644
index 0000000..4920786
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_rc_list.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.tn_rc_list import TelephoneNumberRcListMap
+
+class TelephoneNumberRcList(TelephoneNumberRcListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.rc.items
+
+    def __init__(self):
+        self.rc = BaseResourceSimpleList()
diff --git a/bandwidth_numbers/models/data/tn_status.py b/bandwidth_numbers/models/data/tn_status.py
new file mode 100644
index 0000000..a957f3f
--- /dev/null
+++ b/bandwidth_numbers/models/data/tn_status.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.tn_status import TnStatusMap
+
+class TnStatus(TnStatusMap, BaseData):
+    pass
diff --git a/iris_sdk/models/data/tndetails.py b/bandwidth_numbers/models/data/tndetails.py
similarity index 66%
rename from iris_sdk/models/data/tndetails.py
rename to bandwidth_numbers/models/data/tndetails.py
index 1fba910..3f76694 100644
--- a/iris_sdk/models/data/tndetails.py
+++ b/bandwidth_numbers/models/data/tndetails.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.features import Features
-from iris_sdk.models.maps.tndetails import TndetailsMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.features import Features
+from bandwidth_numbers.models.maps.tndetails import TndetailsMap
 
 class TndetailsData(TndetailsMap, BaseData):
 
@@ -21,4 +21,4 @@ def last_modified_date(self, last_modified_date):
         self.last_modified = last_modified_date
 
     def __init__(self):
-        self.features = Features()
\ No newline at end of file
+        self.features = Features()
diff --git a/iris_sdk/models/data/tns.py b/bandwidth_numbers/models/data/tns.py
similarity index 52%
rename from iris_sdk/models/data/tns.py
rename to bandwidth_numbers/models/data/tns.py
index 4e3b64f..e82e46a 100644
--- a/iris_sdk/models/data/tns.py
+++ b/bandwidth_numbers/models/data/tns.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.data.listing_name import ListingName
-from iris_sdk.models.maps.tns import TnsMap
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.data.links import Links
+from bandwidth_numbers.models.data.listing_name import ListingName
+from bandwidth_numbers.models.maps.tns import TnsMap
 
 class TnsData(TnsMap, BaseData):
 
@@ -15,4 +15,4 @@ def result_count(self, result_count):
         self.telephone_number_count = result_count
 
     def __init__(self):
-        self.links = Links()
\ No newline at end of file
+        self.links = Links()
diff --git a/bandwidth_numbers/models/data/totals.py b/bandwidth_numbers/models/data/totals.py
new file mode 100644
index 0000000..4f79656
--- /dev/null
+++ b/bandwidth_numbers/models/data/totals.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.totals import TotalsMap
+
+class TotalsData(TotalsMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/warning.py b/bandwidth_numbers/models/data/warning.py
new file mode 100644
index 0000000..3e27107
--- /dev/null
+++ b/bandwidth_numbers/models/data/warning.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+  
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.warning import WarningMap
+
+class WarningCls(WarningMap, BaseData): #Warning is a reserved word in python
+    pass
diff --git a/bandwidth_numbers/models/data/warnings.py b/bandwidth_numbers/models/data/warnings.py
new file mode 100644
index 0000000..5098775
--- /dev/null
+++ b/bandwidth_numbers/models/data/warnings.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+  
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceList
+from bandwidth_numbers.models.data.warning import WarningCls
+from bandwidth_numbers.models.maps.warnings import WarningsMap
+
+class Warnings(WarningsMap, BaseData):
+
+    def __init__(self):
+        self.warning = BaseResourceList(WarningCls)
diff --git a/bandwidth_numbers/models/data/wireless_info.py b/bandwidth_numbers/models/data/wireless_info.py
new file mode 100644
index 0000000..ce69283
--- /dev/null
+++ b/bandwidth_numbers/models/data/wireless_info.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData
+from bandwidth_numbers.models.maps.wireless_info import WirelessInfoMap
+
+class WirelessInfo(WirelessInfoMap, BaseData):
+    pass
diff --git a/bandwidth_numbers/models/data/zip_code_list.py b/bandwidth_numbers/models/data/zip_code_list.py
new file mode 100644
index 0000000..1fb84a0
--- /dev/null
+++ b/bandwidth_numbers/models/data/zip_code_list.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.base_resource import BaseData, BaseResourceSimpleList
+from bandwidth_numbers.models.maps.zip_code_list import ZipCodeListMap
+
+class ZipCodeList(ZipCodeListMap, BaseData):
+
+    @property
+    def items(self):
+        return self.zip_code.items
+
+    def __init__(self):
+        self.zip_code = BaseResourceSimpleList()
diff --git a/iris_sdk/models/disc_numbers.py b/bandwidth_numbers/models/disc_numbers.py
similarity index 69%
rename from iris_sdk/models/disc_numbers.py
rename to bandwidth_numbers/models/disc_numbers.py
index b06eddc..60a002a 100644
--- a/iris_sdk/models/disc_numbers.py
+++ b/bandwidth_numbers/models/disc_numbers.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.include.xml_consts import XML_PARAM_TN_DETAIL, XML_TRUE
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.disc_numbers import DiscNumbersData
-from iris_sdk.models.totals import Totals
+from bandwidth_numbers.include.xml_consts import XML_PARAM_TN_DETAIL, XML_TRUE
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.disc_numbers import DiscNumbersData
+from bandwidth_numbers.models.totals import Totals
 
 XML_NAME_DISC_NUMBERS = "TNs"
 XPATH_DISC_NUMBERS = "/discnumbers"
@@ -29,4 +29,4 @@ def __init__(self, parent=None, client=None):
 
     def list(self, params):
         return self._get_data(params=params).telephone_numbers.\
-            telephone_number
\ No newline at end of file
+            telephone_number
diff --git a/iris_sdk/models/disconnect.py b/bandwidth_numbers/models/disconnect.py
similarity index 81%
rename from iris_sdk/models/disconnect.py
rename to bandwidth_numbers/models/disconnect.py
index 25b06c6..9632c73 100644
--- a/iris_sdk/models/disconnect.py
+++ b/bandwidth_numbers/models/disconnect.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.disconnect import DisconnectData
-from iris_sdk.models.notes import Notes
-from iris_sdk.models.disconnect_order_response import DisconnectOrderResponse
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.disconnect import DisconnectData
+from bandwidth_numbers.models.notes import Notes
+from bandwidth_numbers.models.disconnect_order_response import DisconnectOrderResponse
 
 XML_NAME_DISCONNECT = "DisconnectTelephoneNumberOrder"
 XPATH_DISCONNECT = "/{}"
@@ -48,4 +48,4 @@ def save(self):
         order_response.order_request = self
         order_response._from_xml(self._element_from_string(str))
         self.order_status = order_response.order_status
-        return True
\ No newline at end of file
+        return True
diff --git a/iris_sdk/models/disconnect_order_response.py b/bandwidth_numbers/models/disconnect_order_response.py
similarity index 82%
rename from iris_sdk/models/disconnect_order_response.py
rename to bandwidth_numbers/models/disconnect_order_response.py
index e8534cd..ee21b70 100644
--- a/iris_sdk/models/disconnect_order_response.py
+++ b/bandwidth_numbers/models/disconnect_order_response.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.order_response import OrderResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.order_response import OrderResponseData
 
 XML_NAME_DISCONNECT_ORDER_RESPONSE = "DisconnectTelephoneNumberOrderResponse"
 XPATH_DISCONNECT_ORDER_RESPONSE = "/{}"
@@ -35,4 +35,4 @@ def __init__(self, parent=None, client=None):
         OrderResponseData.__init__(self)
 
     def get(self, id=None, params=None):
-        return self._get_data((id or self.id), params=params)
\ No newline at end of file
+        return self._get_data((id or self.id), params=params)
diff --git a/iris_sdk/models/disconnects.py b/bandwidth_numbers/models/disconnects.py
similarity index 82%
rename from iris_sdk/models/disconnects.py
rename to bandwidth_numbers/models/disconnects.py
index 46d6bb5..8ab952f 100644
--- a/iris_sdk/models/disconnects.py
+++ b/bandwidth_numbers/models/disconnects.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.disconnects import DisconnectsData
-from iris_sdk.models.disconnect import Disconnect
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.disconnects import DisconnectsData
+from bandwidth_numbers.models.disconnect import Disconnect
 
 XML_NAME_DISCONNECTS = "ListOrderIdUserIdDate"
 XPATH_DISCONNECTS = "/disconnects"
@@ -31,4 +31,4 @@ def get(self, id, params=None):
         return Disconnect(self).get(id, params=params)
 
     def list(self, params):
-        return self._get_data(params=params).order_id_user_id_date
\ No newline at end of file
+        return self._get_data(params=params).order_id_user_id_date
diff --git a/iris_sdk/models/dlda.py b/bandwidth_numbers/models/dlda.py
similarity index 76%
rename from iris_sdk/models/dlda.py
rename to bandwidth_numbers/models/dlda.py
index 76b613e..4a8e556 100644
--- a/iris_sdk/models/dlda.py
+++ b/bandwidth_numbers/models/dlda.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.dlda import DldaData
-from iris_sdk.models.dlda_order_response import DldaOrderResponse
-from iris_sdk.models.history import History
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.dlda import DldaData
+from bandwidth_numbers.models.dlda_order_response import DldaOrderResponse
+from bandwidth_numbers.models.history import History
 
 XML_NAME_DLDA = "DldaOrder"
 XPATH_DLDA = "/{}"
@@ -41,4 +41,4 @@ def save(self):
         str = self._save(True)
         self.clear()
         self._from_xml(self._element_from_string(str))
-        return True
\ No newline at end of file
+        return True
diff --git a/iris_sdk/models/dlda_order_response.py b/bandwidth_numbers/models/dlda_order_response.py
similarity index 79%
rename from iris_sdk/models/dlda_order_response.py
rename to bandwidth_numbers/models/dlda_order_response.py
index 36fbd85..cf53eda 100644
--- a/iris_sdk/models/dlda_order_response.py
+++ b/bandwidth_numbers/models/dlda_order_response.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.dlda_order_response import DldaOrderResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.dlda_order_response import DldaOrderResponseData
 
 XPATH_DLDA_ORDER_RESPONSE = "/{}"
 
@@ -33,4 +33,4 @@ def __init__(self, parent=None, client=None):
         DldaOrderResponseData.__init__(self)
 
     def get(self, id=None, params=None):
-        return self._get_data((id or self.id), params=params)
\ No newline at end of file
+        return self._get_data((id or self.id), params=params)
diff --git a/iris_sdk/models/dldas.py b/bandwidth_numbers/models/dldas.py
similarity index 82%
rename from iris_sdk/models/dldas.py
rename to bandwidth_numbers/models/dldas.py
index eb8d8a1..64bf6c4 100644
--- a/iris_sdk/models/dldas.py
+++ b/bandwidth_numbers/models/dldas.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.dldas import DldasData
-from iris_sdk.models.dlda import Dlda
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.dldas import DldasData
+from bandwidth_numbers.models.dlda import Dlda
 
 XML_NAME_DLDAS = "ListOrderIdUserIdDate"
 XPATH_DLDAS = "/dldas"
@@ -31,4 +31,4 @@ def get(self, id, params=None):
         return Dlda(self).get(id, params=params)
 
     def list(self, params=None):
-        return self._get_data(params=params).order_id_user_id_date
\ No newline at end of file
+        return self._get_data(params=params).order_id_user_id_date
diff --git a/iris_sdk/models/file_meta_data.py b/bandwidth_numbers/models/file_meta_data.py
similarity index 55%
rename from iris_sdk/models/file_meta_data.py
rename to bandwidth_numbers/models/file_meta_data.py
index 6fca5ee..07cd9de 100644
--- a/iris_sdk/models/file_meta_data.py
+++ b/bandwidth_numbers/models/file_meta_data.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.maps.file_meta_data import FileMetaDataMap
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.maps.file_meta_data import FileMetaDataMap
 
 XPATH_METADATA = "/{}/metadata"
 
@@ -13,4 +13,4 @@ class FileMetaData(BaseResource, FileMetaDataMap):
     _xpath_save = _xpath
 
     def get(self, id):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/history.py b/bandwidth_numbers/models/history.py
similarity index 73%
rename from iris_sdk/models/history.py
rename to bandwidth_numbers/models/history.py
index fb8b65f..3ecc03d 100644
--- a/iris_sdk/models/history.py
+++ b/bandwidth_numbers/models/history.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.history import HistoryData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.history import HistoryData
 
 XML_NAME_HISTORY = "OrderHistoryWrapper"
 XPATH_HISTORY = "/history"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         HistoryData.__init__(self)
 
     def list(self):
-        return self._get_data().order_history
\ No newline at end of file
+        return self._get_data().order_history
diff --git a/iris_sdk/models/import_tn_checker.py b/bandwidth_numbers/models/import_tn_checker.py
similarity index 76%
rename from iris_sdk/models/import_tn_checker.py
rename to bandwidth_numbers/models/import_tn_checker.py
index f597b4b..9068ec5 100644
--- a/iris_sdk/models/import_tn_checker.py
+++ b/bandwidth_numbers/models/import_tn_checker.py
@@ -2,9 +2,9 @@
 
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.import_tn_checker import ImportTnCheckerData
-from iris_sdk.models.import_tn_checker_response import ImportTnCheckerResponse
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.import_tn_checker import ImportTnCheckerData
+from bandwidth_numbers.models.import_tn_checker_response import ImportTnCheckerResponse
 
 XML_NAME_IMPORTTN_CHECKER = "ImportTnCheckerPayload"
 XPATH_IMPORTTN_CHECKER = "/importTnChecker"
diff --git a/iris_sdk/models/import_tn_checker_response.py b/bandwidth_numbers/models/import_tn_checker_response.py
similarity index 75%
rename from iris_sdk/models/import_tn_checker_response.py
rename to bandwidth_numbers/models/import_tn_checker_response.py
index 3a82791..309a7ac 100644
--- a/iris_sdk/models/import_tn_checker_response.py
+++ b/bandwidth_numbers/models/import_tn_checker_response.py
@@ -2,8 +2,8 @@
 
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.import_tn_checker_response import ImportTnCheckerResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.import_tn_checker_response import ImportTnCheckerResponseData
 
 XML_NAME_IMPORTTN_CHECKER_RESPONSE = "ImportTnCheckerResponse"
 
diff --git a/iris_sdk/models/in_service_numbers.py b/bandwidth_numbers/models/in_service_numbers.py
similarity index 73%
rename from iris_sdk/models/in_service_numbers.py
rename to bandwidth_numbers/models/in_service_numbers.py
index 3bbe548..6811274 100644
--- a/iris_sdk/models/in_service_numbers.py
+++ b/bandwidth_numbers/models/in_service_numbers.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.totals import Totals
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.in_service_numbers import InServiceNumbersData
+from bandwidth_numbers.models.totals import Totals
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.in_service_numbers import InServiceNumbersData
 
 XML_NAME_IN_SERVICE_NUMBERS = "TNs"
 XPATH_IN_SERVICE_NUMBERS = "/inserviceNumbers"
@@ -28,4 +28,4 @@ def __init__(self, parent=None, client=None):
 
     def list(self, params=None):
         self._get_data(params=params)
-        return self.telephone_numbers.telephone_number
\ No newline at end of file
+        return self.telephone_numbers.telephone_number
diff --git a/iris_sdk/models/lidb.py b/bandwidth_numbers/models/lidb.py
similarity index 81%
rename from iris_sdk/models/lidb.py
rename to bandwidth_numbers/models/lidb.py
index 817517a..b6cc16b 100644
--- a/iris_sdk/models/lidb.py
+++ b/bandwidth_numbers/models/lidb.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.lidb import LidbData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.lidb import LidbData
 
 XML_NAME_LIDB = "LidbOrder"
 XPATH_LIDB = "/{}"
@@ -31,4 +31,4 @@ def get(self, id=None, params=None):
         return self._get_data(id, params=params)
 
     def save(self):
-        return self._post_data()
\ No newline at end of file
+        return self._post_data()
diff --git a/iris_sdk/models/lidbs.py b/bandwidth_numbers/models/lidbs.py
similarity index 82%
rename from iris_sdk/models/lidbs.py
rename to bandwidth_numbers/models/lidbs.py
index f668c6d..a4080d2 100644
--- a/iris_sdk/models/lidbs.py
+++ b/bandwidth_numbers/models/lidbs.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.lidbs import LidbsData
-from iris_sdk.models.lidb import Lidb
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.lidbs import LidbsData
+from bandwidth_numbers.models.lidb import Lidb
 
 XML_NAME_LIDBS = "ListOrderIdUserIdDate"
 XPATH_LIDBS = "/lidbs"
@@ -31,4 +31,4 @@ def get(self, id, params=None):
         return Lidb(self).get(id, params=params)
 
     def list(self, params):
-        return self._get_data(params=params).order_id_user_id_date
\ No newline at end of file
+        return self._get_data(params=params).order_id_user_id_date
diff --git a/iris_sdk/models/line_option_order_response.py b/bandwidth_numbers/models/line_option_order_response.py
similarity index 76%
rename from iris_sdk/models/line_option_order_response.py
rename to bandwidth_numbers/models/line_option_order_response.py
index 0274604..c20ade8 100644
--- a/iris_sdk/models/line_option_order_response.py
+++ b/bandwidth_numbers/models/line_option_order_response.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.line_option_order_response import LineOptionOrderResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.line_option_order_response import LineOptionOrderResponseData
 
 XPATH_LINE_OPTION_ORDER_RESPONSE = "/{}"
 
diff --git a/iris_sdk/models/line_option_orders.py b/bandwidth_numbers/models/line_option_orders.py
similarity index 72%
rename from iris_sdk/models/line_option_orders.py
rename to bandwidth_numbers/models/line_option_orders.py
index 8332138..a1d6c55 100644
--- a/iris_sdk/models/line_option_orders.py
+++ b/bandwidth_numbers/models/line_option_orders.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.line_option_order import LineOptionOrderData
-from iris_sdk.models.line_option_order_response import LineOptionOrderResponse
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.line_option_order import LineOptionOrderData
+from bandwidth_numbers.models.line_option_order_response import LineOptionOrderResponse
 
 XML_NAME_LINE_OPTION_ORDERS = "LineOptionOrder"
 XPATH_LINE_OPTION_ORDERS = "/lineOptionOrders"
@@ -27,4 +27,4 @@ def __init__(self, parent=None, client=None):
 
     def save(self):
         response = LineOptionOrderResponse(self._parent)
-        return self._post_data(response)
\ No newline at end of file
+        return self._post_data(response)
diff --git a/iris_sdk/models/lnpchecker.py b/bandwidth_numbers/models/lnpchecker.py
similarity index 72%
rename from iris_sdk/models/lnpchecker.py
rename to bandwidth_numbers/models/lnpchecker.py
index bb59933..6c8631d 100644
--- a/iris_sdk/models/lnpchecker.py
+++ b/bandwidth_numbers/models/lnpchecker.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.lnpchecker import LnpCheckerData
-from iris_sdk.models.lnpchecker_response import LnpCheckerResponse
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.lnpchecker import LnpCheckerData
+from bandwidth_numbers.models.lnpchecker_response import LnpCheckerResponse
 
 XML_NAME_LNP_CHECKER = "NumberPortabilityRequest"
 XPATH_LNP_CHECKER = "/lnpchecker"
@@ -25,4 +25,4 @@ def __call__(self, numbers, params=None):
 
     def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
-        LnpCheckerData.__init__(self)
\ No newline at end of file
+        LnpCheckerData.__init__(self)
diff --git a/iris_sdk/models/lnpchecker_response.py b/bandwidth_numbers/models/lnpchecker_response.py
similarity index 69%
rename from iris_sdk/models/lnpchecker_response.py
rename to bandwidth_numbers/models/lnpchecker_response.py
index f9d1a0c..2014b76 100644
--- a/iris_sdk/models/lnpchecker_response.py
+++ b/bandwidth_numbers/models/lnpchecker_response.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.lnpchecker_response import LnpCheckerResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.lnpchecker_response import LnpCheckerResponseData
 
 XML_NAME_LNP_CHECKER_RESPONSE = "NumberPortabilityResponse"
 
@@ -16,4 +16,4 @@ class LnpCheckerResponse(BaseResource, LnpCheckerResponseData):
 
     def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
-        LnpCheckerResponseData.__init__(self)
\ No newline at end of file
+        LnpCheckerResponseData.__init__(self)
diff --git a/iris_sdk/models/loas.py b/bandwidth_numbers/models/loas.py
similarity index 81%
rename from iris_sdk/models/loas.py
rename to bandwidth_numbers/models/loas.py
index 5cb8468..0c293f6 100644
--- a/iris_sdk/models/loas.py
+++ b/bandwidth_numbers/models/loas.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.include.xml_consts import XML_PARAM_METADATA, XML_TRUE
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.loas import LoasData
-from iris_sdk.models.file_meta_data import FileMetaData
+from bandwidth_numbers.include.xml_consts import XML_PARAM_METADATA, XML_TRUE
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.loas import LoasData
+from bandwidth_numbers.models.file_meta_data import FileMetaData
 
 XML_NAME_LOAS = "FileListResponse"
 XPATH_LOAS_FILENAME = "/{}"
@@ -45,4 +45,4 @@ def list(self, params=None):
             return self.file_names
 
     def update(self, id, filename, headers):
-        return self._send_file(XPATH_LOAS_FILENAME, filename, headers, id)
\ No newline at end of file
+        return self._send_file(XPATH_LOAS_FILENAME, filename, headers, id)
diff --git a/iris_sdk/models/maps/__init__.py b/bandwidth_numbers/models/maps/__init__.py
similarity index 100%
rename from iris_sdk/models/maps/__init__.py
rename to bandwidth_numbers/models/maps/__init__.py
diff --git a/iris_sdk/models/maps/a2p_settings.py b/bandwidth_numbers/models/maps/a2p_settings.py
similarity index 67%
rename from iris_sdk/models/maps/a2p_settings.py
rename to bandwidth_numbers/models/maps/a2p_settings.py
index 772652b..a60408b 100644
--- a/iris_sdk/models/maps/a2p_settings.py
+++ b/bandwidth_numbers/models/maps/a2p_settings.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class A2pSettingsMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/account.py b/bandwidth_numbers/models/maps/account.py
similarity index 83%
rename from iris_sdk/models/maps/account.py
rename to bandwidth_numbers/models/maps/account.py
index d9889c3..b8bbcc2 100644
--- a/iris_sdk/models/maps/account.py
+++ b/bandwidth_numbers/models/maps/account.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class AccountMap(BaseMap):
 
@@ -18,4 +18,4 @@ class AccountMap(BaseMap):
     port_carrier_type = None
     reservation_allowed = None
     spid = None
-    tiers = None
\ No newline at end of file
+    tiers = None
diff --git a/iris_sdk/models/maps/account_user.py b/bandwidth_numbers/models/maps/account_user.py
similarity index 68%
rename from iris_sdk/models/maps/account_user.py
rename to bandwidth_numbers/models/maps/account_user.py
index db4dcf8..9217406 100644
--- a/iris_sdk/models/maps/account_user.py
+++ b/bandwidth_numbers/models/maps/account_user.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class AccountUserMap(BaseMap):
 
@@ -9,4 +9,4 @@ class AccountUserMap(BaseMap):
     last_name = None
     roles = None
     telephone_number = None
-    username = None
\ No newline at end of file
+    username = None
diff --git a/bandwidth_numbers/models/maps/account_users.py b/bandwidth_numbers/models/maps/account_users.py
new file mode 100644
index 0000000..ab55443
--- /dev/null
+++ b/bandwidth_numbers/models/maps/account_users.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class AccountUsersMap(BaseMap):
+
+    user = None
diff --git a/iris_sdk/models/maps/activation_status.py b/bandwidth_numbers/models/maps/activation_status.py
similarity index 55%
rename from iris_sdk/models/maps/activation_status.py
rename to bandwidth_numbers/models/maps/activation_status.py
index c16f3b2..42119d2 100644
--- a/iris_sdk/models/maps/activation_status.py
+++ b/bandwidth_numbers/models/maps/activation_status.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ActivationStatusMap(BaseMap):
 
     activated_telephone_numbers_list = None
     auto_activation_date = None
-    not_yet_activated_telephone_numbers_list = None
\ No newline at end of file
+    not_yet_activated_telephone_numbers_list = None
diff --git a/iris_sdk/models/maps/address.py b/bandwidth_numbers/models/maps/address.py
similarity index 83%
rename from iris_sdk/models/maps/address.py
rename to bandwidth_numbers/models/maps/address.py
index 0257979..130ff56 100644
--- a/iris_sdk/models/maps/address.py
+++ b/bandwidth_numbers/models/maps/address.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class AddressMap(BaseMap):
 
@@ -18,4 +18,4 @@ class AddressMap(BaseMap):
     state_code = None
     street_name = None
     street_suffix = None
-    zip = None
\ No newline at end of file
+    zip = None
diff --git a/bandwidth_numbers/models/maps/available_npa_nxx.py b/bandwidth_numbers/models/maps/available_npa_nxx.py
new file mode 100644
index 0000000..c6f9bde
--- /dev/null
+++ b/bandwidth_numbers/models/maps/available_npa_nxx.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class AvailableNpaNxxMap(BaseMap):
+
+    available_npa_nxx_list = None
diff --git a/bandwidth_numbers/models/maps/available_npa_nxx_list.py b/bandwidth_numbers/models/maps/available_npa_nxx_list.py
new file mode 100644
index 0000000..a07cb86
--- /dev/null
+++ b/bandwidth_numbers/models/maps/available_npa_nxx_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class AvailableNpaNxxListMap(BaseMap):
+
+    available_npa_nxx = None
diff --git a/iris_sdk/models/maps/available_numbers.py b/bandwidth_numbers/models/maps/available_numbers.py
similarity index 57%
rename from iris_sdk/models/maps/available_numbers.py
rename to bandwidth_numbers/models/maps/available_numbers.py
index 8cb8901..412be5c 100644
--- a/iris_sdk/models/maps/available_numbers.py
+++ b/bandwidth_numbers/models/maps/available_numbers.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class AvailableNumbersMap(BaseMap):
 
     result_count = None
     telephone_number_detail_list = None
-    telephone_number_list = None
\ No newline at end of file
+    telephone_number_list = None
diff --git a/iris_sdk/models/maps/base_map.py b/bandwidth_numbers/models/maps/base_map.py
similarity index 100%
rename from iris_sdk/models/maps/base_map.py
rename to bandwidth_numbers/models/maps/base_map.py
diff --git a/iris_sdk/models/maps/callback_subscription.py b/bandwidth_numbers/models/maps/callback_subscription.py
similarity index 59%
rename from iris_sdk/models/maps/callback_subscription.py
rename to bandwidth_numbers/models/maps/callback_subscription.py
index b65c2be..c73ad6c 100644
--- a/iris_sdk/models/maps/callback_subscription.py
+++ b/bandwidth_numbers/models/maps/callback_subscription.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class CallbackSubscriptionMap(BaseMap):
 
     url = None
     user = None
     expiry = None
-    status = None
\ No newline at end of file
+    status = None
diff --git a/iris_sdk/models/maps/calling_name.py b/bandwidth_numbers/models/maps/calling_name.py
similarity index 54%
rename from iris_sdk/models/maps/calling_name.py
rename to bandwidth_numbers/models/maps/calling_name.py
index df4e38c..e450ba9 100644
--- a/iris_sdk/models/maps/calling_name.py
+++ b/bandwidth_numbers/models/maps/calling_name.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class CallingNameMap(BaseMap):
 
     display = None
     enforce = None
-    enforced = None
\ No newline at end of file
+    enforced = None
diff --git a/bandwidth_numbers/models/maps/cities.py b/bandwidth_numbers/models/maps/cities.py
new file mode 100644
index 0000000..d843c85
--- /dev/null
+++ b/bandwidth_numbers/models/maps/cities.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class CitiesMap(BaseMap):
+
+    result_count = None
+    cities = None
diff --git a/bandwidth_numbers/models/maps/cities_list.py b/bandwidth_numbers/models/maps/cities_list.py
new file mode 100644
index 0000000..110dc8f
--- /dev/null
+++ b/bandwidth_numbers/models/maps/cities_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class CitiesListMap(BaseMap):
+
+    city = None
diff --git a/bandwidth_numbers/models/maps/cities_short_list.py b/bandwidth_numbers/models/maps/cities_short_list.py
new file mode 100644
index 0000000..46cd1b6
--- /dev/null
+++ b/bandwidth_numbers/models/maps/cities_short_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class CitiesShortListMap(BaseMap):
+
+    city = None
diff --git a/bandwidth_numbers/models/maps/city.py b/bandwidth_numbers/models/maps/city.py
new file mode 100644
index 0000000..523c865
--- /dev/null
+++ b/bandwidth_numbers/models/maps/city.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class CityMap(BaseMap):
+
+    city = None
+    name = None
+    rc_abbreviation = None
diff --git a/iris_sdk/models/maps/completed_numbers.py b/bandwidth_numbers/models/maps/completed_numbers.py
similarity index 60%
rename from iris_sdk/models/maps/completed_numbers.py
rename to bandwidth_numbers/models/maps/completed_numbers.py
index e43fcad..d2687e0 100644
--- a/iris_sdk/models/maps/completed_numbers.py
+++ b/bandwidth_numbers/models/maps/completed_numbers.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class CompletedNumbersMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/contact.py b/bandwidth_numbers/models/maps/contact.py
similarity index 59%
rename from iris_sdk/models/maps/contact.py
rename to bandwidth_numbers/models/maps/contact.py
index 456354f..e18406c 100644
--- a/iris_sdk/models/maps/contact.py
+++ b/bandwidth_numbers/models/maps/contact.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ContactMap(BaseMap):
 
     email = None
     first_name = None
     last_name = None
-    phone = None
\ No newline at end of file
+    phone = None
diff --git a/iris_sdk/models/maps/covered_rate_centers.py b/bandwidth_numbers/models/maps/covered_rate_centers.py
similarity index 57%
rename from iris_sdk/models/maps/covered_rate_centers.py
rename to bandwidth_numbers/models/maps/covered_rate_centers.py
index f12f5bd..6feb640 100644
--- a/iris_sdk/models/maps/covered_rate_centers.py
+++ b/bandwidth_numbers/models/maps/covered_rate_centers.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class CoveredRateCentersMap(BaseMap):
 
     links = None
     covered_rate_center = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/iris_sdk/models/maps/disc_numbers.py b/bandwidth_numbers/models/maps/disc_numbers.py
similarity index 55%
rename from iris_sdk/models/maps/disc_numbers.py
rename to bandwidth_numbers/models/maps/disc_numbers.py
index 7c720e5..47ad37d 100644
--- a/iris_sdk/models/maps/disc_numbers.py
+++ b/bandwidth_numbers/models/maps/disc_numbers.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DiscNumbersMap(BaseMap):
 
     links = None
     telephone_numbers = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/iris_sdk/models/maps/disconnect.py b/bandwidth_numbers/models/maps/disconnect.py
similarity index 82%
rename from iris_sdk/models/maps/disconnect.py
rename to bandwidth_numbers/models/maps/disconnect.py
index dea7f0f..b2e5e54 100644
--- a/iris_sdk/models/maps/disconnect.py
+++ b/bandwidth_numbers/models/maps/disconnect.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DisconnectMap(BaseMap):
 
@@ -15,4 +15,4 @@ class DisconnectMap(BaseMap):
     order_id = None
     order_status = None
     order_type = None
-    user_id = None
\ No newline at end of file
+    user_id = None
diff --git a/iris_sdk/models/maps/disconnect_telephone_number_order_type.py b/bandwidth_numbers/models/maps/disconnect_telephone_number_order_type.py
similarity index 53%
rename from iris_sdk/models/maps/disconnect_telephone_number_order_type.py
rename to bandwidth_numbers/models/maps/disconnect_telephone_number_order_type.py
index 540304c..cadcec7 100644
--- a/iris_sdk/models/maps/disconnect_telephone_number_order_type.py
+++ b/bandwidth_numbers/models/maps/disconnect_telephone_number_order_type.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DisconnectTelephoneNumberOrderTypeMap(BaseMap):
 
     disconnect_mode = None
-    telephone_number_list = None
\ No newline at end of file
+    telephone_number_list = None
diff --git a/iris_sdk/models/maps/disconnects.py b/bandwidth_numbers/models/maps/disconnects.py
similarity index 56%
rename from iris_sdk/models/maps/disconnects.py
rename to bandwidth_numbers/models/maps/disconnects.py
index 4a671d8..0f8ff94 100644
--- a/iris_sdk/models/maps/disconnects.py
+++ b/bandwidth_numbers/models/maps/disconnects.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DisconnectsMap(BaseMap):
 
     links = None
     order_id_user_id_date = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/iris_sdk/models/maps/dlda.py b/bandwidth_numbers/models/maps/dlda.py
similarity index 88%
rename from iris_sdk/models/maps/dlda.py
rename to bandwidth_numbers/models/maps/dlda.py
index c371e03..a21ef0d 100644
--- a/iris_sdk/models/maps/dlda.py
+++ b/bandwidth_numbers/models/maps/dlda.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DldaMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/dlda_order_response.py b/bandwidth_numbers/models/maps/dlda_order_response.py
new file mode 100644
index 0000000..3a1b344
--- /dev/null
+++ b/bandwidth_numbers/models/maps/dlda_order_response.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class DldaOrderResponseMap(BaseMap):
+
+    dlda_order = None
diff --git a/iris_sdk/models/maps/dlda_tn_group.py b/bandwidth_numbers/models/maps/dlda_tn_group.py
similarity index 79%
rename from iris_sdk/models/maps/dlda_tn_group.py
rename to bandwidth_numbers/models/maps/dlda_tn_group.py
index 3e0d9e9..aa6c611 100644
--- a/iris_sdk/models/maps/dlda_tn_group.py
+++ b/bandwidth_numbers/models/maps/dlda_tn_group.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DldaTnGroupMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/dlda_tn_groups.py b/bandwidth_numbers/models/maps/dlda_tn_groups.py
new file mode 100644
index 0000000..2feb6dc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/dlda_tn_groups.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class DldaTnGroupsMap(BaseMap):
+
+    dlda_tn_group = None
diff --git a/iris_sdk/models/maps/dldas.py b/bandwidth_numbers/models/maps/dldas.py
similarity index 50%
rename from iris_sdk/models/maps/dldas.py
rename to bandwidth_numbers/models/maps/dldas.py
index 2c481cd..aac0f36 100644
--- a/iris_sdk/models/maps/dldas.py
+++ b/bandwidth_numbers/models/maps/dldas.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class DldasMap(BaseMap):
 
     order_id_user_id_date = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/bandwidth_numbers/models/maps/email_subscription.py b/bandwidth_numbers/models/maps/email_subscription.py
new file mode 100644
index 0000000..9fd5ade
--- /dev/null
+++ b/bandwidth_numbers/models/maps/email_subscription.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class EmailSubscriptionMap(BaseMap):
+
+    email = None
+    digest_requested = None
diff --git a/iris_sdk/models/maps/error.py b/bandwidth_numbers/models/maps/error.py
similarity index 56%
rename from iris_sdk/models/maps/error.py
rename to bandwidth_numbers/models/maps/error.py
index 9b24acf..37b6c30 100644
--- a/iris_sdk/models/maps/error.py
+++ b/bandwidth_numbers/models/maps/error.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ErrorMap(BaseMap):
 
     code = None
     description = None
     error_code = None
-    telephone_number = None
\ No newline at end of file
+    telephone_number = None
diff --git a/bandwidth_numbers/models/maps/error_list.py b/bandwidth_numbers/models/maps/error_list.py
new file mode 100644
index 0000000..f25840f
--- /dev/null
+++ b/bandwidth_numbers/models/maps/error_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class ErrorListMap(BaseMap):
+
+    error = None
diff --git a/iris_sdk/models/maps/feature_dlda.py b/bandwidth_numbers/models/maps/feature_dlda.py
similarity index 65%
rename from iris_sdk/models/maps/feature_dlda.py
rename to bandwidth_numbers/models/maps/feature_dlda.py
index 516a8d9..b8ae962 100644
--- a/iris_sdk/models/maps/feature_dlda.py
+++ b/bandwidth_numbers/models/maps/feature_dlda.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class FeatureDldaMap(BaseMap):
 
@@ -9,4 +9,4 @@ class FeatureDldaMap(BaseMap):
     listing_name = None
     listing_type = None
     status = None
-    subscriber_type = None
\ No newline at end of file
+    subscriber_type = None
diff --git a/iris_sdk/models/maps/feature_lidb.py b/bandwidth_numbers/models/maps/feature_lidb.py
similarity index 71%
rename from iris_sdk/models/maps/feature_lidb.py
rename to bandwidth_numbers/models/maps/feature_lidb.py
index 7922b49..9941b4b 100644
--- a/iris_sdk/models/maps/feature_lidb.py
+++ b/bandwidth_numbers/models/maps/feature_lidb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class FeatureLidbMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/features.py b/bandwidth_numbers/models/maps/features.py
new file mode 100644
index 0000000..6e6eccc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/features.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class FeaturesMap(BaseMap):
+
+    dlda = None
+    lidb = None
diff --git a/bandwidth_numbers/models/maps/file_data.py b/bandwidth_numbers/models/maps/file_data.py
new file mode 100644
index 0000000..3cac5fa
--- /dev/null
+++ b/bandwidth_numbers/models/maps/file_data.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class FileDataMap(BaseMap):
+
+    file_meta_data = None
+    file_name = None
diff --git a/bandwidth_numbers/models/maps/file_meta_data.py b/bandwidth_numbers/models/maps/file_meta_data.py
new file mode 100644
index 0000000..3e17c66
--- /dev/null
+++ b/bandwidth_numbers/models/maps/file_meta_data.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class FileMetaDataMap(BaseMap):
+
+    document_name = None
+    document_type = None
diff --git a/iris_sdk/models/maps/full_numbers.py b/bandwidth_numbers/models/maps/full_numbers.py
similarity index 57%
rename from iris_sdk/models/maps/full_numbers.py
rename to bandwidth_numbers/models/maps/full_numbers.py
index 8089731..03f5344 100644
--- a/iris_sdk/models/maps/full_numbers.py
+++ b/bandwidth_numbers/models/maps/full_numbers.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class FullNumbersMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/history.py b/bandwidth_numbers/models/maps/history.py
new file mode 100644
index 0000000..92fb8a4
--- /dev/null
+++ b/bandwidth_numbers/models/maps/history.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class HistoryMap(BaseMap):
+
+    order_history = None
diff --git a/iris_sdk/models/maps/host.py b/bandwidth_numbers/models/maps/host.py
similarity index 63%
rename from iris_sdk/models/maps/host.py
rename to bandwidth_numbers/models/maps/host.py
index 0f9adfc..2bfd2e0 100644
--- a/iris_sdk/models/maps/host.py
+++ b/bandwidth_numbers/models/maps/host.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class HostMap(BaseMap):
 
     customer_traffic_allowed = None
     data_allowed = None
     host_name = None
-    port = None
\ No newline at end of file
+    port = None
diff --git a/bandwidth_numbers/models/maps/hosts.py b/bandwidth_numbers/models/maps/hosts.py
new file mode 100644
index 0000000..35a1f0a
--- /dev/null
+++ b/bandwidth_numbers/models/maps/hosts.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class HostsMap(BaseMap):
+
+    host = None
diff --git a/iris_sdk/models/maps/import_tn_checker.py b/bandwidth_numbers/models/maps/import_tn_checker.py
similarity index 60%
rename from iris_sdk/models/maps/import_tn_checker.py
rename to bandwidth_numbers/models/maps/import_tn_checker.py
index bd2821f..1c6db68 100644
--- a/iris_sdk/models/maps/import_tn_checker.py
+++ b/bandwidth_numbers/models/maps/import_tn_checker.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ImportTnCheckerMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/import_tn_checker_list.py b/bandwidth_numbers/models/maps/import_tn_checker_list.py
similarity index 57%
rename from iris_sdk/models/maps/import_tn_checker_list.py
rename to bandwidth_numbers/models/maps/import_tn_checker_list.py
index 6569d96..3255435 100644
--- a/iris_sdk/models/maps/import_tn_checker_list.py
+++ b/bandwidth_numbers/models/maps/import_tn_checker_list.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnListMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/import_tn_checker_payload.py b/bandwidth_numbers/models/maps/import_tn_checker_payload.py
similarity index 67%
rename from iris_sdk/models/maps/import_tn_checker_payload.py
rename to bandwidth_numbers/models/maps/import_tn_checker_payload.py
index e970afd..48143b2 100644
--- a/iris_sdk/models/maps/import_tn_checker_payload.py
+++ b/bandwidth_numbers/models/maps/import_tn_checker_payload.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ImportTnCheckerPayloadMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/import_tn_checker_response.py b/bandwidth_numbers/models/maps/import_tn_checker_response.py
similarity index 64%
rename from iris_sdk/models/maps/import_tn_checker_response.py
rename to bandwidth_numbers/models/maps/import_tn_checker_response.py
index 1b08c8a..388c1f7 100644
--- a/iris_sdk/models/maps/import_tn_checker_response.py
+++ b/bandwidth_numbers/models/maps/import_tn_checker_response.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ImportTnCheckerResponseMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/in_service_numbers.py b/bandwidth_numbers/models/maps/in_service_numbers.py
similarity index 56%
rename from iris_sdk/models/maps/in_service_numbers.py
rename to bandwidth_numbers/models/maps/in_service_numbers.py
index d7d2015..34ef5cf 100644
--- a/iris_sdk/models/maps/in_service_numbers.py
+++ b/bandwidth_numbers/models/maps/in_service_numbers.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class InServiceNumbersMap(BaseMap):
 
     links = None
     telephone_numbers = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/bandwidth_numbers/models/maps/lata.py b/bandwidth_numbers/models/maps/lata.py
new file mode 100644
index 0000000..186931a
--- /dev/null
+++ b/bandwidth_numbers/models/maps/lata.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LataMap(BaseMap):
+
+    lata = None
diff --git a/iris_sdk/models/maps/lidb.py b/bandwidth_numbers/models/maps/lidb.py
similarity index 82%
rename from iris_sdk/models/maps/lidb.py
rename to bandwidth_numbers/models/maps/lidb.py
index 6b236db..699a761 100644
--- a/iris_sdk/models/maps/lidb.py
+++ b/bandwidth_numbers/models/maps/lidb.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LidbMap(BaseMap):
 
@@ -18,4 +18,4 @@ class LidbMap(BaseMap):
     created_by_user = None
     order_complete_date = None
     error_list = None
-    lidb_tn_groups = None
\ No newline at end of file
+    lidb_tn_groups = None
diff --git a/iris_sdk/models/maps/lidb_tn_group.py b/bandwidth_numbers/models/maps/lidb_tn_group.py
similarity index 66%
rename from iris_sdk/models/maps/lidb_tn_group.py
rename to bandwidth_numbers/models/maps/lidb_tn_group.py
index 0548b08..f622f73 100644
--- a/iris_sdk/models/maps/lidb_tn_group.py
+++ b/bandwidth_numbers/models/maps/lidb_tn_group.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LidbTnGroupMap(BaseMap):
 
@@ -8,4 +8,4 @@ class LidbTnGroupMap(BaseMap):
     subscriber_information = None
     use_type = None
     visibility = None
-    full_number = None
\ No newline at end of file
+    full_number = None
diff --git a/bandwidth_numbers/models/maps/lidb_tn_groups.py b/bandwidth_numbers/models/maps/lidb_tn_groups.py
new file mode 100644
index 0000000..e219bc5
--- /dev/null
+++ b/bandwidth_numbers/models/maps/lidb_tn_groups.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LidbTnGroupsMap(BaseMap):
+
+    lidb_tn_group = None
diff --git a/iris_sdk/models/maps/lidbs.py b/bandwidth_numbers/models/maps/lidbs.py
similarity index 50%
rename from iris_sdk/models/maps/lidbs.py
rename to bandwidth_numbers/models/maps/lidbs.py
index 2b76e65..9c54e2b 100644
--- a/iris_sdk/models/maps/lidbs.py
+++ b/bandwidth_numbers/models/maps/lidbs.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LidbsMap(BaseMap):
 
     order_id_user_id_date = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/bandwidth_numbers/models/maps/line_option_order.py b/bandwidth_numbers/models/maps/line_option_order.py
new file mode 100644
index 0000000..cd5e5ba
--- /dev/null
+++ b/bandwidth_numbers/models/maps/line_option_order.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LineOptionOrderMap(BaseMap):
+
+    tn_line_options = None
diff --git a/bandwidth_numbers/models/maps/line_option_order_response.py b/bandwidth_numbers/models/maps/line_option_order_response.py
new file mode 100644
index 0000000..be5e96c
--- /dev/null
+++ b/bandwidth_numbers/models/maps/line_option_order_response.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LineOptionOrderResponseMap(BaseMap):
+
+    line_options = None
diff --git a/iris_sdk/models/maps/line_options.py b/bandwidth_numbers/models/maps/line_options.py
similarity index 52%
rename from iris_sdk/models/maps/line_options.py
rename to bandwidth_numbers/models/maps/line_options.py
index 2711bdc..11ba024 100644
--- a/iris_sdk/models/maps/line_options.py
+++ b/bandwidth_numbers/models/maps/line_options.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LineOptionsMap(BaseMap):
 
     complete_numbers = None
-    errors = None
\ No newline at end of file
+    errors = None
diff --git a/bandwidth_numbers/models/maps/links.py b/bandwidth_numbers/models/maps/links.py
new file mode 100644
index 0000000..ef96d20
--- /dev/null
+++ b/bandwidth_numbers/models/maps/links.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LinksMap(BaseMap):
+
+    first = None
+    next = None
diff --git a/iris_sdk/models/maps/listing_name.py b/bandwidth_numbers/models/maps/listing_name.py
similarity index 79%
rename from iris_sdk/models/maps/listing_name.py
rename to bandwidth_numbers/models/maps/listing_name.py
index 8742eac..a70d6bb 100644
--- a/iris_sdk/models/maps/listing_name.py
+++ b/bandwidth_numbers/models/maps/listing_name.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ListingNameMap(BaseMap):
 
@@ -14,4 +14,4 @@ class ListingNameMap(BaseMap):
     title_of_lineage_name2 = None
     title_of_address_name2 = None
     title_of_address2_name2 = None
-    place_listing_as = None
\ No newline at end of file
+    place_listing_as = None
diff --git a/bandwidth_numbers/models/maps/lnp_losing_carriers.py b/bandwidth_numbers/models/maps/lnp_losing_carriers.py
new file mode 100644
index 0000000..e78b555
--- /dev/null
+++ b/bandwidth_numbers/models/maps/lnp_losing_carriers.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LnpLosingCarriersMap(BaseMap):
+
+    losing_carrier_tn_list = None
diff --git a/iris_sdk/models/maps/lnp_rate_center.py b/bandwidth_numbers/models/maps/lnp_rate_center.py
similarity index 65%
rename from iris_sdk/models/maps/lnp_rate_center.py
rename to bandwidth_numbers/models/maps/lnp_rate_center.py
index 9fa3414..9188119 100644
--- a/iris_sdk/models/maps/lnp_rate_center.py
+++ b/bandwidth_numbers/models/maps/lnp_rate_center.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LnpRateCenterMap(BaseMap):
 
@@ -9,4 +9,4 @@ class LnpRateCenterMap(BaseMap):
     rate_center = None
     state = None
     tiers = None
-    tn_list = None
\ No newline at end of file
+    tn_list = None
diff --git a/bandwidth_numbers/models/maps/lnp_rate_center_list.py b/bandwidth_numbers/models/maps/lnp_rate_center_list.py
new file mode 100644
index 0000000..1b37017
--- /dev/null
+++ b/bandwidth_numbers/models/maps/lnp_rate_center_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LnpRateCenterListMap(BaseMap):
+
+    rate_center_group = None
diff --git a/bandwidth_numbers/models/maps/lnpchecker.py b/bandwidth_numbers/models/maps/lnpchecker.py
new file mode 100644
index 0000000..87adca8
--- /dev/null
+++ b/bandwidth_numbers/models/maps/lnpchecker.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LnpCheckerMap(BaseMap):
+
+    tn_list = None
diff --git a/iris_sdk/models/maps/lnpchecker_response.py b/bandwidth_numbers/models/maps/lnpchecker_response.py
similarity index 68%
rename from iris_sdk/models/maps/lnpchecker_response.py
rename to bandwidth_numbers/models/maps/lnpchecker_response.py
index 4a0f0e7..f8daf82 100644
--- a/iris_sdk/models/maps/lnpchecker_response.py
+++ b/bandwidth_numbers/models/maps/lnpchecker_response.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LnpCheckerResponseMap(BaseMap):
 
@@ -8,4 +8,4 @@ class LnpCheckerResponseMap(BaseMap):
     portable_numbers = None
     supported_losing_carriers = None
     supported_rate_centers = None
-    unsupported_rate_centers = None
\ No newline at end of file
+    unsupported_rate_centers = None
diff --git a/iris_sdk/models/maps/loas.py b/bandwidth_numbers/models/maps/loas.py
similarity index 61%
rename from iris_sdk/models/maps/loas.py
rename to bandwidth_numbers/models/maps/loas.py
index 2cd35dd..6beb121 100644
--- a/iris_sdk/models/maps/loas.py
+++ b/bandwidth_numbers/models/maps/loas.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LoasMap(BaseMap):
 
@@ -8,4 +8,4 @@ class LoasMap(BaseMap):
     file_data = None
     file_names = None
     result_code = None
-    result_message = None
\ No newline at end of file
+    result_message = None
diff --git a/bandwidth_numbers/models/maps/local_rate_center_list.py b/bandwidth_numbers/models/maps/local_rate_center_list.py
new file mode 100644
index 0000000..3475158
--- /dev/null
+++ b/bandwidth_numbers/models/maps/local_rate_center_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LocalRateCenterListMap(BaseMap):
+
+    rate_center_id = None
diff --git a/bandwidth_numbers/models/maps/location.py b/bandwidth_numbers/models/maps/location.py
new file mode 100644
index 0000000..a5ab8f2
--- /dev/null
+++ b/bandwidth_numbers/models/maps/location.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LocationMap(BaseMap):
+
+    rate_centers = None
diff --git a/iris_sdk/models/maps/losing_carrier_tn_list.py b/bandwidth_numbers/models/maps/losing_carrier_tn_list.py
similarity index 77%
rename from iris_sdk/models/maps/losing_carrier_tn_list.py
rename to bandwidth_numbers/models/maps/losing_carrier_tn_list.py
index c1d026d..7918537 100644
--- a/iris_sdk/models/maps/losing_carrier_tn_list.py
+++ b/bandwidth_numbers/models/maps/losing_carrier_tn_list.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class LosingCarrierTnListMap(BaseMap):
 
@@ -9,4 +9,4 @@ class LosingCarrierTnListMap(BaseMap):
     losing_carrier_minimum_porting_interval = None
     losing_carrier_name = None
     losing_carrier_spid = None
-    tn_list = None
\ No newline at end of file
+    tn_list = None
diff --git a/bandwidth_numbers/models/maps/movetns.py b/bandwidth_numbers/models/maps/movetns.py
new file mode 100644
index 0000000..98bd0d5
--- /dev/null
+++ b/bandwidth_numbers/models/maps/movetns.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class MovetnsMap(BaseMap):
+
+    full_number = None
diff --git a/iris_sdk/models/maps/note.py b/bandwidth_numbers/models/maps/note.py
similarity index 59%
rename from iris_sdk/models/maps/note.py
rename to bandwidth_numbers/models/maps/note.py
index 586c4d9..9db1978 100644
--- a/iris_sdk/models/maps/note.py
+++ b/bandwidth_numbers/models/maps/note.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class NoteMap(BaseMap):
 
     description = None
     id = None
     last_date_modifier = None
-    user_id = None
\ No newline at end of file
+    user_id = None
diff --git a/bandwidth_numbers/models/maps/notes.py b/bandwidth_numbers/models/maps/notes.py
new file mode 100644
index 0000000..3458ba4
--- /dev/null
+++ b/bandwidth_numbers/models/maps/notes.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class NotesMap(BaseMap):
+
+    note = None
diff --git a/iris_sdk/models/maps/npa_nxx.py b/bandwidth_numbers/models/maps/npa_nxx.py
similarity index 60%
rename from iris_sdk/models/maps/npa_nxx.py
rename to bandwidth_numbers/models/maps/npa_nxx.py
index 4ace04a..68b5d37 100644
--- a/iris_sdk/models/maps/npa_nxx.py
+++ b/bandwidth_numbers/models/maps/npa_nxx.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class NpaNxxMap(BaseMap):
 
@@ -8,4 +8,4 @@ class NpaNxxMap(BaseMap):
     npa = None
     nxx = None
     quantity = None
-    state = None
\ No newline at end of file
+    state = None
diff --git a/bandwidth_numbers/models/maps/npanxx_list.py b/bandwidth_numbers/models/maps/npanxx_list.py
new file mode 100644
index 0000000..c7fe8f3
--- /dev/null
+++ b/bandwidth_numbers/models/maps/npanxx_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class NpanxxListMap(BaseMap):
+
+    npanxx = None
diff --git a/iris_sdk/models/maps/ord/__init__.py b/bandwidth_numbers/models/maps/ord/__init__.py
similarity index 100%
rename from iris_sdk/models/maps/ord/__init__.py
rename to bandwidth_numbers/models/maps/ord/__init__.py
diff --git a/iris_sdk/models/maps/ord/area_code_search_order.py b/bandwidth_numbers/models/maps/ord/area_code_search_order.py
similarity index 51%
rename from iris_sdk/models/maps/ord/area_code_search_order.py
rename to bandwidth_numbers/models/maps/ord/area_code_search_order.py
index 3acff11..51e8259 100644
--- a/iris_sdk/models/maps/ord/area_code_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/area_code_search_order.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class AreaCodeSearchOrderMap(BaseMap):
 
     area_code = None
-    quantity = None
\ No newline at end of file
+    quantity = None
diff --git a/iris_sdk/models/maps/ord/city_search_order.py b/bandwidth_numbers/models/maps/ord/city_search_order.py
similarity index 55%
rename from iris_sdk/models/maps/ord/city_search_order.py
rename to bandwidth_numbers/models/maps/ord/city_search_order.py
index b461173..e06a7d0 100644
--- a/iris_sdk/models/maps/ord/city_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/city_search_order.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class CitySearchOrderMap(BaseMap):
 
     city = None
     quantity = None
-    state = None
\ No newline at end of file
+    state = None
diff --git a/iris_sdk/models/maps/ord/existing_search_order.py b/bandwidth_numbers/models/maps/ord/existing_search_order.py
similarity index 50%
rename from iris_sdk/models/maps/ord/existing_search_order.py
rename to bandwidth_numbers/models/maps/ord/existing_search_order.py
index 8c45912..1346a36 100644
--- a/iris_sdk/models/maps/ord/existing_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/existing_search_order.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ExistingSearchOrderMap(BaseMap):
 
     reservation_id_list = None
-    telephone_number_list = None
\ No newline at end of file
+    telephone_number_list = None
diff --git a/bandwidth_numbers/models/maps/ord/lata_search_order.py b/bandwidth_numbers/models/maps/ord/lata_search_order.py
new file mode 100644
index 0000000..713b9da
--- /dev/null
+++ b/bandwidth_numbers/models/maps/ord/lata_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class LataSearchOrderMap(BaseMap):
+
+    lata = None
+    quantity = None
diff --git a/iris_sdk/models/maps/ord/npa_search_order.py b/bandwidth_numbers/models/maps/ord/npa_search_order.py
similarity index 55%
rename from iris_sdk/models/maps/ord/npa_search_order.py
rename to bandwidth_numbers/models/maps/ord/npa_search_order.py
index 2184050..4cdc14e 100644
--- a/iris_sdk/models/maps/ord/npa_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/npa_search_order.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class NpaSearchOrderMap(BaseMap):
 
     enable_lca = None
     npa_nxx = None
-    quantity = None
\ No newline at end of file
+    quantity = None
diff --git a/iris_sdk/models/maps/ord/rate_center_search_order.py b/bandwidth_numbers/models/maps/ord/rate_center_search_order.py
similarity index 58%
rename from iris_sdk/models/maps/ord/rate_center_search_order.py
rename to bandwidth_numbers/models/maps/ord/rate_center_search_order.py
index 25ecb54..75903a4 100644
--- a/iris_sdk/models/maps/ord/rate_center_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/rate_center_search_order.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class RateCenterSearchOrderMap(BaseMap):
 
     quantity = None
     rate_center = None
-    state = None
\ No newline at end of file
+    state = None
diff --git a/iris_sdk/models/maps/ord/state_search_order.py b/bandwidth_numbers/models/maps/ord/state_search_order.py
similarity index 51%
rename from iris_sdk/models/maps/ord/state_search_order.py
rename to bandwidth_numbers/models/maps/ord/state_search_order.py
index cd37f78..df54282 100644
--- a/iris_sdk/models/maps/ord/state_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/state_search_order.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class StateSearchOrderMap(BaseMap):
 
     quantity = None
-    state = None
\ No newline at end of file
+    state = None
diff --git a/bandwidth_numbers/models/maps/ord/vanity_search_order.py b/bandwidth_numbers/models/maps/ord/vanity_search_order.py
new file mode 100644
index 0000000..86f8d00
--- /dev/null
+++ b/bandwidth_numbers/models/maps/ord/vanity_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class VanitySearchOrderMap(BaseMap):
+
+    quantity = None
+    toll_free_vanity = None
diff --git a/bandwidth_numbers/models/maps/ord/wildcard_search_order.py b/bandwidth_numbers/models/maps/ord/wildcard_search_order.py
new file mode 100644
index 0000000..d9f55fd
--- /dev/null
+++ b/bandwidth_numbers/models/maps/ord/wildcard_search_order.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class WildcardSearchOrderMap(BaseMap):
+
+    quantity = None
+    toll_free_wild_card_pattern = None
diff --git a/iris_sdk/models/maps/ord/zip_search_order.py b/bandwidth_numbers/models/maps/ord/zip_search_order.py
similarity index 51%
rename from iris_sdk/models/maps/ord/zip_search_order.py
rename to bandwidth_numbers/models/maps/ord/zip_search_order.py
index ef982f8..1dbb47e 100644
--- a/iris_sdk/models/maps/ord/zip_search_order.py
+++ b/bandwidth_numbers/models/maps/ord/zip_search_order.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ZipSearchOrderMap(BaseMap):
 
     quantity = None
-    zip = None
\ No newline at end of file
+    zip = None
diff --git a/iris_sdk/models/maps/order.py b/bandwidth_numbers/models/maps/order.py
similarity index 90%
rename from iris_sdk/models/maps/order.py
rename to bandwidth_numbers/models/maps/order.py
index 93c1f9a..42329dd 100644
--- a/iris_sdk/models/maps/order.py
+++ b/bandwidth_numbers/models/maps/order.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class OrderMap(BaseMap):
 
@@ -31,4 +31,4 @@ class OrderMap(BaseMap):
     toll_free_vanity_search_and_order_type = None
     toll_free_wild_char_search_and_order_type = None
     user_id = None
-    zip_search_and_order_type = None
\ No newline at end of file
+    zip_search_and_order_type = None
diff --git a/iris_sdk/models/maps/order_history.py b/bandwidth_numbers/models/maps/order_history.py
similarity index 61%
rename from iris_sdk/models/maps/order_history.py
rename to bandwidth_numbers/models/maps/order_history.py
index 05d8e62..7ad1e48 100644
--- a/iris_sdk/models/maps/order_history.py
+++ b/bandwidth_numbers/models/maps/order_history.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class OrderHistoryMap(BaseMap):
 
@@ -8,4 +8,4 @@ class OrderHistoryMap(BaseMap):
     note = None
     author = None
     status = None
-    difference = None
\ No newline at end of file
+    difference = None
diff --git a/iris_sdk/models/maps/order_response.py b/bandwidth_numbers/models/maps/order_response.py
similarity index 84%
rename from iris_sdk/models/maps/order_response.py
rename to bandwidth_numbers/models/maps/order_response.py
index 8025fa0..19a2199 100644
--- a/iris_sdk/models/maps/order_response.py
+++ b/bandwidth_numbers/models/maps/order_response.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class OrderResponseMap(BaseMap):
 
@@ -18,4 +18,4 @@ class OrderResponseMap(BaseMap):
     order_status = None
     order_type = None
     pending_quantity = None
-    user_id = None
\ No newline at end of file
+    user_id = None
diff --git a/bandwidth_numbers/models/maps/order_tns.py b/bandwidth_numbers/models/maps/order_tns.py
new file mode 100644
index 0000000..241a1fc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/order_tns.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class OrderTnsMap(BaseMap):
+
+    count = None
+    telephone_number = None
diff --git a/iris_sdk/models/maps/orders.py b/bandwidth_numbers/models/maps/orders.py
similarity index 55%
rename from iris_sdk/models/maps/orders.py
rename to bandwidth_numbers/models/maps/orders.py
index 20eacb7..6987751 100644
--- a/iris_sdk/models/maps/orders.py
+++ b/bandwidth_numbers/models/maps/orders.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class OrdersMap(BaseMap):
 
     links = None
     order_id_user_id_date = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/bandwidth_numbers/models/maps/permission.py b/bandwidth_numbers/models/maps/permission.py
new file mode 100644
index 0000000..c8cccfc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/permission.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class PermissionMap(BaseMap):
+
+    permission_name = None
diff --git a/bandwidth_numbers/models/maps/permissions_list.py b/bandwidth_numbers/models/maps/permissions_list.py
new file mode 100644
index 0000000..d3e92cc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/permissions_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class PermissionsListMap(BaseMap):
+
+    permission = None
diff --git a/bandwidth_numbers/models/maps/phone_number_list.py b/bandwidth_numbers/models/maps/phone_number_list.py
new file mode 100644
index 0000000..e88a841
--- /dev/null
+++ b/bandwidth_numbers/models/maps/phone_number_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class PhoneNumberListMap(BaseMap):
+
+    phone_number = None
diff --git a/iris_sdk/models/maps/portin.py b/bandwidth_numbers/models/maps/portin.py
similarity index 90%
rename from iris_sdk/models/maps/portin.py
rename to bandwidth_numbers/models/maps/portin.py
index 3f39f2b..4ea6b98 100644
--- a/iris_sdk/models/maps/portin.py
+++ b/bandwidth_numbers/models/maps/portin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class PortInMap(BaseMap):
 
@@ -36,4 +36,4 @@ class PortInMap(BaseMap):
     user_id = None
     vendor_id = None
     vendor_name = None
-    wireless_info = None
\ No newline at end of file
+    wireless_info = None
diff --git a/iris_sdk/models/maps/portins.py b/bandwidth_numbers/models/maps/portins.py
similarity index 57%
rename from iris_sdk/models/maps/portins.py
rename to bandwidth_numbers/models/maps/portins.py
index 8b7680c..4647331 100644
--- a/iris_sdk/models/maps/portins.py
+++ b/bandwidth_numbers/models/maps/portins.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class PortInsMap(BaseMap):
 
     links = None
     lnp_port_info_for_given_status = None
-    total_count = None
\ No newline at end of file
+    total_count = None
diff --git a/iris_sdk/models/maps/rate_center.py b/bandwidth_numbers/models/maps/rate_center.py
similarity index 76%
rename from iris_sdk/models/maps/rate_center.py
rename to bandwidth_numbers/models/maps/rate_center.py
index 6e7ad58..8b0861d 100644
--- a/iris_sdk/models/maps/rate_center.py
+++ b/bandwidth_numbers/models/maps/rate_center.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class RateCenterMap(BaseMap):
 
@@ -14,4 +14,4 @@ class RateCenterMap(BaseMap):
     npa_nxx_xs = None
     state = None
     tiers = None
-    zip_codes = None
\ No newline at end of file
+    zip_codes = None
diff --git a/bandwidth_numbers/models/maps/rate_centers.py b/bandwidth_numbers/models/maps/rate_centers.py
new file mode 100644
index 0000000..369277f
--- /dev/null
+++ b/bandwidth_numbers/models/maps/rate_centers.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class RateCentersMap(BaseMap):
+
+    result_count = None
+    rate_centers = None
diff --git a/bandwidth_numbers/models/maps/rate_centers_list.py b/bandwidth_numbers/models/maps/rate_centers_list.py
new file mode 100644
index 0000000..436161e
--- /dev/null
+++ b/bandwidth_numbers/models/maps/rate_centers_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class RateCentersListMap(BaseMap):
+
+    rate_center = None
diff --git a/iris_sdk/models/maps/reservation.py b/bandwidth_numbers/models/maps/reservation.py
similarity index 62%
rename from iris_sdk/models/maps/reservation.py
rename to bandwidth_numbers/models/maps/reservation.py
index 1c224a2..ba83e6a 100644
--- a/iris_sdk/models/maps/reservation.py
+++ b/bandwidth_numbers/models/maps/reservation.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ReservationMap(BaseMap):
 
     account_id = None
     reservation_id = None
     reservation_expires = None
-    reserved_tn = None
\ No newline at end of file
+    reserved_tn = None
diff --git a/iris_sdk/models/maps/reservation_list.py b/bandwidth_numbers/models/maps/reservation_list.py
similarity index 59%
rename from iris_sdk/models/maps/reservation_list.py
rename to bandwidth_numbers/models/maps/reservation_list.py
index 339c787..8c7971c 100644
--- a/iris_sdk/models/maps/reservation_list.py
+++ b/bandwidth_numbers/models/maps/reservation_list.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class ReservationListMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/response_status.py b/bandwidth_numbers/models/maps/response_status.py
new file mode 100644
index 0000000..d4f8472
--- /dev/null
+++ b/bandwidth_numbers/models/maps/response_status.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class ResponseStatusMap(BaseMap):
+
+    description = None
diff --git a/bandwidth_numbers/models/maps/role.py b/bandwidth_numbers/models/maps/role.py
new file mode 100644
index 0000000..35ecf98
--- /dev/null
+++ b/bandwidth_numbers/models/maps/role.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class RoleMap(BaseMap):
+
+    permissions = None
+    role_name = None
diff --git a/bandwidth_numbers/models/maps/roles_list.py b/bandwidth_numbers/models/maps/roles_list.py
new file mode 100644
index 0000000..e7f1610
--- /dev/null
+++ b/bandwidth_numbers/models/maps/roles_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class RolesListMap(BaseMap):
+
+    role = None
diff --git a/iris_sdk/models/maps/sip_peer.py b/bandwidth_numbers/models/maps/sip_peer.py
similarity index 78%
rename from iris_sdk/models/maps/sip_peer.py
rename to bandwidth_numbers/models/maps/sip_peer.py
index 1df86b3..8bf5a09 100644
--- a/iris_sdk/models/maps/sip_peer.py
+++ b/bandwidth_numbers/models/maps/sip_peer.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SipPeerMap(BaseMap):
 
@@ -14,4 +14,4 @@ class SipPeerMap(BaseMap):
     short_messaging_protocol = None
     sms_hosts = None
     termination_hosts = None
-    voice_hosts = None
\ No newline at end of file
+    voice_hosts = None
diff --git a/iris_sdk/models/maps/sip_peer_host.py b/bandwidth_numbers/models/maps/sip_peer_host.py
similarity index 61%
rename from iris_sdk/models/maps/sip_peer_host.py
rename to bandwidth_numbers/models/maps/sip_peer_host.py
index 6ab7516..7209129 100644
--- a/iris_sdk/models/maps/sip_peer_host.py
+++ b/bandwidth_numbers/models/maps/sip_peer_host.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SipPeerHostMap(BaseMap):
 
     sip_peer_id = None
     sms_hosts = None
     termination_hosts = None
-    voice_hosts = None
\ No newline at end of file
+    voice_hosts = None
diff --git a/bandwidth_numbers/models/maps/sip_peer_hosts.py b/bandwidth_numbers/models/maps/sip_peer_hosts.py
new file mode 100644
index 0000000..b5ac815
--- /dev/null
+++ b/bandwidth_numbers/models/maps/sip_peer_hosts.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SipPeerHostsMap(BaseMap):
+
+    sip_peer_host = None
diff --git a/iris_sdk/models/maps/sip_peer_telephone_number.py b/bandwidth_numbers/models/maps/sip_peer_telephone_number.py
similarity index 72%
rename from iris_sdk/models/maps/sip_peer_telephone_number.py
rename to bandwidth_numbers/models/maps/sip_peer_telephone_number.py
index bb74343..21e2c76 100644
--- a/iris_sdk/models/maps/sip_peer_telephone_number.py
+++ b/bandwidth_numbers/models/maps/sip_peer_telephone_number.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SipPeerTelephoneNumberMap(BaseMap):
 
@@ -10,4 +10,4 @@ class SipPeerTelephoneNumberMap(BaseMap):
     number_format = None
     rewrite_user = None
     rpid_format = None
-    tn_attributes = None
\ No newline at end of file
+    tn_attributes = None
diff --git a/bandwidth_numbers/models/maps/sip_peer_telephone_numbers.py b/bandwidth_numbers/models/maps/sip_peer_telephone_numbers.py
new file mode 100644
index 0000000..bf13baf
--- /dev/null
+++ b/bandwidth_numbers/models/maps/sip_peer_telephone_numbers.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SipPeerTelephoneNumbersMap(BaseMap):
+
+    sip_peer_telephone_number = None
diff --git a/bandwidth_numbers/models/maps/sip_peer_tns.py b/bandwidth_numbers/models/maps/sip_peer_tns.py
new file mode 100644
index 0000000..20c48da
--- /dev/null
+++ b/bandwidth_numbers/models/maps/sip_peer_tns.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SipPeerTnsMap(BaseMap):
+
+    sip_peer_telephone_numbers = None
diff --git a/iris_sdk/models/maps/sip_peer_totaltns.py b/bandwidth_numbers/models/maps/sip_peer_totaltns.py
similarity index 50%
rename from iris_sdk/models/maps/sip_peer_totaltns.py
rename to bandwidth_numbers/models/maps/sip_peer_totaltns.py
index 44b5800..a9d5be6 100644
--- a/iris_sdk/models/maps/sip_peer_totaltns.py
+++ b/bandwidth_numbers/models/maps/sip_peer_totaltns.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SipPeerTotaltnsMap(BaseMap):
 
     cnam_count = None
     lidb_count = None
-    sip_peer_telephone_numbers_count = None
\ No newline at end of file
+    sip_peer_telephone_numbers_count = None
diff --git a/bandwidth_numbers/models/maps/sip_peers.py b/bandwidth_numbers/models/maps/sip_peers.py
new file mode 100644
index 0000000..4f1c403
--- /dev/null
+++ b/bandwidth_numbers/models/maps/sip_peers.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SipPeersMap(BaseMap):
+
+    sip_peer = None
diff --git a/iris_sdk/models/maps/site.py b/bandwidth_numbers/models/maps/site.py
similarity index 68%
rename from iris_sdk/models/maps/site.py
rename to bandwidth_numbers/models/maps/site.py
index f38af09..8900150 100644
--- a/iris_sdk/models/maps/site.py
+++ b/bandwidth_numbers/models/maps/site.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SiteMap(BaseMap):
 
@@ -9,4 +9,4 @@ class SiteMap(BaseMap):
     customer_provided_id = None
     description = None
     id = None
-    name = None
\ No newline at end of file
+    name = None
diff --git a/iris_sdk/models/maps/site_host.py b/bandwidth_numbers/models/maps/site_host.py
similarity index 50%
rename from iris_sdk/models/maps/site_host.py
rename to bandwidth_numbers/models/maps/site_host.py
index d61ed24..2c2a6f7 100644
--- a/iris_sdk/models/maps/site_host.py
+++ b/bandwidth_numbers/models/maps/site_host.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SiteHostMap(BaseMap):
 
     sip_peer_hosts = None
-    site_id = None
\ No newline at end of file
+    site_id = None
diff --git a/bandwidth_numbers/models/maps/site_hosts.py b/bandwidth_numbers/models/maps/site_hosts.py
new file mode 100644
index 0000000..4c9c9f9
--- /dev/null
+++ b/bandwidth_numbers/models/maps/site_hosts.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SiteHostsMap(BaseMap):
+
+    site_host = None
diff --git a/bandwidth_numbers/models/maps/site_totaltns.py b/bandwidth_numbers/models/maps/site_totaltns.py
new file mode 100644
index 0000000..808afd9
--- /dev/null
+++ b/bandwidth_numbers/models/maps/site_totaltns.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SiteTotaltnsMap(BaseMap):
+
+    total_count = None
diff --git a/bandwidth_numbers/models/maps/sites.py b/bandwidth_numbers/models/maps/sites.py
new file mode 100644
index 0000000..e8dc06a
--- /dev/null
+++ b/bandwidth_numbers/models/maps/sites.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SitesMap(BaseMap):
+
+    site = None
diff --git a/iris_sdk/models/maps/subscriber.py b/bandwidth_numbers/models/maps/subscriber.py
similarity index 55%
rename from iris_sdk/models/maps/subscriber.py
rename to bandwidth_numbers/models/maps/subscriber.py
index 66e730f..0739134 100644
--- a/iris_sdk/models/maps/subscriber.py
+++ b/bandwidth_numbers/models/maps/subscriber.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SubscriberMap(BaseMap):
 
     business_name = None
     subscriber_type = None
-    service_address = None
\ No newline at end of file
+    service_address = None
diff --git a/iris_sdk/models/maps/subscription.py b/bandwidth_numbers/models/maps/subscription.py
similarity index 62%
rename from iris_sdk/models/maps/subscription.py
rename to bandwidth_numbers/models/maps/subscription.py
index 196dfb4..c7680a8 100644
--- a/iris_sdk/models/maps/subscription.py
+++ b/bandwidth_numbers/models/maps/subscription.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class SubscriptionMap(BaseMap):
 
@@ -8,4 +8,4 @@ class SubscriptionMap(BaseMap):
     order_id = None
     order_type = None
     email_subscription = None
-    callback_subscription = None
\ No newline at end of file
+    callback_subscription = None
diff --git a/bandwidth_numbers/models/maps/subscriptions.py b/bandwidth_numbers/models/maps/subscriptions.py
new file mode 100644
index 0000000..5e82546
--- /dev/null
+++ b/bandwidth_numbers/models/maps/subscriptions.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class SubscriptionsMap(BaseMap):
+
+    subscription = None
diff --git a/iris_sdk/models/maps/telephone_number.py b/bandwidth_numbers/models/maps/telephone_number.py
similarity index 80%
rename from iris_sdk/models/maps/telephone_number.py
rename to bandwidth_numbers/models/maps/telephone_number.py
index 795980c..8ce19f1 100644
--- a/iris_sdk/models/maps/telephone_number.py
+++ b/bandwidth_numbers/models/maps/telephone_number.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TelephoneNumberMap(BaseMap):
 
@@ -18,4 +18,4 @@ class TelephoneNumberMap(BaseMap):
     status = None
     tier = None
     vendor_id = None
-    vendor_name = None
\ No newline at end of file
+    vendor_name = None
diff --git a/bandwidth_numbers/models/maps/telephone_number_detail_list.py b/bandwidth_numbers/models/maps/telephone_number_detail_list.py
new file mode 100644
index 0000000..83c4178
--- /dev/null
+++ b/bandwidth_numbers/models/maps/telephone_number_detail_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TelephoneNumberDetailListMap(BaseMap):
+
+    telephone_number_detail = None
diff --git a/bandwidth_numbers/models/maps/telephone_number_detail_list_tn.py b/bandwidth_numbers/models/maps/telephone_number_detail_list_tn.py
new file mode 100644
index 0000000..166afa7
--- /dev/null
+++ b/bandwidth_numbers/models/maps/telephone_number_detail_list_tn.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TelephoneNumberDetailListTnMap(BaseMap):
+
+    telephone_number = None
diff --git a/bandwidth_numbers/models/maps/telephone_number_list.py b/bandwidth_numbers/models/maps/telephone_number_list.py
new file mode 100644
index 0000000..36f54af
--- /dev/null
+++ b/bandwidth_numbers/models/maps/telephone_number_list.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TelephoneNumberListMap(BaseMap):
+
+    count = None
+    telephone_number = None
diff --git a/bandwidth_numbers/models/maps/telephone_numbers.py b/bandwidth_numbers/models/maps/telephone_numbers.py
new file mode 100644
index 0000000..351208e
--- /dev/null
+++ b/bandwidth_numbers/models/maps/telephone_numbers.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TelephoneNumbersMap(BaseMap):
+
+    telephone_number = None
diff --git a/bandwidth_numbers/models/maps/termination_hosts.py b/bandwidth_numbers/models/maps/termination_hosts.py
new file mode 100644
index 0000000..3a5e5c7
--- /dev/null
+++ b/bandwidth_numbers/models/maps/termination_hosts.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TerminationHostsMap(BaseMap):
+
+    termination_host = None
diff --git a/bandwidth_numbers/models/maps/tier_list.py b/bandwidth_numbers/models/maps/tier_list.py
new file mode 100644
index 0000000..4d8d2d8
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tier_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TierListMap(BaseMap):
+
+    tier = None
diff --git a/bandwidth_numbers/models/maps/tn_attributes.py b/bandwidth_numbers/models/maps/tn_attributes.py
new file mode 100644
index 0000000..1c5b4d4
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tn_attributes.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TnAttributesMap(BaseMap):
+
+    tn_attribute = None
diff --git a/iris_sdk/models/maps/tn_history.py b/bandwidth_numbers/models/maps/tn_history.py
similarity index 60%
rename from iris_sdk/models/maps/tn_history.py
rename to bandwidth_numbers/models/maps/tn_history.py
index 07ca4c1..a1a7f12 100644
--- a/iris_sdk/models/maps/tn_history.py
+++ b/bandwidth_numbers/models/maps/tn_history.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnHistoryMap(BaseMap):
 
diff --git a/bandwidth_numbers/models/maps/tn_lca.py b/bandwidth_numbers/models/maps/tn_lca.py
new file mode 100644
index 0000000..d30a26a
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tn_lca.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TnLcaMap(BaseMap):
+
+    listof_npanxx = None
+    location = None
diff --git a/bandwidth_numbers/models/maps/tn_line_options.py b/bandwidth_numbers/models/maps/tn_line_options.py
new file mode 100644
index 0000000..604362e
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tn_line_options.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TnLineOptionsMap(BaseMap):
+
+    telephone_number = None
+    calling_name_display = None
diff --git a/bandwidth_numbers/models/maps/tn_list.py b/bandwidth_numbers/models/maps/tn_list.py
new file mode 100644
index 0000000..95b8206
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tn_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TnListMap(BaseMap):
+
+    tn = None
diff --git a/iris_sdk/models/maps/tn_option_order.py b/bandwidth_numbers/models/maps/tn_option_order.py
similarity index 88%
rename from iris_sdk/models/maps/tn_option_order.py
rename to bandwidth_numbers/models/maps/tn_option_order.py
index 1b6ddc5..df36fd3 100644
--- a/iris_sdk/models/maps/tn_option_order.py
+++ b/bandwidth_numbers/models/maps/tn_option_order.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnOptionOrderMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/tn_option_order_group.py b/bandwidth_numbers/models/maps/tn_option_order_group.py
similarity index 85%
rename from iris_sdk/models/maps/tn_option_order_group.py
rename to bandwidth_numbers/models/maps/tn_option_order_group.py
index aa6ea55..9be8f56 100644
--- a/iris_sdk/models/maps/tn_option_order_group.py
+++ b/bandwidth_numbers/models/maps/tn_option_order_group.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnOptionOrderGroupMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/tn_option_order_groups.py b/bandwidth_numbers/models/maps/tn_option_order_groups.py
similarity index 60%
rename from iris_sdk/models/maps/tn_option_order_groups.py
rename to bandwidth_numbers/models/maps/tn_option_order_groups.py
index 2210a4f..c67319a 100644
--- a/iris_sdk/models/maps/tn_option_order_groups.py
+++ b/bandwidth_numbers/models/maps/tn_option_order_groups.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnOptionOrderGroupsMap(BaseMap):
     tn_option_group = None
diff --git a/iris_sdk/models/maps/tn_option_orders.py b/bandwidth_numbers/models/maps/tn_option_orders.py
similarity index 66%
rename from iris_sdk/models/maps/tn_option_orders.py
rename to bandwidth_numbers/models/maps/tn_option_orders.py
index 301a75f..63ff2c5 100644
--- a/iris_sdk/models/maps/tn_option_orders.py
+++ b/bandwidth_numbers/models/maps/tn_option_orders.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnOptionOrdersMap(BaseMap):
 
diff --git a/iris_sdk/models/maps/tn_rate_center.py b/bandwidth_numbers/models/maps/tn_rate_center.py
similarity index 57%
rename from iris_sdk/models/maps/tn_rate_center.py
rename to bandwidth_numbers/models/maps/tn_rate_center.py
index 64397d4..e850e9d 100644
--- a/iris_sdk/models/maps/tn_rate_center.py
+++ b/bandwidth_numbers/models/maps/tn_rate_center.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnRateCenterMap(BaseMap):
 
     state = None
     rate_center = None
-    rc = None
\ No newline at end of file
+    rc = None
diff --git a/iris_sdk/models/maps/tn_rate_centers_list.py b/bandwidth_numbers/models/maps/tn_rate_centers_list.py
similarity index 51%
rename from iris_sdk/models/maps/tn_rate_centers_list.py
rename to bandwidth_numbers/models/maps/tn_rate_centers_list.py
index 3825444..b0ba137 100644
--- a/iris_sdk/models/maps/tn_rate_centers_list.py
+++ b/bandwidth_numbers/models/maps/tn_rate_centers_list.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnRateCentersListMap(BaseMap):
 
     state = None
-    r_cs = None
\ No newline at end of file
+    r_cs = None
diff --git a/bandwidth_numbers/models/maps/tn_rc_list.py b/bandwidth_numbers/models/maps/tn_rc_list.py
new file mode 100644
index 0000000..6d17e12
--- /dev/null
+++ b/bandwidth_numbers/models/maps/tn_rc_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TelephoneNumberRcListMap(BaseMap):
+
+    rc = None
diff --git a/iris_sdk/models/maps/tn_status.py b/bandwidth_numbers/models/maps/tn_status.py
similarity index 69%
rename from iris_sdk/models/maps/tn_status.py
rename to bandwidth_numbers/models/maps/tn_status.py
index eb5eee6..de3c6a8 100644
--- a/iris_sdk/models/maps/tn_status.py
+++ b/bandwidth_numbers/models/maps/tn_status.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnStatusMap(BaseMap):
 
@@ -9,4 +9,4 @@ class TnStatusMap(BaseMap):
     order_create_date = None
     order_id = None
     order_type = None
-    status = None
\ No newline at end of file
+    status = None
diff --git a/iris_sdk/models/maps/tndetails.py b/bandwidth_numbers/models/maps/tndetails.py
similarity index 76%
rename from iris_sdk/models/maps/tndetails.py
rename to bandwidth_numbers/models/maps/tndetails.py
index eeb0805..7738c94 100644
--- a/iris_sdk/models/maps/tndetails.py
+++ b/bandwidth_numbers/models/maps/tndetails.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TndetailsMap(BaseMap):
 
@@ -15,4 +15,4 @@ class TndetailsMap(BaseMap):
     status = None
     tier = None
     vendor_id = None
-    vendor_name = None
\ No newline at end of file
+    vendor_name = None
diff --git a/iris_sdk/models/maps/tns.py b/bandwidth_numbers/models/maps/tns.py
similarity index 52%
rename from iris_sdk/models/maps/tns.py
rename to bandwidth_numbers/models/maps/tns.py
index 876a583..6cdde2d 100644
--- a/iris_sdk/models/maps/tns.py
+++ b/bandwidth_numbers/models/maps/tns.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class TnsMap(BaseMap):
 
     links = None
     telephone_number_count = None
-    telephone_numbers = None
\ No newline at end of file
+    telephone_numbers = None
diff --git a/bandwidth_numbers/models/maps/totals.py b/bandwidth_numbers/models/maps/totals.py
new file mode 100644
index 0000000..de9d0fc
--- /dev/null
+++ b/bandwidth_numbers/models/maps/totals.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class TotalsMap(BaseMap):
+
+    count = None
diff --git a/iris_sdk/models/maps/warning.py b/bandwidth_numbers/models/maps/warning.py
similarity index 63%
rename from iris_sdk/models/maps/warning.py
rename to bandwidth_numbers/models/maps/warning.py
index 745208c..e9d686b 100644
--- a/iris_sdk/models/maps/warning.py
+++ b/bandwidth_numbers/models/maps/warning.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class WarningMap(BaseMap):
     description = None
diff --git a/iris_sdk/models/maps/warnings.py b/bandwidth_numbers/models/maps/warnings.py
similarity index 55%
rename from iris_sdk/models/maps/warnings.py
rename to bandwidth_numbers/models/maps/warnings.py
index d17a1f2..993c267 100644
--- a/iris_sdk/models/maps/warnings.py
+++ b/bandwidth_numbers/models/maps/warnings.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
   
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class WarningsMap(BaseMap):
     warning = None
diff --git a/iris_sdk/models/maps/wireless_info.py b/bandwidth_numbers/models/maps/wireless_info.py
similarity index 50%
rename from iris_sdk/models/maps/wireless_info.py
rename to bandwidth_numbers/models/maps/wireless_info.py
index be9f63d..c1921b9 100644
--- a/iris_sdk/models/maps/wireless_info.py
+++ b/bandwidth_numbers/models/maps/wireless_info.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class WirelessInfoMap(BaseMap):
 
     account_number = None
-    pin_number = None
\ No newline at end of file
+    pin_number = None
diff --git a/bandwidth_numbers/models/maps/zip_code_list.py b/bandwidth_numbers/models/maps/zip_code_list.py
new file mode 100644
index 0000000..1c35c3a
--- /dev/null
+++ b/bandwidth_numbers/models/maps/zip_code_list.py
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from bandwidth_numbers.models.maps.base_map import BaseMap
+
+class ZipCodeListMap(BaseMap):
+
+    zip_code = None
diff --git a/iris_sdk/models/movetns.py b/bandwidth_numbers/models/movetns.py
similarity index 74%
rename from iris_sdk/models/movetns.py
rename to bandwidth_numbers/models/movetns.py
index b8dab6d..b3b4e59 100644
--- a/iris_sdk/models/movetns.py
+++ b/bandwidth_numbers/models/movetns.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.movetns import MovetnsData
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.movetns import MovetnsData
 
 XML_NAME_MOVETNS = "SipPeerTelephoneNumbers"
 XPATH_MOVETNS = "/movetns"
@@ -22,4 +22,4 @@ def __call__(self):
 
     def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
-        MovetnsData.__init__(self)
\ No newline at end of file
+        MovetnsData.__init__(self)
diff --git a/iris_sdk/models/note.py b/bandwidth_numbers/models/note.py
similarity index 75%
rename from iris_sdk/models/note.py
rename to bandwidth_numbers/models/note.py
index 853eadf..7d815ee 100644
--- a/iris_sdk/models/note.py
+++ b/bandwidth_numbers/models/note.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.note import NoteData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.note import NoteData
 
 XPATH_NOTE = ""
 
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
 
     def save(self):
         self.user_id = self.client.config.username
-        self._save()
\ No newline at end of file
+        self._save()
diff --git a/iris_sdk/models/notes.py b/bandwidth_numbers/models/notes.py
similarity index 74%
rename from iris_sdk/models/notes.py
rename to bandwidth_numbers/models/notes.py
index a59d74c..e66cb4c 100644
--- a/iris_sdk/models/notes.py
+++ b/bandwidth_numbers/models/notes.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.notes import NotesData
-from iris_sdk.models.note import Note
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.notes import NotesData
+from bandwidth_numbers.models.note import Note
 
 XPATH_NOTES = "/notes"
 
@@ -28,4 +28,4 @@ def create(self, data=None, save=True):
         return note
 
     def list(self):
-        return self._get_data().note
\ No newline at end of file
+        return self._get_data().note
diff --git a/iris_sdk/models/order.py b/bandwidth_numbers/models/order.py
similarity index 78%
rename from iris_sdk/models/order.py
rename to bandwidth_numbers/models/order.py
index 3d1122a..924a19d 100644
--- a/iris_sdk/models/order.py
+++ b/bandwidth_numbers/models/order.py
@@ -3,11 +3,11 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.order import OrderData
-from iris_sdk.models.notes import Notes
-from iris_sdk.models.order_response import OrderResponse
-from iris_sdk.models.order_tns import OrderTns
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.order import OrderData
+from bandwidth_numbers.models.notes import Notes
+from bandwidth_numbers.models.order_response import OrderResponse
+from bandwidth_numbers.models.order_tns import OrderTns
 
 XPATH_ORDER = "/{}"
 
@@ -50,4 +50,4 @@ def save(self):
         order_response.order = self
         order_response._from_xml(self._element_from_string(str))
         self.order_status = order_response.order_status
-        return True
\ No newline at end of file
+        return True
diff --git a/iris_sdk/models/order_history.py b/bandwidth_numbers/models/order_history.py
similarity index 74%
rename from iris_sdk/models/order_history.py
rename to bandwidth_numbers/models/order_history.py
index 368b664..81de995 100644
--- a/iris_sdk/models/order_history.py
+++ b/bandwidth_numbers/models/order_history.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.order_history import OrderHistoryData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.order_history import OrderHistoryData
 
 XPATH_ORDER_HISTORY = ""
 
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
 
     def save(self):
         self.user_id = self.client.config.username
-        self._save()
\ No newline at end of file
+        self._save()
diff --git a/iris_sdk/models/order_response.py b/bandwidth_numbers/models/order_response.py
similarity index 78%
rename from iris_sdk/models/order_response.py
rename to bandwidth_numbers/models/order_response.py
index 25cb7e6..82c7f18 100644
--- a/iris_sdk/models/order_response.py
+++ b/bandwidth_numbers/models/order_response.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.order_response import OrderResponseData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.order_response import OrderResponseData
 
 XPATH_ORDER_RESPONSE = "/{}"
 
@@ -33,4 +33,4 @@ def __init__(self, parent=None, client=None):
         OrderResponseData.__init__(self)
 
     def get(self, id=None, params=None):
-        return self._get_data((id or self.id), params=params)
\ No newline at end of file
+        return self._get_data((id or self.id), params=params)
diff --git a/iris_sdk/models/order_tns.py b/bandwidth_numbers/models/order_tns.py
similarity index 71%
rename from iris_sdk/models/order_tns.py
rename to bandwidth_numbers/models/order_tns.py
index 69807af..0073654 100644
--- a/iris_sdk/models/order_tns.py
+++ b/bandwidth_numbers/models/order_tns.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.order_tns import OrderTnsData
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.order_tns import OrderTnsData
 
 XML_NAME_TNS_ORDERS = "TelephoneNumbers"
 XPATH_TNS_ORDERS = "/tns"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         OrderTnsData.__init__(self)
 
     def list(self):
-        return self._get_data().telephone_number
\ No newline at end of file
+        return self._get_data().telephone_number
diff --git a/iris_sdk/models/orders.py b/bandwidth_numbers/models/orders.py
similarity index 82%
rename from iris_sdk/models/orders.py
rename to bandwidth_numbers/models/orders.py
index 2b30e79..7b1e72b 100644
--- a/iris_sdk/models/orders.py
+++ b/bandwidth_numbers/models/orders.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.orders import OrdersData
-from iris_sdk.models.order import Order
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.orders import OrdersData
+from bandwidth_numbers.models.order import Order
 
 XML_NAME_ORDERS = "ListOrderIdUserIdDate"
 XPATH_ORDERS = "/orders"
@@ -31,4 +31,4 @@ def get(self, id, params=None):
         return self.create(save=False).get(id, params=params)
 
     def list(self, params):
-        return self._get_data(params=params).order_id_user_id_date
\ No newline at end of file
+        return self._get_data(params=params).order_id_user_id_date
diff --git a/iris_sdk/models/password.py b/bandwidth_numbers/models/password.py
similarity index 75%
rename from iris_sdk/models/password.py
rename to bandwidth_numbers/models/password.py
index 3005670..0ce11ad 100644
--- a/iris_sdk/models/password.py
+++ b/bandwidth_numbers/models/password.py
@@ -3,7 +3,7 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
+from bandwidth_numbers.models.base_resource import BaseResource
 
 XPATH_PASSWORD = "/password"
 PAYLOAD_PASSWORD = "<Password>{}</Password>"
@@ -16,4 +16,4 @@ class Password(BaseResource):
 
     def change(self, new_password):
         self._put(self.get_xpath(),
-            PAYLOAD_PASSWORD.format(new_password))
\ No newline at end of file
+            PAYLOAD_PASSWORD.format(new_password))
diff --git a/iris_sdk/models/portin.py b/bandwidth_numbers/models/portin.py
similarity index 74%
rename from iris_sdk/models/portin.py
rename to bandwidth_numbers/models/portin.py
index 38d56c4..2c0b2b5 100644
--- a/iris_sdk/models/portin.py
+++ b/bandwidth_numbers/models/portin.py
@@ -3,13 +3,13 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.activation_status import ActivationStatus
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.portin import PortInData
-from iris_sdk.models.history import History
-from iris_sdk.models.loas import Loas
-from iris_sdk.models.notes import Notes
-from iris_sdk.models.totals import Totals
+from bandwidth_numbers.models.activation_status import ActivationStatus
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.portin import PortInData
+from bandwidth_numbers.models.history import History
+from bandwidth_numbers.models.loas import Loas
+from bandwidth_numbers.models.notes import Notes
+from bandwidth_numbers.models.totals import Totals
 
 XML_NAME_PORTIN = "LnpOrderResponse"
 XML_NAME_PORTIN_SAVE = "LnpOrder"
@@ -60,4 +60,4 @@ def __init__(self, parent=None, client=None):
         self._totals = Totals(self, client)
 
     def save(self):
-        return self._post_data()
\ No newline at end of file
+        return self._post_data()
diff --git a/iris_sdk/models/portins.py b/bandwidth_numbers/models/portins.py
similarity index 81%
rename from iris_sdk/models/portins.py
rename to bandwidth_numbers/models/portins.py
index 1bcfcea..c8fdd60 100644
--- a/iris_sdk/models/portins.py
+++ b/bandwidth_numbers/models/portins.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.portins import PortInsData
-from iris_sdk.models.portin import PortIn
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.portins import PortInsData
+from bandwidth_numbers.models.portin import PortIn
 
 XML_NAME_PORTINS = "LNPResponseWrapper"
 XPATH_PORTINS = "/portins"
@@ -31,4 +31,4 @@ def get(self, id, params):
         return PortIn(self).get(id, params=params)
 
     def list(self, params):
-        return self._get_data(params=params).lnp_port_info_for_given_status
\ No newline at end of file
+        return self._get_data(params=params).lnp_port_info_for_given_status
diff --git a/iris_sdk/models/portout.py b/bandwidth_numbers/models/portout.py
similarity index 70%
rename from iris_sdk/models/portout.py
rename to bandwidth_numbers/models/portout.py
index 0ce325b..7f0b6c0 100644
--- a/iris_sdk/models/portout.py
+++ b/bandwidth_numbers/models/portout.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.portin import PortInData
-from iris_sdk.models.notes import Notes
-from iris_sdk.models.totals import Totals
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.portin import PortInData
+from bandwidth_numbers.models.notes import Notes
+from bandwidth_numbers.models.totals import Totals
 
 XML_NAME_PORTOUT = "LnpOrderResponse"
 XPATH_PORTOUT = "/{}"
@@ -30,4 +30,4 @@ def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
         PortInData.__init__(self)
         self._notes = Notes(self)
-        self._totals = Totals(self, client)
\ No newline at end of file
+        self._totals = Totals(self, client)
diff --git a/iris_sdk/models/portouts.py b/bandwidth_numbers/models/portouts.py
similarity index 81%
rename from iris_sdk/models/portouts.py
rename to bandwidth_numbers/models/portouts.py
index 6b177ba..7bf5c17 100644
--- a/iris_sdk/models/portouts.py
+++ b/bandwidth_numbers/models/portouts.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.portouts import PortOutsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.portouts import PortOutsData
 
 XML_NAME_PORTOUTS = "LNPResponseWrapper"
 XPATH_PORTOUTS = "/portouts"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         PortOutsData.__init__(self, self)
 
     def list(self, params):
-        return self._get_data(params=params).lnp_port_info_for_given_status
\ No newline at end of file
+        return self._get_data(params=params).lnp_port_info_for_given_status
diff --git a/iris_sdk/models/rate_center.py b/bandwidth_numbers/models/rate_center.py
similarity index 75%
rename from iris_sdk/models/rate_center.py
rename to bandwidth_numbers/models/rate_center.py
index 9e14c41..0decde5 100644
--- a/iris_sdk/models/rate_center.py
+++ b/bandwidth_numbers/models/rate_center.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.rate_center import RateCenterData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.rate_center import RateCenterData
 
 XML_NAME_COVERED_RATE_CENTER = "CoveredRateCenter"
 XPATH_COVERED_RATE_CENTER = "/{}"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         RateCenterData.__init__(self)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/rate_centers.py b/bandwidth_numbers/models/rate_centers.py
similarity index 80%
rename from iris_sdk/models/rate_centers.py
rename to bandwidth_numbers/models/rate_centers.py
index 56cee0b..b6a9520 100644
--- a/iris_sdk/models/rate_centers.py
+++ b/bandwidth_numbers/models/rate_centers.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.rate_centers import RateCentersData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.rate_centers import RateCentersData
 
 XML_NAME_RATE_CENTERS = "RateCenterResponse"
 XPATH_RATE_CENTERS = "/ratecenters"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         RateCentersData.__init__(self)
 
     def list(self, params):
-        return self._get_data(params=params).rate_centers.rate_center
\ No newline at end of file
+        return self._get_data(params=params).rate_centers.rate_center
diff --git a/iris_sdk/models/reservation.py b/bandwidth_numbers/models/reservation.py
similarity index 80%
rename from iris_sdk/models/reservation.py
rename to bandwidth_numbers/models/reservation.py
index 147811b..3835bf0 100644
--- a/iris_sdk/models/reservation.py
+++ b/bandwidth_numbers/models/reservation.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.reservation import ReservationData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.reservation import ReservationData
 
 XML_NAME_RESERVATION = "Reservation"
 XPATH_RESERVATION = "/tnreservation/{}"
@@ -27,4 +27,4 @@ def reservation_id(self, reservation_id):
         self.id = reservation_id
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/sip_peer.py b/bandwidth_numbers/models/sip_peer.py
similarity index 56%
rename from iris_sdk/models/sip_peer.py
rename to bandwidth_numbers/models/sip_peer.py
index 6ced3eb..77eb31b 100644
--- a/iris_sdk/models/sip_peer.py
+++ b/bandwidth_numbers/models/sip_peer.py
@@ -3,16 +3,16 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.sip_peer import SipPeerData
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.data.calling_name import CallingName
-from iris_sdk.models.data.hosts import Hosts
-from iris_sdk.models.data.termination_hosts import TerminationHosts
-from iris_sdk.models.maps.sip_peer import SipPeerMap
-from iris_sdk.models.movetns import Movetns
-from iris_sdk.models.sip_peer_tns import SipPeerTns
-from iris_sdk.models.sip_peer_totaltns import SipPeerTotaltns
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.sip_peer import SipPeerData
+from bandwidth_numbers.models.data.address import Address
+from bandwidth_numbers.models.data.calling_name import CallingName
+from bandwidth_numbers.models.data.hosts import Hosts
+from bandwidth_numbers.models.data.termination_hosts import TerminationHosts
+from bandwidth_numbers.models.maps.sip_peer import SipPeerMap
+from bandwidth_numbers.models.movetns import Movetns
+from bandwidth_numbers.models.sip_peer_tns import SipPeerTns
+from bandwidth_numbers.models.sip_peer_totaltns import SipPeerTotaltns
 
 XPATH_SIP_PEER = "/{}"
 
@@ -49,4 +49,4 @@ def __init__(self, parent=None, client=None):
         self._totaltns = SipPeerTotaltns(self, client)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/sip_peer_telephone_number.py b/bandwidth_numbers/models/sip_peer_telephone_number.py
similarity index 78%
rename from iris_sdk/models/sip_peer_telephone_number.py
rename to bandwidth_numbers/models/sip_peer_telephone_number.py
index cda71c6..841ce10 100644
--- a/iris_sdk/models/sip_peer_telephone_number.py
+++ b/bandwidth_numbers/models/sip_peer_telephone_number.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.sip_peer_telephone_number import \
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.sip_peer_telephone_number import \
     SipPeerTelephoneNumberData
 
 XPATH_SIP_PEER_TN = "/{}"
@@ -27,4 +27,4 @@ def __init__(self, parent=None, client=None):
         SipPeerTelephoneNumberData.__init__(self)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/sip_peer_tns.py b/bandwidth_numbers/models/sip_peer_tns.py
similarity index 78%
rename from iris_sdk/models/sip_peer_tns.py
rename to bandwidth_numbers/models/sip_peer_tns.py
index 3fb69b2..c347108 100644
--- a/iris_sdk/models/sip_peer_tns.py
+++ b/bandwidth_numbers/models/sip_peer_tns.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.sip_peer_tns import SipPeerTnsData
-from iris_sdk.models.sip_peer_telephone_number import \
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.sip_peer_tns import SipPeerTnsData
+from bandwidth_numbers.models.sip_peer_telephone_number import \
     SipPeerTelephoneNumber
 
 XML_NAME_SIP_PEER_TNS = "SipPeerTelephoneNumbersResponse"
@@ -33,4 +33,4 @@ def get(self, id):
 
     def list(self):
         return self._get_data().sip_peer_telephone_numbers.\
-            sip_peer_telephone_number
\ No newline at end of file
+            sip_peer_telephone_number
diff --git a/iris_sdk/models/sip_peer_totaltns.py b/bandwidth_numbers/models/sip_peer_totaltns.py
similarity index 65%
rename from iris_sdk/models/sip_peer_totaltns.py
rename to bandwidth_numbers/models/sip_peer_totaltns.py
index 23c6970..74cd445 100644
--- a/iris_sdk/models/sip_peer_totaltns.py
+++ b/bandwidth_numbers/models/sip_peer_totaltns.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.sip_peer_totaltns import SipPeerTotaltnsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.sip_peer_totaltns import SipPeerTotaltnsData
 
 XML_NAME_TOTALTNS_SIP_PEER = "SipPeerTelephoneNumbersCounts"
 XPATH_TOTALTNS_SIP_PEER = "/totaltns"
@@ -14,4 +14,4 @@ class SipPeerTotaltns(BaseResource, SipPeerTotaltnsData):
     _xpath = XPATH_TOTALTNS_SIP_PEER
 
     def get(self, params=None):
-        return self._get_data(params=params)
\ No newline at end of file
+        return self._get_data(params=params)
diff --git a/iris_sdk/models/sip_peers.py b/bandwidth_numbers/models/sip_peers.py
similarity index 73%
rename from iris_sdk/models/sip_peers.py
rename to bandwidth_numbers/models/sip_peers.py
index b95182b..c57b937 100644
--- a/iris_sdk/models/sip_peers.py
+++ b/bandwidth_numbers/models/sip_peers.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.sip_peers import SipPeersData
-from iris_sdk.models.sip_peer import SipPeer
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.sip_peers import SipPeersData
+from bandwidth_numbers.models.sip_peer import SipPeer
 
 XPATH_SIP_PEERS = "/sippeers"
 
@@ -29,4 +29,4 @@ def get(self, id):
         return SipPeer(self).get(id)
 
     def list(self):
-        return self._get_data().sip_peer
\ No newline at end of file
+        return self._get_data().sip_peer
diff --git a/iris_sdk/models/site.py b/bandwidth_numbers/models/site.py
similarity index 68%
rename from iris_sdk/models/site.py
rename to bandwidth_numbers/models/site.py
index 2d9db05..4ee5749 100644
--- a/iris_sdk/models/site.py
+++ b/bandwidth_numbers/models/site.py
@@ -3,12 +3,12 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.site import SiteData
-from iris_sdk.models.orders import Orders
-from iris_sdk.models.portins import PortIns
-from iris_sdk.models.sip_peers import SipPeers
-from iris_sdk.models.site_totaltns import SiteTotaltns
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.site import SiteData
+from bandwidth_numbers.models.orders import Orders
+from bandwidth_numbers.models.portins import PortIns
+from bandwidth_numbers.models.sip_peers import SipPeers
+from bandwidth_numbers.models.site_totaltns import SiteTotaltns
 
 
 XPATH_SITE = "/{}"
@@ -44,4 +44,4 @@ def __init__(self, parent=None, client=None):
         self._totaltns = SiteTotaltns(self, client)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/site_hosts.py b/bandwidth_numbers/models/site_hosts.py
similarity index 72%
rename from iris_sdk/models/site_hosts.py
rename to bandwidth_numbers/models/site_hosts.py
index 4b56e70..68e7ac5 100644
--- a/iris_sdk/models/site_hosts.py
+++ b/bandwidth_numbers/models/site_hosts.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.site_hosts import SiteHostsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.site_hosts import SiteHostsData
 
 XML_NAME_SITE_HOSTS = "SiteHosts"
 XPATH_SITE_HOSTS = "/hosts"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         SiteHostsData.__init__(self)
 
     def list(self, params=None):
-        return self._get_data(params=params).site_host
\ No newline at end of file
+        return self._get_data(params=params).site_host
diff --git a/iris_sdk/models/site_totaltns.py b/bandwidth_numbers/models/site_totaltns.py
similarity index 63%
rename from iris_sdk/models/site_totaltns.py
rename to bandwidth_numbers/models/site_totaltns.py
index 95aaa5a..94fd005 100644
--- a/iris_sdk/models/site_totaltns.py
+++ b/bandwidth_numbers/models/site_totaltns.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.site_totaltns import SiteTotaltnsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.site_totaltns import SiteTotaltnsData
 
 XML_NAME_TOTALTNS_SITE = "SiteTNs"
 XPATH_TOTALTNS_SITE = "/totaltns"
@@ -14,4 +14,4 @@ class SiteTotaltns(BaseResource, SiteTotaltnsData):
     _xpath = XPATH_TOTALTNS_SITE
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/sites.py b/bandwidth_numbers/models/sites.py
similarity index 73%
rename from iris_sdk/models/sites.py
rename to bandwidth_numbers/models/sites.py
index 39dd997..46af078 100644
--- a/iris_sdk/models/sites.py
+++ b/bandwidth_numbers/models/sites.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.sites import SitesData
-from iris_sdk.models.site import Site
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.sites import SitesData
+from bandwidth_numbers.models.site import Site
 
 XPATH_SITES = "/sites"
 
@@ -29,4 +29,4 @@ def get(self, id):
         return Site(self).get(id)
 
     def list(self):
-        return self._get_data().site
\ No newline at end of file
+        return self._get_data().site
diff --git a/iris_sdk/models/subscription.py b/bandwidth_numbers/models/subscription.py
similarity index 77%
rename from iris_sdk/models/subscription.py
rename to bandwidth_numbers/models/subscription.py
index 5783954..6e45eeb 100644
--- a/iris_sdk/models/subscription.py
+++ b/bandwidth_numbers/models/subscription.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.subscription import SubscriptionData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.subscription import SubscriptionData
 
 XPATH_SUBSCRIPTION = "/{}"
 
@@ -26,4 +26,4 @@ def __init__(self, parent=None, client=None):
         SubscriptionData.__init__(self)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/subscriptions.py b/bandwidth_numbers/models/subscriptions.py
similarity index 74%
rename from iris_sdk/models/subscriptions.py
rename to bandwidth_numbers/models/subscriptions.py
index f35ec38..43116b1 100644
--- a/iris_sdk/models/subscriptions.py
+++ b/bandwidth_numbers/models/subscriptions.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.subscriptions import SubscriptionsData
-from iris_sdk.models.subscription import Subscription
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.subscriptions import SubscriptionsData
+from bandwidth_numbers.models.subscription import Subscription
 
 XPATH_SUBSCRIPTIONS = "/subscriptions"
 
@@ -29,4 +29,4 @@ def get(self, id, params=None):
         return Subscription(self).get(id, params=params)
 
     def list(self, params=None):
-        return self._get_data(params=params).subscription
\ No newline at end of file
+        return self._get_data(params=params).subscription
diff --git a/iris_sdk/models/telephone_number.py b/bandwidth_numbers/models/telephone_number.py
similarity index 70%
rename from iris_sdk/models/telephone_number.py
rename to bandwidth_numbers/models/telephone_number.py
index f3a8c05..d75d5fe 100644
--- a/iris_sdk/models/telephone_number.py
+++ b/bandwidth_numbers/models/telephone_number.py
@@ -3,16 +3,16 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.telephone_number import TelephoneNumberData
-from iris_sdk.models.tn_history import TnHistory
-from iris_sdk.models.tn_lata import TnLata
-from iris_sdk.models.tn_lca import TnLca
-from iris_sdk.models.tn_rate_center import TnRateCenter
-from iris_sdk.models.tn_reservation import TnReservation
-from iris_sdk.models.tn_sip_peer import TnSipPeer
-from iris_sdk.models.tn_site import TnSite
-from iris_sdk.models.tndetails import Tndetails
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.telephone_number import TelephoneNumberData
+from bandwidth_numbers.models.tn_history import TnHistory
+from bandwidth_numbers.models.tn_lata import TnLata
+from bandwidth_numbers.models.tn_lca import TnLca
+from bandwidth_numbers.models.tn_rate_center import TnRateCenter
+from bandwidth_numbers.models.tn_reservation import TnReservation
+from bandwidth_numbers.models.tn_sip_peer import TnSipPeer
+from bandwidth_numbers.models.tn_site import TnSite
+from bandwidth_numbers.models.tndetails import Tndetails
 
 XML_NAME_TN = "TelephoneNumberResponse"
 XPATH_TN = "/{}"
@@ -75,4 +75,4 @@ def __init__(self, parent=None, client=None):
         self._tnreservation = TnReservation(self, client)
 
     def get(self, id=None):
-        return self._get_data(id)
\ No newline at end of file
+        return self._get_data(id)
diff --git a/iris_sdk/models/tn_history.py b/bandwidth_numbers/models/tn_history.py
similarity index 72%
rename from iris_sdk/models/tn_history.py
rename to bandwidth_numbers/models/tn_history.py
index 7736630..e0dae0f 100644
--- a/iris_sdk/models/tn_history.py
+++ b/bandwidth_numbers/models/tn_history.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_history import TnHistoryData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_history import TnHistoryData
 
 XML_NAME_HISTORY_TN = "TelephoneNumberStatuses"
 XPATH_HISTORY_TN = "/history"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         TnHistoryData.__init__(self)
 
     def list(self):
-        return self._get_data().telephone_number_status
\ No newline at end of file
+        return self._get_data().telephone_number_status
diff --git a/iris_sdk/models/tn_lata.py b/bandwidth_numbers/models/tn_lata.py
similarity index 63%
rename from iris_sdk/models/tn_lata.py
rename to bandwidth_numbers/models/tn_lata.py
index dc1ec9a..018203e 100644
--- a/iris_sdk/models/tn_lata.py
+++ b/bandwidth_numbers/models/tn_lata.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.maps.lata import LataMap
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.maps.lata import LataMap
 
 XML_NAME_LATA_TN = "TelephoneNumberDetails"
 XPATH_LATA_TN = "/lata"
@@ -14,4 +14,4 @@ class TnLata(BaseResource, LataMap):
     _xpath = XPATH_LATA_TN
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tn_lca.py b/bandwidth_numbers/models/tn_lca.py
similarity index 75%
rename from iris_sdk/models/tn_lca.py
rename to bandwidth_numbers/models/tn_lca.py
index 97fab65..72c7687 100644
--- a/iris_sdk/models/tn_lca.py
+++ b/bandwidth_numbers/models/tn_lca.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_lca import TnLcaData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_lca import TnLcaData
 
 XML_NAME_LCA_TN = "SearchResult"
 XPATH_LCA_TN = "/lca"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         TnLcaData.__init__(self)
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tn_line_options.py b/bandwidth_numbers/models/tn_line_options.py
similarity index 65%
rename from iris_sdk/models/tn_line_options.py
rename to bandwidth_numbers/models/tn_line_options.py
index 144a2e1..8599a05 100644
--- a/iris_sdk/models/tn_line_options.py
+++ b/bandwidth_numbers/models/tn_line_options.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_line_options import TnLineOptionsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_line_options import TnLineOptionsData
 
 XPATH_TN_LINE_OPTIONS = "/{}"
 
@@ -14,4 +14,4 @@ class TnLineOptions(BaseResource, TnLineOptionsData):
 
     def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
-        TnLineOptionsData.__init__(self)
\ No newline at end of file
+        TnLineOptionsData.__init__(self)
diff --git a/iris_sdk/models/tn_option_order.py b/bandwidth_numbers/models/tn_option_order.py
similarity index 85%
rename from iris_sdk/models/tn_option_order.py
rename to bandwidth_numbers/models/tn_option_order.py
index 82eeb66..fb1f122 100644
--- a/iris_sdk/models/tn_option_order.py
+++ b/bandwidth_numbers/models/tn_option_order.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_option_order import TnOptionOrderData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_option_order import TnOptionOrderData
 
 XML_NAME_TN_OPTION_ORDER = "TnOptionOrder"
 XPATH_TN_OPTION_ORDER = "/{}"
diff --git a/iris_sdk/models/tn_option_orders.py b/bandwidth_numbers/models/tn_option_orders.py
similarity index 80%
rename from iris_sdk/models/tn_option_orders.py
rename to bandwidth_numbers/models/tn_option_orders.py
index 3c2d411..4c5588f 100644
--- a/iris_sdk/models/tn_option_orders.py
+++ b/bandwidth_numbers/models/tn_option_orders.py
@@ -3,9 +3,9 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_option_orders import TnOptionOrdersData
-from iris_sdk.models.tn_option_order import TnOptionOrder
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_option_orders import TnOptionOrdersData
+from bandwidth_numbers.models.tn_option_order import TnOptionOrder
 
 XML_NAME_TN_OPTION_ORDERS = "TnOptionOrders"
 XPATH_TN_OPTION_ORDERS = "/tnoptions"
diff --git a/iris_sdk/models/tn_rate_center.py b/bandwidth_numbers/models/tn_rate_center.py
similarity index 65%
rename from iris_sdk/models/tn_rate_center.py
rename to bandwidth_numbers/models/tn_rate_center.py
index eed85e6..61f4c7f 100644
--- a/iris_sdk/models/tn_rate_center.py
+++ b/bandwidth_numbers/models/tn_rate_center.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tn_rate_center import TnRateCenterData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tn_rate_center import TnRateCenterData
 
 XML_NAME_RATE_CENTER_TN = "TelephoneNumberDetails"
 XPATH_RATE_CENTER_TN = "/ratecenter"
@@ -14,4 +14,4 @@ class TnRateCenter(BaseResource, TnRateCenterData):
     _xpath = XPATH_RATE_CENTER_TN
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tn_reservation.py b/bandwidth_numbers/models/tn_reservation.py
similarity index 73%
rename from iris_sdk/models/tn_reservation.py
rename to bandwidth_numbers/models/tn_reservation.py
index 48b5ac0..b6e8d1b 100644
--- a/iris_sdk/models/tn_reservation.py
+++ b/bandwidth_numbers/models/tn_reservation.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.reservation import ReservationData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.reservation import ReservationData
 
 XML_NAME_RESERVATION_TN = "TNReservation"
 XPATH_RESERVATION_TN = "/tnreservation"
@@ -21,4 +21,4 @@ def reservation_id(self, reservation_id):
         self.id = reservation_id
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tn_sip_peer.py b/bandwidth_numbers/models/tn_sip_peer.py
similarity index 72%
rename from iris_sdk/models/tn_sip_peer.py
rename to bandwidth_numbers/models/tn_sip_peer.py
index 3dc885f..489fc74 100644
--- a/iris_sdk/models/tn_sip_peer.py
+++ b/bandwidth_numbers/models/tn_sip_peer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.maps.sip_peer import SipPeerMap
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.maps.sip_peer import SipPeerMap
 
 XML_NAME_SIP_PEER_TN = "SipPeer"
 XPATH_SIP_PEER_TN = "/sippeers"
@@ -21,4 +21,4 @@ def name(self, name):
         self.peer_name = name
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tn_site.py b/bandwidth_numbers/models/tn_site.py
similarity index 61%
rename from iris_sdk/models/tn_site.py
rename to bandwidth_numbers/models/tn_site.py
index 18c4a1a..4a52344 100644
--- a/iris_sdk/models/tn_site.py
+++ b/bandwidth_numbers/models/tn_site.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.maps.site import SiteMap
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.maps.site import SiteMap
 
 XML_NAME_SITE_TN = "Site"
 XPATH_SITE_TN = "/sites"
@@ -14,4 +14,4 @@ class TnSite(BaseResource, SiteMap):
     _xpath = XPATH_SITE_TN
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tndetails.py b/bandwidth_numbers/models/tndetails.py
similarity index 75%
rename from iris_sdk/models/tndetails.py
rename to bandwidth_numbers/models/tndetails.py
index c3c5542..742623e 100644
--- a/iris_sdk/models/tndetails.py
+++ b/bandwidth_numbers/models/tndetails.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.tndetails import TndetailsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.tndetails import TndetailsData
 
 XML_NAME_TNDETAILS = "TelephoneNumberDetails"
 XPATH_TNDETAILS = "/tndetails"
@@ -21,4 +21,4 @@ def __init__(self, parent=None, client=None):
         TndetailsData.__init__(self)
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/tns.py b/bandwidth_numbers/models/tns.py
similarity index 67%
rename from iris_sdk/models/tns.py
rename to bandwidth_numbers/models/tns.py
index baccb91..2040f3e 100644
--- a/iris_sdk/models/tns.py
+++ b/bandwidth_numbers/models/tns.py
@@ -3,10 +3,10 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource, BaseResourceList
-from iris_sdk.models.data.tns import TnsData
-from iris_sdk.models.data.telephone_numbers import TelephoneNumbers
-from iris_sdk.models.telephone_number import TelephoneNumber
+from bandwidth_numbers.models.base_resource import BaseResource, BaseResourceList
+from bandwidth_numbers.models.data.tns import TnsData
+from bandwidth_numbers.models.data.telephone_numbers import TelephoneNumbers
+from bandwidth_numbers.models.telephone_number import TelephoneNumber
 
 XML_NAME_TNS = "TelephoneNumbersResponse"
 XPATH_TNS = "/tns"
@@ -32,4 +32,4 @@ def get(self, id):
 
     def list(self, params):
         self._get_data(params=params)
-        return self.telephone_numbers.telephone_number
\ No newline at end of file
+        return self.telephone_numbers.telephone_number
diff --git a/iris_sdk/models/totals.py b/bandwidth_numbers/models/totals.py
similarity index 69%
rename from iris_sdk/models/totals.py
rename to bandwidth_numbers/models/totals.py
index 261e46a..650e770 100644
--- a/iris_sdk/models/totals.py
+++ b/bandwidth_numbers/models/totals.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.data.totals import TotalsData
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.data.totals import TotalsData
 
 XML_NAME_TOTALS = "Quantity"
 XPATH_TOTALS = "/totals"
@@ -17,4 +17,4 @@ class Totals(BaseResource, TotalsData):
     _xpath = XPATH_TOTALS
 
     def get(self):
-        return self._get_data()
\ No newline at end of file
+        return self._get_data()
diff --git a/iris_sdk/models/users.py b/bandwidth_numbers/models/users.py
similarity index 73%
rename from iris_sdk/models/users.py
rename to bandwidth_numbers/models/users.py
index 9858d2d..c3f4b44 100644
--- a/iris_sdk/models/users.py
+++ b/bandwidth_numbers/models/users.py
@@ -3,8 +3,8 @@
 from __future__ import division, absolute_import, print_function
 from future.builtins import super
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.password import Password
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.password import Password
 
 XPATH_USERS = "/users/{}"
 
@@ -22,4 +22,4 @@ def __init__(self, parent=None, client=None):
         super().__init__(parent, client)
         if client is not None:
             self.id = (client.config.username or "")
-        self._password = Password(self, client)
\ No newline at end of file
+        self._password = Password(self, client)
diff --git a/iris_sdk/utils/__init__.py b/bandwidth_numbers/utils/__init__.py
similarity index 100%
rename from iris_sdk/utils/__init__.py
rename to bandwidth_numbers/utils/__init__.py
diff --git a/iris_sdk/utils/config.py b/bandwidth_numbers/utils/config.py
similarity index 96%
rename from iris_sdk/utils/config.py
rename to bandwidth_numbers/utils/config.py
index ea76c18..a017b0b 100644
--- a/iris_sdk/utils/config.py
+++ b/bandwidth_numbers/utils/config.py
@@ -4,7 +4,7 @@
 
 import os
 
-from iris_sdk.utils.py_compat import PY_VER_MAJOR
+from bandwidth_numbers.utils.py_compat import PY_VER_MAJOR
 
 if PY_VER_MAJOR < 3:
     from io import open
@@ -113,4 +113,4 @@ def load_from_file(self, filename=None):
       self._password = self._password.strip()
 
       self._url = self._parser.get(SECTION_SRV, VALUE_URL)
-      self._url = self._url.strip()
\ No newline at end of file
+      self._url = self._url.strip()
diff --git a/iris_sdk/utils/py_compat.py b/bandwidth_numbers/utils/py_compat.py
similarity index 100%
rename from iris_sdk/utils/py_compat.py
rename to bandwidth_numbers/utils/py_compat.py
diff --git a/iris_sdk/utils/rest.py b/bandwidth_numbers/utils/rest.py
similarity index 100%
rename from iris_sdk/utils/rest.py
rename to bandwidth_numbers/utils/rest.py
diff --git a/iris_sdk/utils/strings.py b/bandwidth_numbers/utils/strings.py
similarity index 100%
rename from iris_sdk/utils/strings.py
rename to bandwidth_numbers/utils/strings.py
diff --git a/examples/available_numbers.py b/examples/available_numbers.py
index 409a242..aa303ec 100644
--- a/examples/available_numbers.py
+++ b/examples/available_numbers.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 3:
     sys.exit("usage: python available_numbers.py [state] [quantity], e.g.:" +
@@ -19,4 +19,4 @@
 print("\nTotal for search: " + (acc.available_numbers.result_count or ""))
 
 for phone_number in available_numbers.items:
-    print(phone_number or "")
\ No newline at end of file
+    print(phone_number or "")
diff --git a/examples/cities.py b/examples/cities.py
index 734ca4a..e596c52 100644
--- a/examples/cities.py
+++ b/examples/cities.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Cities, Client, RestError
+from bandwidth_numbers import Cities, Client, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python cities.py [state], e.g.:\n python cities.py NJ")
@@ -17,4 +17,4 @@
 print("\ntotal for search: " + (cities.result_count or ""))
 
 for city in cities_list.items:
-    print((city.rc_abbreviation or "") + " (" + (city.name or "") + ")")
\ No newline at end of file
+    print((city.rc_abbreviation or "") + " (" + (city.name or "") + ")")
diff --git a/examples/covered_rate.py b/examples/covered_rate.py
index ccc3c24..382eaac 100644
--- a/examples/covered_rate.py
+++ b/examples/covered_rate.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Client, CoveredRateCenters, RestError
+from bandwidth_numbers import Client, CoveredRateCenters, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python covered_rate.py [zip], e.g.:" +
@@ -23,4 +23,4 @@
     print("    lata: " + (center.lata or ""))
     print("    tiers:")
     for tier in center.tiers.items:
-        print("        " + (tier or ""))
\ No newline at end of file
+        print("        " + (tier or ""))
diff --git a/examples/npa_nxx_search.py b/examples/npa_nxx_search.py
index d0baee4..85a66ea 100644
--- a/examples/npa_nxx_search.py
+++ b/examples/npa_nxx_search.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 3:
     sys.exit("usage: python npa_nxx_search.py [area code] [quantity], e.g.:" +
@@ -22,4 +22,4 @@
     print("    NPA: " + (phone_number.npa or ""))
     print("    NXX: " + (phone_number.nxx or ""))
     print("    state: " + (phone_number.state or ""))
-    print("    quantity: " + (phone_number.quantity or ""))
\ No newline at end of file
+    print("    quantity: " + (phone_number.quantity or ""))
diff --git a/examples/order_create.py b/examples/order_create.py
index e394bff..1fe3e6a 100644
--- a/examples/order_create.py
+++ b/examples/order_create.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python order_create.py [phone number], e.g.:" +
@@ -31,4 +31,4 @@
 print("    phone numbers:")
 for num in order.existing_telephone_number_order_type.telephone_number_list.\
         telephone_number.items:
-    print("       " + (num or ""))
\ No newline at end of file
+    print("       " + (num or ""))
diff --git a/examples/order_get.py b/examples/order_get.py
index a46aa88..3acaa08 100644
--- a/examples/order_get.py
+++ b/examples/order_get.py
@@ -1,7 +1,7 @@
 import sys
 import time
-from iris_sdk import Account, Client
-from iris_sdk.models.data.ord.existing_search_order import ExistingSearchOrder
+from bandwidth_numbers import Account, Client
+from bandwidth_numbers.models.data.ord.existing_search_order import ExistingSearchOrder
 
 
 def search_and_order(account, site_id):
diff --git a/examples/portin.py b/examples/portin.py
index 4fa699e..df94d31 100644
--- a/examples/portin.py
+++ b/examples/portin.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 3:
     sys.exit("usage: python portin.py [phone number] [site id], e.g.:" +
@@ -60,4 +60,4 @@
 except RestError as error:
     sys.exit(error)
 
-print("LOA successfully updated")
\ No newline at end of file
+print("LOA successfully updated")
diff --git a/examples/rate_center.py b/examples/rate_center.py
index df8e139..eb594fa 100644
--- a/examples/rate_center.py
+++ b/examples/rate_center.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Client, RateCenters, RestError
+from bandwidth_numbers import Client, RateCenters, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python rate_center.py [state], e.g.:\n" +
@@ -18,4 +18,4 @@
 print("\ntotal for search: " + (rate_centers.total_count or ""))
 
 for rc in centers.items:
-    print((rc.abbreviation or "") + " (" + (rc.name or "") + ")")
\ No newline at end of file
+    print((rc.abbreviation or "") + " (" + (rc.name or "") + ")")
diff --git a/examples/sippeers_create.py b/examples/sippeers_create.py
index cde1058..cb881f5 100644
--- a/examples/sippeers_create.py
+++ b/examples/sippeers_create.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 4:
     sys.exit("usage: python sippeer_create.py [host] [peer name] [site], " +
@@ -57,4 +57,4 @@
     print("        port: " + (host.port or ""))
     print("        data allowed: " +(host.data_allowed or ""))
     print("        customer traffic allowed: " +
-        (host.customer_traffic_allowed or ""))
\ No newline at end of file
+        (host.customer_traffic_allowed or ""))
diff --git a/examples/site_create.py b/examples/site_create.py
index 2567b43..64cad05 100644
--- a/examples/site_create.py
+++ b/examples/site_create.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Account, Client, RestError
+from bandwidth_numbers import Account, Client, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python site_create.py [site name], e.g.:\n" +
diff --git a/examples/tns_details.py b/examples/tns_details.py
index d12da69..5bc8c73 100644
--- a/examples/tns_details.py
+++ b/examples/tns_details.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Client, Tns, RestError
+from bandwidth_numbers import Client, Tns, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python tns_details.py [number], e.g.:" +
@@ -33,4 +33,4 @@
 print("            last name" + \
     (details.features.dlda.listing_name.last_name or ""))
 print("    lidb")
-print("        status: " + (details.features.lidb.status or ""))
\ No newline at end of file
+print("        status: " + (details.features.lidb.status or ""))
diff --git a/examples/tns_list.py b/examples/tns_list.py
index 604e47b..63e11ea 100644
--- a/examples/tns_list.py
+++ b/examples/tns_list.py
@@ -1,6 +1,6 @@
 import sys
 
-from iris_sdk import Client, Tns, RestError
+from bandwidth_numbers import Client, Tns, RestError
 
 if len(sys.argv) < 2:
     sys.exit("usage: python tns_list.py [npa], e.g.:\npython tns_list.py 818")
@@ -24,4 +24,4 @@
     print("    state: " + (phone.state or ""))
     print("    status: " + (phone.status or ""))
     print("    vendor id: " + (phone.vendor_id or ""))
-    print("    vendor name: " + (phone.vendor_name or ""))
\ No newline at end of file
+    print("    vendor name: " + (phone.vendor_name or ""))
diff --git a/iris_sdk/__init__.py b/iris_sdk/__init__.py
deleted file mode 100644
index f215009..0000000
--- a/iris_sdk/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
-from iris_sdk.models.cities import Cities
-from iris_sdk.models.covered_rate_centers import CoveredRateCenters
-from iris_sdk.models.rate_centers import RateCenters
-from iris_sdk.models.tns import Tns
-from iris_sdk.models.users import Users
-from iris_sdk.utils.rest import RestError
-
-__all__ = ["Client", "Account", "Tns", "Users", "Cities", "RateCenters",
-    "RestError", "CoveredRateCenters", ]
\ No newline at end of file
diff --git a/iris_sdk/models/data/a2p_settings.py b/iris_sdk/models/data/a2p_settings.py
deleted file mode 100644
index f633c9c..0000000
--- a/iris_sdk/models/data/a2p_settings.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-  
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.a2p_settings import A2pSettingsMap
-
-class A2pSettings(A2pSettingsMap, BaseData):
-    pass
diff --git a/iris_sdk/models/data/account.py b/iris_sdk/models/data/account.py
deleted file mode 100644
index 0ed37dc..0000000
--- a/iris_sdk/models/data/account.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.data.contact import Contact
-from iris_sdk.models.data.tier_list import TierList
-from iris_sdk.models.maps.account import AccountMap
-
-class AccountData(AccountMap, BaseData):
-
-    def __init__(self):
-        self.address = Address()
-        self.contact = Contact()
-        self.tiers = TierList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/account_user.py b/iris_sdk/models/data/account_user.py
deleted file mode 100644
index 704abed..0000000
--- a/iris_sdk/models/data/account_user.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.roles_list import RolesList
-from iris_sdk.models.maps.account_user import AccountUserMap
-
-class AccountUser(AccountUserMap, BaseData):
-
-    def __init__(self):
-        self.roles = RolesList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/account_users.py b/iris_sdk/models/data/account_users.py
deleted file mode 100644
index c29b249..0000000
--- a/iris_sdk/models/data/account_users.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.account_user import AccountUser
-from iris_sdk.models.maps.account_users import AccountUsersMap
-
-class AccountUsersData(AccountUsersMap, BaseData):
-
-    def __init__(self):
-        self.user = BaseResourceList(AccountUser)
\ No newline at end of file
diff --git a/iris_sdk/models/data/address.py b/iris_sdk/models/data/address.py
deleted file mode 100644
index 40ba331..0000000
--- a/iris_sdk/models/data/address.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.address import AddressMap
-
-class Address(AddressMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/available_npa_nxx.py b/iris_sdk/models/data/available_npa_nxx.py
deleted file mode 100644
index 414bcc0..0000000
--- a/iris_sdk/models/data/available_npa_nxx.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.available_npa_nxx_list import AvailableNpaNxxList
-from iris_sdk.models.maps.available_npa_nxx import AvailableNpaNxxMap
-
-class AvailableNpaNxxData(AvailableNpaNxxMap, BaseData):
-
-    def __init__(self):
-        self.available_npa_nxx_list = AvailableNpaNxxList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/available_npa_nxx_list.py b/iris_sdk/models/data/available_npa_nxx_list.py
deleted file mode 100644
index 54b7165..0000000
--- a/iris_sdk/models/data/available_npa_nxx_list.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.npa_nxx import NpaNxx
-from iris_sdk.models.maps.available_npa_nxx_list import AvailableNpaNxxListMap
-
-class AvailableNpaNxxList(AvailableNpaNxxListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.available_npa_nxx.items
-
-    def __init__(self):
-        self.available_npa_nxx = BaseResourceList(NpaNxx)
\ No newline at end of file
diff --git a/iris_sdk/models/data/callback_subscription.py b/iris_sdk/models/data/callback_subscription.py
deleted file mode 100644
index e9f50c8..0000000
--- a/iris_sdk/models/data/callback_subscription.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.callback_subscription import CallbackSubscriptionMap
-
-class CallbackSubscription(CallbackSubscriptionMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/calling_name.py b/iris_sdk/models/data/calling_name.py
deleted file mode 100644
index 3f49451..0000000
--- a/iris_sdk/models/data/calling_name.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.calling_name import CallingNameMap
-
-class CallingName(CallingNameMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/cities.py b/iris_sdk/models/data/cities.py
deleted file mode 100644
index e71ad1f..0000000
--- a/iris_sdk/models/data/cities.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.cities_list import CitiesList
-from iris_sdk.models.maps.cities import CitiesMap
-
-class CitiesData(CitiesMap, BaseData):
-
-    def __init__(self):
-        self.cities = CitiesList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/cities_list.py b/iris_sdk/models/data/cities_list.py
deleted file mode 100644
index 41f82b9..0000000
--- a/iris_sdk/models/data/cities_list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.city import City
-from iris_sdk.models.maps.cities_list import CitiesListMap
-
-class CitiesList(CitiesListMap, BaseData):
-
-    def __init__(self):
-        self.city = BaseResourceList(City)
\ No newline at end of file
diff --git a/iris_sdk/models/data/cities_short_list.py b/iris_sdk/models/data/cities_short_list.py
deleted file mode 100644
index f39a4ee..0000000
--- a/iris_sdk/models/data/cities_short_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.cities_short_list import CitiesShortListMap
-
-class CitiesShortList(CitiesShortListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.city.items
-
-    def __init__(self):
-        self.city = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/contact.py b/iris_sdk/models/data/contact.py
deleted file mode 100644
index 5ce2dbb..0000000
--- a/iris_sdk/models/data/contact.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.contact import ContactMap
-
-class Contact(ContactMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/covered_rate_centers.py b/iris_sdk/models/data/covered_rate_centers.py
deleted file mode 100644
index 4b1ecc1..0000000
--- a/iris_sdk/models/data/covered_rate_centers.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.rate_center import RateCenter
-from iris_sdk.models.maps.covered_rate_centers import CoveredRateCentersMap
-
-class CoveredRateCentersData(CoveredRateCentersMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.links = Links()
-        self.covered_rate_center = BaseResourceList(RateCenter, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/disc_numbers.py b/iris_sdk/models/data/disc_numbers.py
deleted file mode 100644
index 2c24426..0000000
--- a/iris_sdk/models/data/disc_numbers.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.disc_numbers import DiscNumbersMap
-
-class DiscNumbersData(DiscNumbersMap, BaseData):
-
-    def __init__(self):
-        self.links = Links()
-        self.telephone_numbers = TelephoneNumberList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/disconnect_telephone_number_order_type.py b/iris_sdk/models/data/disconnect_telephone_number_order_type.py
deleted file mode 100644
index 09bf7dd..0000000
--- a/iris_sdk/models/data/disconnect_telephone_number_order_type.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.disconnect_telephone_number_order_type import \
-    DisconnectTelephoneNumberOrderTypeMap
-
-class DisconnectTelephoneNumberOrderType(
-        DisconnectTelephoneNumberOrderTypeMap, BaseData):
-
-    def __init__(self):
-        self.telephone_number_list = TelephoneNumberList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/disconnects.py b/iris_sdk/models/data/disconnects.py
deleted file mode 100644
index d37fc3b..0000000
--- a/iris_sdk/models/data/disconnects.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.maps.disconnects import DisconnectsMap
-from iris_sdk.models.disconnect import Disconnect
-
-class DisconnectsData(DisconnectsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.links = Links()
-        self.order_id_user_id_date = BaseResourceList(Disconnect, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/dlda_order_response.py b/iris_sdk/models/data/dlda_order_response.py
deleted file mode 100644
index 07508d3..0000000
--- a/iris_sdk/models/data/dlda_order_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.dlda_order_response import DldaOrderResponseMap
-
-class DldaOrderResponseData(DldaOrderResponseMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/dlda_tn_group.py b/iris_sdk/models/data/dlda_tn_group.py
deleted file mode 100644
index b834795..0000000
--- a/iris_sdk/models/data/dlda_tn_group.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.dlda_tn_group import DldaTnGroupMap
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.data.listing_name import ListingName
-
-class DldaTnGroupData(DldaTnGroupMap, BaseData):
-
-    def __init__(self):
-        self.telephone_numbers = TelephoneNumberList()
-        self.listing_name = ListingName()
-        self.address = Address()
\ No newline at end of file
diff --git a/iris_sdk/models/data/dlda_tn_groups.py b/iris_sdk/models/data/dlda_tn_groups.py
deleted file mode 100644
index edb0622..0000000
--- a/iris_sdk/models/data/dlda_tn_groups.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.dlda_tn_groups import DldaTnGroupsMap
-from iris_sdk.models.data.dlda_tn_group import DldaTnGroupData
-
-class DldaTnGroups(DldaTnGroupsMap, BaseData):
-
-    def __init__(self):
-        self.dlda_tn_group = BaseResourceList(DldaTnGroupData)
diff --git a/iris_sdk/models/data/dldas.py b/iris_sdk/models/data/dldas.py
deleted file mode 100644
index 84edae3..0000000
--- a/iris_sdk/models/data/dldas.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.dldas import DldasMap
-from iris_sdk.models.dlda import Dlda
-
-class DldasData(DldasMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.order_id_user_id_date = BaseResourceList(Dlda, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/email_subscription.py b/iris_sdk/models/data/email_subscription.py
deleted file mode 100644
index 2b142e0..0000000
--- a/iris_sdk/models/data/email_subscription.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.email_subscription import EmailSubscriptionMap
-
-class EmailSubscription(EmailSubscriptionMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/error.py b/iris_sdk/models/data/error.py
deleted file mode 100644
index ddf49f8..0000000
--- a/iris_sdk/models/data/error.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.error import ErrorMap
-
-class Error(ErrorMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/error_list.py b/iris_sdk/models/data/error_list.py
deleted file mode 100644
index 001f159..0000000
--- a/iris_sdk/models/data/error_list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.error import Error
-from iris_sdk.models.maps.error_list import ErrorListMap
-
-class ErrorList(ErrorListMap, BaseData):
-
-    def __init__(self):
-        self.error = BaseResourceList(Error)
\ No newline at end of file
diff --git a/iris_sdk/models/data/feature_dlda.py b/iris_sdk/models/data/feature_dlda.py
deleted file mode 100644
index 91c926f..0000000
--- a/iris_sdk/models/data/feature_dlda.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.data.listing_name import ListingName
-from iris_sdk.models.maps.feature_dlda import FeatureDldaMap
-
-class FeatureDlda(FeatureDldaMap, BaseData):
-
-    def __init__(self):
-        self.address = Address()
-        self.listing_name = ListingName()
\ No newline at end of file
diff --git a/iris_sdk/models/data/feature_lidb.py b/iris_sdk/models/data/feature_lidb.py
deleted file mode 100644
index 9efad63..0000000
--- a/iris_sdk/models/data/feature_lidb.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.feature_lidb import FeatureLidbMap
-
-class FeatureLidb(FeatureLidbMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/features.py b/iris_sdk/models/data/features.py
deleted file mode 100644
index b8caa41..0000000
--- a/iris_sdk/models/data/features.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.feature_dlda import FeatureDlda
-from iris_sdk.models.data.feature_lidb import FeatureLidb
-from iris_sdk.models.maps.features import FeaturesMap
-
-class Features(FeaturesMap, BaseData):
-
-    def __init__(self):
-        self.dlda = FeatureDlda()
-        self.lidb = FeatureLidb()
\ No newline at end of file
diff --git a/iris_sdk/models/data/file_data.py b/iris_sdk/models/data/file_data.py
deleted file mode 100644
index 4d7dc9a..0000000
--- a/iris_sdk/models/data/file_data.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.file_meta_data import FileMetaDataData
-from iris_sdk.models.maps.file_data import FileDataMap
-
-class FileData(FileDataMap, BaseData):
-
-    def __init__(self):
-        self.file_meta_data = FileMetaDataData()
\ No newline at end of file
diff --git a/iris_sdk/models/data/file_meta_data.py b/iris_sdk/models/data/file_meta_data.py
deleted file mode 100644
index 8be759d..0000000
--- a/iris_sdk/models/data/file_meta_data.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.file_meta_data import FileMetaDataMap
-
-class FileMetaDataData(FileMetaDataMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/history.py b/iris_sdk/models/data/history.py
deleted file mode 100644
index 47186cc..0000000
--- a/iris_sdk/models/data/history.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.order_history import OrderHistoryData
-from iris_sdk.models.maps.history import HistoryMap
-
-class HistoryData(HistoryMap, BaseData):
-
-    def __init__(self):
-        self.order_history = BaseResourceList(OrderHistoryData)
\ No newline at end of file
diff --git a/iris_sdk/models/data/host.py b/iris_sdk/models/data/host.py
deleted file mode 100644
index 1bdc907..0000000
--- a/iris_sdk/models/data/host.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.host import HostMap
-
-class Host(HostMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/hosts.py b/iris_sdk/models/data/hosts.py
deleted file mode 100644
index 33e1dd2..0000000
--- a/iris_sdk/models/data/hosts.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.host import Host
-from iris_sdk.models.maps.hosts import HostsMap
-
-class Hosts(HostsMap, BaseData):
-
-    @property
-    def items(self):
-        return self.host.items
-
-    def __init__(self):
-        self.host = BaseResourceList(Host)
-
-    def add(self):
-        return self.host.add()
\ No newline at end of file
diff --git a/iris_sdk/models/data/import_tn_checker.py b/iris_sdk/models/data/import_tn_checker.py
deleted file mode 100644
index ff96c76..0000000
--- a/iris_sdk/models/data/import_tn_checker.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.import_tn_checker_list import TelephoneNumbers
-from iris_sdk.models.maps.import_tn_checker import ImportTnCheckerMap
-
-class ImportTnCheckerData(ImportTnCheckerMap, BaseData):
-
-    def __init__(self):
-        self.telephone_numbers = TelephoneNumbers()
diff --git a/iris_sdk/models/data/import_tn_checker_response.py b/iris_sdk/models/data/import_tn_checker_response.py
deleted file mode 100644
index b5ceced..0000000
--- a/iris_sdk/models/data/import_tn_checker_response.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.import_tn_checker_payload import ImportTnCheckerResponse
-from iris_sdk.models.maps.import_tn_checker_response import ImportTnCheckerResponseMap
-
-class ImportTnCheckerResponseData(ImportTnCheckerResponseMap, BaseData):
-
-    def __init__(self):
-        self.import_tn_checker_payload = ImportTnCheckerResponse()
diff --git a/iris_sdk/models/data/in_service_numbers.py b/iris_sdk/models/data/in_service_numbers.py
deleted file mode 100644
index a719164..0000000
--- a/iris_sdk/models/data/in_service_numbers.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.in_service_numbers import InServiceNumbersMap
-
-class InServiceNumbersData(InServiceNumbersMap, BaseData):
-
-    def __init__(self):
-        self.links = Links()
-        self.telephone_numbers = TelephoneNumberList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/lidb_tn_group.py b/iris_sdk/models/data/lidb_tn_group.py
deleted file mode 100644
index 8c39883..0000000
--- a/iris_sdk/models/data/lidb_tn_group.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.lidb_tn_group import LidbTnGroupMap
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-
-class LidbTnGroupData(LidbTnGroupMap, BaseData):
-
-    def __init__(self):
-        self.telephone_numbers = TelephoneNumberList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/lidb_tn_groups.py b/iris_sdk/models/data/lidb_tn_groups.py
deleted file mode 100644
index 65fa6f2..0000000
--- a/iris_sdk/models/data/lidb_tn_groups.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.lidb_tn_group import LidbTnGroupData
-from iris_sdk.models.maps.lidb_tn_groups import LidbTnGroupsMap
-
-class LidbTnGroups(LidbTnGroupsMap, BaseData):
-
-    def __init__(self):
-        self.lidb_tn_group = BaseResourceList(LidbTnGroupData)
diff --git a/iris_sdk/models/data/lidbs.py b/iris_sdk/models/data/lidbs.py
deleted file mode 100644
index de5ab22..0000000
--- a/iris_sdk/models/data/lidbs.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.lidbs import LidbsMap
-from iris_sdk.models.lidb import Lidb
-
-class LidbsData(LidbsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.order_id_user_id_date = BaseResourceList(Lidb, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/line_option_order.py b/iris_sdk/models/data/line_option_order.py
deleted file mode 100644
index afb9db5..0000000
--- a/iris_sdk/models/data/line_option_order.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.line_option_order import LineOptionOrderMap
-from iris_sdk.models.data.tn_line_options import TnLineOptionsData
-
-class LineOptionOrderData(LineOptionOrderMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.tn_line_options = BaseResourceList(TnLineOptionsData)
\ No newline at end of file
diff --git a/iris_sdk/models/data/line_option_order_response.py b/iris_sdk/models/data/line_option_order_response.py
deleted file mode 100644
index 1189ec7..0000000
--- a/iris_sdk/models/data/line_option_order_response.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.line_option_order_response import LineOptionOrderResponseMap
-from iris_sdk.models.data.line_options import LineOptionsData
-
-class LineOptionOrderResponseData(LineOptionOrderResponseMap, BaseData):
-
-    def __init__(self):
-        self.line_options = BaseResourceList(LineOptionsData)
\ No newline at end of file
diff --git a/iris_sdk/models/data/line_options.py b/iris_sdk/models/data/line_options.py
deleted file mode 100644
index ef83a92..0000000
--- a/iris_sdk/models/data/line_options.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.line_options import LineOptionsMap
-from iris_sdk.models.data.error_list import ErrorList
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-
-class LineOptionsData(LineOptionsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.complete_numbers = TelephoneNumberList()
-        self.errors = ErrorList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/listing_name.py b/iris_sdk/models/data/listing_name.py
deleted file mode 100644
index 09f4320..0000000
--- a/iris_sdk/models/data/listing_name.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.listing_name import ListingNameMap
-
-class ListingName(ListingNameMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/lnp_losing_carriers.py b/iris_sdk/models/data/lnp_losing_carriers.py
deleted file mode 100644
index a5ae8ee..0000000
--- a/iris_sdk/models/data/lnp_losing_carriers.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.losing_carrier_tn_list import LosingCarrierTnList
-from iris_sdk.models.maps.lnp_losing_carriers import LnpLosingCarriersMap
-
-class LnpLosingCarriers(LnpLosingCarriersMap, BaseData):
-
-    def __init__(self):
-        self.losing_carrier_tn_list = LosingCarrierTnList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/lnp_rate_center.py b/iris_sdk/models/data/lnp_rate_center.py
deleted file mode 100644
index 5d47904..0000000
--- a/iris_sdk/models/data/lnp_rate_center.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.tier_list import TierList
-from iris_sdk.models.data.tn_list import TnList
-from iris_sdk.models.maps.lnp_rate_center import LnpRateCenterMap
-
-class LnpRateCenter(LnpRateCenterMap, BaseData):
-
-    def __init__(self):
-        self.tiers = TierList()
-        self.tn_list = TnList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/lnpchecker.py b/iris_sdk/models/data/lnpchecker.py
deleted file mode 100644
index f906cfe..0000000
--- a/iris_sdk/models/data/lnpchecker.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.tn_list import TnList
-from iris_sdk.models.maps.lnpchecker import LnpCheckerMap
-
-class LnpCheckerData(LnpCheckerMap, BaseData):
-
-    def __init__(self):
-        self.tn_list = TnList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/lnpchecker_response.py b/iris_sdk/models/data/lnpchecker_response.py
deleted file mode 100644
index 518ae95..0000000
--- a/iris_sdk/models/data/lnpchecker_response.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.lnp_losing_carriers import LnpLosingCarriers
-from iris_sdk.models.data.lnp_rate_center_list import LnpRateCenterList
-from iris_sdk.models.data.tn_list import TnList
-from iris_sdk.models.maps.lnpchecker_response import LnpCheckerResponseMap
-
-class LnpCheckerResponseData(LnpCheckerResponseMap, BaseData):
-
-    def __init__(self):
-        self.partner_supported_rate_centers = LnpRateCenterList()
-        self.portable_numbers = TnList()
-        self.supported_losing_carriers = LnpLosingCarriers()
-        self.supported_rate_centers = LnpRateCenterList()
-        self.unsupported_rate_centers = LnpRateCenterList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/loas.py b/iris_sdk/models/data/loas.py
deleted file mode 100644
index 1b0b867..0000000
--- a/iris_sdk/models/data/loas.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList, \
-    BaseResourceSimpleList
-from iris_sdk.models.data.file_data import FileData
-from iris_sdk.models.maps.loas import LoasMap
-
-class LoasData(LoasMap, BaseData):
-
-    def __init__(self):
-        self.file_data = BaseResourceList(FileData)
-        self.file_names = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/local_rate_center_list.py b/iris_sdk/models/data/local_rate_center_list.py
deleted file mode 100644
index a2c3d78..0000000
--- a/iris_sdk/models/data/local_rate_center_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.local_rate_center_list import LocalRateCenterListMap
-
-class LocalRateCenterList(LocalRateCenterListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.local_rate_center_id.items
-
-    def __init__(self):
-        self.local_rate_center_id = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/location.py b/iris_sdk/models/data/location.py
deleted file mode 100644
index b68e30f..0000000
--- a/iris_sdk/models/data/location.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.tn_rate_centers_list import TnRateCentersList
-from iris_sdk.models.maps.location import LocationMap
-
-class Location(LocationMap, BaseData):
-
-    def __init__(self):
-        self.rate_centers = BaseResourceList(TnRateCentersList)
\ No newline at end of file
diff --git a/iris_sdk/models/data/losing_carrier_tn_list.py b/iris_sdk/models/data/losing_carrier_tn_list.py
deleted file mode 100644
index 35bec8b..0000000
--- a/iris_sdk/models/data/losing_carrier_tn_list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.tn_list import TnList
-from iris_sdk.models.maps.losing_carrier_tn_list import LosingCarrierTnListMap
-
-class LosingCarrierTnList(LosingCarrierTnListMap, BaseData):
-
-    def __init__(self):
-        self.tn_list = TnList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/movetns.py b/iris_sdk/models/data/movetns.py
deleted file mode 100644
index 5a9b532..0000000
--- a/iris_sdk/models/data/movetns.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.movetns import MovetnsMap
-
-class MovetnsData(MovetnsMap, BaseData):
-
-    def __init__(self):
-        self.full_number = BaseResourceSimpleList()
-
-    def add(self, phone_number):
-        return self.full_number.add(phone_number)
\ No newline at end of file
diff --git a/iris_sdk/models/data/note.py b/iris_sdk/models/data/note.py
deleted file mode 100644
index 98b5789..0000000
--- a/iris_sdk/models/data/note.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.note import NoteMap
-
-class NoteData(NoteMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/notes.py b/iris_sdk/models/data/notes.py
deleted file mode 100644
index de13560..0000000
--- a/iris_sdk/models/data/notes.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.note import Note
-from iris_sdk.models.maps.notes import NotesMap
-
-class NotesData(NotesMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.note = BaseResourceList(Note, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/npa_nxx.py b/iris_sdk/models/data/npa_nxx.py
deleted file mode 100644
index b738fce..0000000
--- a/iris_sdk/models/data/npa_nxx.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.npa_nxx import NpaNxxMap
-
-class NpaNxx(NpaNxxMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/area_code_search_order.py b/iris_sdk/models/data/ord/area_code_search_order.py
deleted file mode 100644
index 05b85fd..0000000
--- a/iris_sdk/models/data/ord/area_code_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.area_code_search_order import \
-    AreaCodeSearchOrderMap
-
-class AreaCodeSearchOrder(AreaCodeSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/city_search_order.py b/iris_sdk/models/data/ord/city_search_order.py
deleted file mode 100644
index e22ce07..0000000
--- a/iris_sdk/models/data/ord/city_search_order.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.city_search_order import CitySearchOrderMap
-
-class CitySearchOrder(CitySearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/existing_search_order.py b/iris_sdk/models/data/ord/existing_search_order.py
deleted file mode 100644
index 09a762b..0000000
--- a/iris_sdk/models/data/ord/existing_search_order.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.maps.ord.existing_search_order import \
-    ExistingSearchOrderMap
-from iris_sdk.models.data.reservation_list import ReservationList
-
-class ExistingSearchOrder(ExistingSearchOrderMap, BaseData):
-
-    def __init__(self):
-        self.reservation_id_list = ReservationList()
-        self.telephone_number_list = TelephoneNumberList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/lata_search_order.py b/iris_sdk/models/data/ord/lata_search_order.py
deleted file mode 100644
index 8582abb..0000000
--- a/iris_sdk/models/data/ord/lata_search_order.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.lata_search_order import LataSearchOrderMap
-
-class LataSearchOrder(LataSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/npa_search_order.py b/iris_sdk/models/data/ord/npa_search_order.py
deleted file mode 100644
index 8cba4b2..0000000
--- a/iris_sdk/models/data/ord/npa_search_order.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.npa_search_order import NpaSearchOrderMap
-
-class NpaSearchOrder(NpaSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/rate_center_search_order.py b/iris_sdk/models/data/ord/rate_center_search_order.py
deleted file mode 100644
index 167cfac..0000000
--- a/iris_sdk/models/data/ord/rate_center_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.rate_center_search_order import \
-    RateCenterSearchOrderMap
-
-class RateCenterSearchOrder(RateCenterSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/state_search_order.py b/iris_sdk/models/data/ord/state_search_order.py
deleted file mode 100644
index 59325f9..0000000
--- a/iris_sdk/models/data/ord/state_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.state_search_order import \
-    StateSearchOrderMap
-
-class StateSearchOrder(StateSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/vanity_search_order.py b/iris_sdk/models/data/ord/vanity_search_order.py
deleted file mode 100644
index 7d384f8..0000000
--- a/iris_sdk/models/data/ord/vanity_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.vanity_search_order import \
-    VanitySearchOrderMap
-
-class VanitySearchOrder(VanitySearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/wildcard_search_order.py b/iris_sdk/models/data/ord/wildcard_search_order.py
deleted file mode 100644
index 5240b7f..0000000
--- a/iris_sdk/models/data/ord/wildcard_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.wildcard_search_order import \
-    WildcardSearchOrderMap
-
-class WildcardSearchOrder(WildcardSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/ord/zip_search_order.py b/iris_sdk/models/data/ord/zip_search_order.py
deleted file mode 100644
index 5bf94ef..0000000
--- a/iris_sdk/models/data/ord/zip_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.ord.zip_search_order import \
-    ZipSearchOrderMap
-
-class ZipSearchOrder(ZipSearchOrderMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/order_history.py b/iris_sdk/models/data/order_history.py
deleted file mode 100644
index cdf053a..0000000
--- a/iris_sdk/models/data/order_history.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.order_history import OrderHistoryMap
-
-class OrderHistoryData(OrderHistoryMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/order_response.py b/iris_sdk/models/data/order_response.py
deleted file mode 100644
index 5161db4..0000000
--- a/iris_sdk/models/data/order_response.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.error_list import ErrorList
-from iris_sdk.models.data.full_numbers import FullNumbers
-from iris_sdk.models.data.completed_numbers import CompletedNumbers
-from iris_sdk.models.maps.order_response import OrderResponseMap
-
-class OrderResponseData(OrderResponseMap, BaseData):
-
-    def __init__(self):
-        self.completed_numbers = CompletedNumbers()
-        self.error_list = ErrorList()
-        self.failed_numbers = FullNumbers()
diff --git a/iris_sdk/models/data/order_tns.py b/iris_sdk/models/data/order_tns.py
deleted file mode 100644
index d36440d..0000000
--- a/iris_sdk/models/data/order_tns.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.order_tns import OrderTnsMap
-
-class OrderTnsData(OrderTnsMap, BaseData):
-
-    def __init__(self):
-        self.telephone_number = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/orders.py b/iris_sdk/models/data/orders.py
deleted file mode 100644
index 180c920..0000000
--- a/iris_sdk/models/data/orders.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.maps.orders import OrdersMap
-from iris_sdk.models.order import Order
-
-class OrdersData(OrdersMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.links = Links()
-        self.order_id_user_id_date = BaseResourceList(Order, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/permissions_list.py b/iris_sdk/models/data/permissions_list.py
deleted file mode 100644
index 779485d..0000000
--- a/iris_sdk/models/data/permissions_list.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.permission import Permission
-from iris_sdk.models.maps.permissions_list import PermissionsListMap
-
-class PermissionsList(PermissionsListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.permission.items
-
-    def __init__(self):
-        self.permission = BaseResourceList(Permission)
\ No newline at end of file
diff --git a/iris_sdk/models/data/portins.py b/iris_sdk/models/data/portins.py
deleted file mode 100644
index d05e8f6..0000000
--- a/iris_sdk/models/data/portins.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.maps.portins import PortInsMap
-from iris_sdk.models.portin import PortIn
-
-class PortInsData(PortInsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.links = Links()
-        self.lnp_port_info_for_given_status = BaseResourceList(PortIn, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/portouts.py b/iris_sdk/models/data/portouts.py
deleted file mode 100644
index 44da99d..0000000
--- a/iris_sdk/models/data/portouts.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.links import Links
-from iris_sdk.models.maps.portins import PortInsMap
-from iris_sdk.models.portout import PortOut
-
-class PortOutsData(PortInsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.links = Links()
-        self.lnp_port_info_for_given_status = BaseResourceList(PortOut, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/rate_center.py b/iris_sdk/models/data/rate_center.py
deleted file mode 100644
index 3537611..0000000
--- a/iris_sdk/models/data/rate_center.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.cities_short_list import CitiesShortList
-from iris_sdk.models.data.local_rate_center_list import LocalRateCenterList
-from iris_sdk.models.data.npanxx_list import NpanxxList
-from iris_sdk.models.data.tier_list import TierList
-from iris_sdk.models.data.zip_code_list import ZipCodeList
-from iris_sdk.models.maps.rate_center import RateCenterMap
-
-class RateCenterData(RateCenterMap, BaseData):
-
-    def __init__(self):
-        self.cities = CitiesShortList()
-        self.local_rate_centers = LocalRateCenterList()
-        self.npa_nxx_xs = NpanxxList()
-        self.tiers = TierList()
-        self.zip_codes = ZipCodeList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/rate_centers_list.py b/iris_sdk/models/data/rate_centers_list.py
deleted file mode 100644
index f19e537..0000000
--- a/iris_sdk/models/data/rate_centers_list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.rate_center import RateCenterData
-from iris_sdk.models.maps.rate_centers_list import RateCentersListMap
-
-class RateCentersList(RateCentersListMap, BaseData):
-
-    def __init__(self):
-        self.rate_center = BaseResourceList(RateCenterData)
\ No newline at end of file
diff --git a/iris_sdk/models/data/response_status.py b/iris_sdk/models/data/response_status.py
deleted file mode 100644
index f33f9a7..0000000
--- a/iris_sdk/models/data/response_status.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.response_status import ResponseStatusMap
-
-class ResponseStatus(ResponseStatusMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/role.py b/iris_sdk/models/data/role.py
deleted file mode 100644
index 8e73d3d..0000000
--- a/iris_sdk/models/data/role.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.permissions_list import PermissionsList
-from iris_sdk.models.maps.role import RoleMap
-
-class Role(RoleMap, BaseData):
-
-    @property
-    def name(self):
-        return self.role_name
-    @name.setter
-    def name(self, name):
-        self.role_name = name
-
-    def __init__(self):
-        self.permissions = PermissionsList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/roles_list.py b/iris_sdk/models/data/roles_list.py
deleted file mode 100644
index 263a796..0000000
--- a/iris_sdk/models/data/roles_list.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.role import Role
-from iris_sdk.models.maps.roles_list import RolesListMap
-
-class RolesList(RolesListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.role.items
-
-    def __init__(self):
-        self.role = BaseResourceList(Role)
\ No newline at end of file
diff --git a/iris_sdk/models/data/sip_peer_host.py b/iris_sdk/models/data/sip_peer_host.py
deleted file mode 100644
index 1173211..0000000
--- a/iris_sdk/models/data/sip_peer_host.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.hosts import Hosts
-from iris_sdk.models.data.termination_hosts import TerminationHosts
-from iris_sdk.models.maps.sip_peer_host import SipPeerHostMap
-
-class SipPeerHost(SipPeerHostMap, BaseData):
-
-    def __init__(self):
-        self.sms_hosts = Hosts()
-        self.termination_hosts = Hosts()
-        self.voice_hosts = Hosts()
\ No newline at end of file
diff --git a/iris_sdk/models/data/sip_peer_hosts.py b/iris_sdk/models/data/sip_peer_hosts.py
deleted file mode 100644
index c0164f1..0000000
--- a/iris_sdk/models/data/sip_peer_hosts.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.sip_peer_host import SipPeerHost
-from iris_sdk.models.maps.sip_peer_hosts import SipPeerHostsMap
-
-class SipPeerHosts(SipPeerHostsMap, BaseData):
-
-    @property
-    def items(self):
-        return self.sip_peer_host.items
-
-    def __init__(self):
-        self.sip_peer_host = BaseResourceList(SipPeerHost)
\ No newline at end of file
diff --git a/iris_sdk/models/data/sip_peer_telephone_number.py b/iris_sdk/models/data/sip_peer_telephone_number.py
deleted file mode 100644
index 90c9bef..0000000
--- a/iris_sdk/models/data/sip_peer_telephone_number.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.tn_attributes import TnAttributes
-from iris_sdk.models.maps.sip_peer_telephone_number import \
-    SipPeerTelephoneNumberMap
-
-class SipPeerTelephoneNumberData(SipPeerTelephoneNumberMap, BaseData):
-
-    def __init__(self):
-        self.tn_attributes = TnAttributes()
\ No newline at end of file
diff --git a/iris_sdk/models/data/sip_peer_tns.py b/iris_sdk/models/data/sip_peer_tns.py
deleted file mode 100644
index c696e78..0000000
--- a/iris_sdk/models/data/sip_peer_tns.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.sip_peer_telephone_numbers import \
-    SipPeerTelephoneNumbers
-from iris_sdk.models.maps.sip_peer_tns import SipPeerTnsMap
-
-class SipPeerTnsData(SipPeerTnsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.sip_peer_telephone_numbers = SipPeerTelephoneNumbers(parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/sip_peers.py b/iris_sdk/models/data/sip_peers.py
deleted file mode 100644
index c19655b..0000000
--- a/iris_sdk/models/data/sip_peers.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.sip_peers import SipPeersMap
-from iris_sdk.models.sip_peer import SipPeer
-
-class SipPeersData(SipPeersMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.sip_peer = BaseResourceList(SipPeer, self)
\ No newline at end of file
diff --git a/iris_sdk/models/data/site.py b/iris_sdk/models/data/site.py
deleted file mode 100644
index 1f79380..0000000
--- a/iris_sdk/models/data/site.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.maps.site import SiteMap
-
-class SiteData(SiteMap):
-
-    def __init__(self):
-        self.address = Address()
\ No newline at end of file
diff --git a/iris_sdk/models/data/site_host.py b/iris_sdk/models/data/site_host.py
deleted file mode 100644
index 66e1ee1..0000000
--- a/iris_sdk/models/data/site_host.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.sip_peer_hosts import SipPeerHosts
-from iris_sdk.models.maps.site_host import SiteHostMap
-
-class SiteHost(SiteHostMap, BaseData):
-
-    def __init__(self):
-        self.sip_peer_hosts = SipPeerHosts()
\ No newline at end of file
diff --git a/iris_sdk/models/data/site_hosts.py b/iris_sdk/models/data/site_hosts.py
deleted file mode 100644
index a83655b..0000000
--- a/iris_sdk/models/data/site_hosts.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.site_host import SiteHost
-from iris_sdk.models.maps.site_hosts import SiteHostsMap
-
-class SiteHostsData(SiteHostsMap, BaseData):
-
-    @property
-    def items(self):
-        return self.site_host.items
-
-    def __init__(self):
-        self.site_host = BaseResourceList(SiteHost)
\ No newline at end of file
diff --git a/iris_sdk/models/data/sites.py b/iris_sdk/models/data/sites.py
deleted file mode 100644
index 03fc424..0000000
--- a/iris_sdk/models/data/sites.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.sites import SitesMap
-from iris_sdk.models.site import Site
-
-class SitesData(SitesMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.site = BaseResourceList(Site, self)
\ No newline at end of file
diff --git a/iris_sdk/models/data/subscriber.py b/iris_sdk/models/data/subscriber.py
deleted file mode 100644
index a1823d1..0000000
--- a/iris_sdk/models/data/subscriber.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.address import Address
-from iris_sdk.models.maps.subscriber import SubscriberMap
-
-class Subscriber(SubscriberMap, BaseData):
-
-    def __init__(self):
-        self.service_address = Address()
\ No newline at end of file
diff --git a/iris_sdk/models/data/subscription.py b/iris_sdk/models/data/subscription.py
deleted file mode 100644
index 870235d..0000000
--- a/iris_sdk/models/data/subscription.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.data.email_subscription import EmailSubscription
-from iris_sdk.models.data.callback_subscription import CallbackSubscription
-from iris_sdk.models.maps.subscription import SubscriptionMap
-
-class SubscriptionData(SubscriptionMap, BaseData):
-
-    def __init__(self):
-        self.email_subscription = EmailSubscription()
-        self.callback_subscription = CallbackSubscription()
\ No newline at end of file
diff --git a/iris_sdk/models/data/subscriptions.py b/iris_sdk/models/data/subscriptions.py
deleted file mode 100644
index 5a28ec5..0000000
--- a/iris_sdk/models/data/subscriptions.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.subscriptions import SubscriptionsMap
-from iris_sdk.models.subscription import Subscription
-
-class SubscriptionsData(SubscriptionsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.subscription = BaseResourceList(Subscription, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/telephone_numbers.py b/iris_sdk/models/data/telephone_numbers.py
deleted file mode 100644
index 3fd2f32..0000000
--- a/iris_sdk/models/data/telephone_numbers.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.data.telephone_number_detail_list_tn import \
-    TelephoneNumberDetailListTn
-from iris_sdk.models.maps.telephone_numbers import TelephoneNumbersMap
-
-class TelephoneNumbers(TelephoneNumbersMap, TelephoneNumberDetailListTn):
-
-    def __init__(self, parent=None):
-        TelephoneNumberDetailListTn.__init__(self, parent)
\ No newline at end of file
diff --git a/iris_sdk/models/data/tier_list.py b/iris_sdk/models/data/tier_list.py
deleted file mode 100644
index 40736ed..0000000
--- a/iris_sdk/models/data/tier_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.tier_list import TierListMap
-
-class TierList(TierListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.tier.items
-
-    def __init__(self):
-        self.tier = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_attributes.py b/iris_sdk/models/data/tn_attributes.py
deleted file mode 100644
index 09799c6..0000000
--- a/iris_sdk/models/data/tn_attributes.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.tn_attributes import TnAttributesMap
-
-class TnAttributes(TnAttributesMap, BaseData):
-
-    @property
-    def items(self):
-        return self.tn_attribute.items
-
-    def __init__(self, parent=None):
-        self.tn_attribute = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_history.py b/iris_sdk/models/data/tn_history.py
deleted file mode 100644
index 4269acc..0000000
--- a/iris_sdk/models/data/tn_history.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.tn_status import TnStatus
-from iris_sdk.models.maps.tn_history import TnHistoryMap
-
-class TnHistoryData(TnHistoryMap):
-
-    def __init__(self):
-        self.telephone_number_status = BaseResourceList(TnStatus)
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_lca.py b/iris_sdk/models/data/tn_lca.py
deleted file mode 100644
index 117018d..0000000
--- a/iris_sdk/models/data/tn_lca.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseResourceSimpleList
-from iris_sdk.models.data.location import Location
-from iris_sdk.models.data.npanxx_list import NpanxxList
-from iris_sdk.models.maps.tn_lca import TnLcaMap
-
-class TnLcaData(TnLcaMap):
-
-    def __init__(self):
-        self.listof_npanxx = NpanxxList()
-        self.location = Location()
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_line_options.py b/iris_sdk/models/data/tn_line_options.py
deleted file mode 100644
index 4f7291a..0000000
--- a/iris_sdk/models/data/tn_line_options.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.tn_line_options import TnLineOptionsMap
-
-class TnLineOptionsData(TnLineOptionsMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_option_order.py b/iris_sdk/models/data/tn_option_order.py
deleted file mode 100644
index 1fd2315..0000000
--- a/iris_sdk/models/data/tn_option_order.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-  
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.tn_option_order import TnOptionOrderMap
-from iris_sdk.models.data.error_list import ErrorList
-from iris_sdk.models.data.warnings import Warnings
-from iris_sdk.models.data.tn_option_order_groups import TnOptionOrderGroupsData
-
-class TnOptionOrderData(TnOptionOrderMap, BaseData):
-
-    def __init__(self):
-        self.error_list = ErrorList()
-        self.warnings = Warnings()
-        self.tn_option_groups = TnOptionOrderGroupsData()
diff --git a/iris_sdk/models/data/tn_option_order_group.py b/iris_sdk/models/data/tn_option_order_group.py
deleted file mode 100644
index 26a4015..0000000
--- a/iris_sdk/models/data/tn_option_order_group.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-  
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.tn_option_order_group import TnOptionOrderGroupMap
-from iris_sdk.models.data.telephone_number_list import TelephoneNumberList
-from iris_sdk.models.data.a2p_settings import A2pSettings
-
-class TnOptionOrderGroupData(TnOptionOrderGroupMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.telephone_numbers = TelephoneNumberList()
-        self.a2p_settings = A2pSettings()
diff --git a/iris_sdk/models/data/tn_option_order_groups.py b/iris_sdk/models/data/tn_option_order_groups.py
deleted file mode 100644
index a1ac899..0000000
--- a/iris_sdk/models/data/tn_option_order_groups.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.maps.tn_option_order_groups import TnOptionOrderGroupsMap
-from iris_sdk.models.data.tn_option_order_group import TnOptionOrderGroupData
-
-class TnOptionOrderGroupsData(TnOptionOrderGroupsMap, BaseData):
-
-    def __init__(self, parent=None):
-        self.tn_option_group = BaseResourceList(TnOptionOrderGroupData, parent)
diff --git a/iris_sdk/models/data/tn_rate_centers_list.py b/iris_sdk/models/data/tn_rate_centers_list.py
deleted file mode 100644
index 24e96aa..0000000
--- a/iris_sdk/models/data/tn_rate_centers_list.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.data.tn_rc_list import TelephoneNumberRcList
-from iris_sdk.models.maps.tn_rate_centers_list import TnRateCentersListMap
-
-class TnRateCentersList(TnRateCentersListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.rcs.items
-
-    @property
-    def rcs(self):
-        return self.r_cs
-
-    def __init__(self):
-        self.r_cs = TelephoneNumberRcList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_rc_list.py b/iris_sdk/models/data/tn_rc_list.py
deleted file mode 100644
index 7c3c51e..0000000
--- a/iris_sdk/models/data/tn_rc_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.tn_rc_list import TelephoneNumberRcListMap
-
-class TelephoneNumberRcList(TelephoneNumberRcListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.rc.items
-
-    def __init__(self):
-        self.rc = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/data/tn_status.py b/iris_sdk/models/data/tn_status.py
deleted file mode 100644
index befd00f..0000000
--- a/iris_sdk/models/data/tn_status.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.tn_status import TnStatusMap
-
-class TnStatus(TnStatusMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/totals.py b/iris_sdk/models/data/totals.py
deleted file mode 100644
index f951a14..0000000
--- a/iris_sdk/models/data/totals.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.totals import TotalsMap
-
-class TotalsData(TotalsMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/warning.py b/iris_sdk/models/data/warning.py
deleted file mode 100644
index 4de61b6..0000000
--- a/iris_sdk/models/data/warning.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-  
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.warning import WarningMap
-
-class WarningCls(WarningMap, BaseData): #Warning is a reserved word in python
-    pass
diff --git a/iris_sdk/models/data/warnings.py b/iris_sdk/models/data/warnings.py
deleted file mode 100644
index 178dbdd..0000000
--- a/iris_sdk/models/data/warnings.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-  
-from iris_sdk.models.base_resource import BaseData, BaseResourceList
-from iris_sdk.models.data.warning import WarningCls 
-from iris_sdk.models.maps.warnings import WarningsMap
-
-class Warnings(WarningsMap, BaseData):
-
-    def __init__(self):
-        self.warning = BaseResourceList(WarningCls)
diff --git a/iris_sdk/models/data/wireless_info.py b/iris_sdk/models/data/wireless_info.py
deleted file mode 100644
index 863d837..0000000
--- a/iris_sdk/models/data/wireless_info.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData
-from iris_sdk.models.maps.wireless_info import WirelessInfoMap
-
-class WirelessInfo(WirelessInfoMap, BaseData):
-    pass
\ No newline at end of file
diff --git a/iris_sdk/models/data/zip_code_list.py b/iris_sdk/models/data/zip_code_list.py
deleted file mode 100644
index 8b87bc2..0000000
--- a/iris_sdk/models/data/zip_code_list.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.base_resource import BaseData, BaseResourceSimpleList
-from iris_sdk.models.maps.zip_code_list import ZipCodeListMap
-
-class ZipCodeList(ZipCodeListMap, BaseData):
-
-    @property
-    def items(self):
-        return self.zip_code.items
-
-    def __init__(self):
-        self.zip_code = BaseResourceSimpleList()
\ No newline at end of file
diff --git a/iris_sdk/models/maps/account_users.py b/iris_sdk/models/maps/account_users.py
deleted file mode 100644
index 764136d..0000000
--- a/iris_sdk/models/maps/account_users.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class AccountUsersMap(BaseMap):
-
-    user = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/available_npa_nxx.py b/iris_sdk/models/maps/available_npa_nxx.py
deleted file mode 100644
index fc0d436..0000000
--- a/iris_sdk/models/maps/available_npa_nxx.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class AvailableNpaNxxMap(BaseMap):
-
-    available_npa_nxx_list = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/available_npa_nxx_list.py b/iris_sdk/models/maps/available_npa_nxx_list.py
deleted file mode 100644
index 9e11eb1..0000000
--- a/iris_sdk/models/maps/available_npa_nxx_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class AvailableNpaNxxListMap(BaseMap):
-
-    available_npa_nxx = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/cities.py b/iris_sdk/models/maps/cities.py
deleted file mode 100644
index a5e7486..0000000
--- a/iris_sdk/models/maps/cities.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class CitiesMap(BaseMap):
-
-    result_count = None
-    cities = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/cities_list.py b/iris_sdk/models/maps/cities_list.py
deleted file mode 100644
index 7faf80c..0000000
--- a/iris_sdk/models/maps/cities_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class CitiesListMap(BaseMap):
-
-    city = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/cities_short_list.py b/iris_sdk/models/maps/cities_short_list.py
deleted file mode 100644
index 7642d43..0000000
--- a/iris_sdk/models/maps/cities_short_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class CitiesShortListMap(BaseMap):
-
-    city = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/city.py b/iris_sdk/models/maps/city.py
deleted file mode 100644
index 6542bf6..0000000
--- a/iris_sdk/models/maps/city.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class CityMap(BaseMap):
-
-    city = None
-    name = None
-    rc_abbreviation = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/dlda_order_response.py b/iris_sdk/models/maps/dlda_order_response.py
deleted file mode 100644
index b9dd1b9..0000000
--- a/iris_sdk/models/maps/dlda_order_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class DldaOrderResponseMap(BaseMap):
-
-    dlda_order = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/dlda_tn_groups.py b/iris_sdk/models/maps/dlda_tn_groups.py
deleted file mode 100644
index f7abb83..0000000
--- a/iris_sdk/models/maps/dlda_tn_groups.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class DldaTnGroupsMap(BaseMap):
-
-    dlda_tn_group = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/email_subscription.py b/iris_sdk/models/maps/email_subscription.py
deleted file mode 100644
index 6f3066c..0000000
--- a/iris_sdk/models/maps/email_subscription.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class EmailSubscriptionMap(BaseMap):
-
-    email = None
-    digest_requested = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/error_list.py b/iris_sdk/models/maps/error_list.py
deleted file mode 100644
index 9515072..0000000
--- a/iris_sdk/models/maps/error_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class ErrorListMap(BaseMap):
-
-    error = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/features.py b/iris_sdk/models/maps/features.py
deleted file mode 100644
index dcc9382..0000000
--- a/iris_sdk/models/maps/features.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class FeaturesMap(BaseMap):
-
-    dlda = None
-    lidb = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/file_data.py b/iris_sdk/models/maps/file_data.py
deleted file mode 100644
index d841693..0000000
--- a/iris_sdk/models/maps/file_data.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class FileDataMap(BaseMap):
-
-    file_meta_data = None
-    file_name = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/file_meta_data.py b/iris_sdk/models/maps/file_meta_data.py
deleted file mode 100644
index a4d2ad6..0000000
--- a/iris_sdk/models/maps/file_meta_data.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class FileMetaDataMap(BaseMap):
-
-    document_name = None
-    document_type = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/history.py b/iris_sdk/models/maps/history.py
deleted file mode 100644
index 82d69f3..0000000
--- a/iris_sdk/models/maps/history.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class HistoryMap(BaseMap):
-
-    order_history = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/hosts.py b/iris_sdk/models/maps/hosts.py
deleted file mode 100644
index 4746fc6..0000000
--- a/iris_sdk/models/maps/hosts.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class HostsMap(BaseMap):
-
-    host = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/lata.py b/iris_sdk/models/maps/lata.py
deleted file mode 100644
index 2c0703f..0000000
--- a/iris_sdk/models/maps/lata.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LataMap(BaseMap):
-
-    lata = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/lidb_tn_groups.py b/iris_sdk/models/maps/lidb_tn_groups.py
deleted file mode 100644
index 4bb51c0..0000000
--- a/iris_sdk/models/maps/lidb_tn_groups.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LidbTnGroupsMap(BaseMap):
-
-    lidb_tn_group = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/line_option_order.py b/iris_sdk/models/maps/line_option_order.py
deleted file mode 100644
index 1bb3c44..0000000
--- a/iris_sdk/models/maps/line_option_order.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LineOptionOrderMap(BaseMap):
-
-    tn_line_options = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/line_option_order_response.py b/iris_sdk/models/maps/line_option_order_response.py
deleted file mode 100644
index 65ef7c7..0000000
--- a/iris_sdk/models/maps/line_option_order_response.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LineOptionOrderResponseMap(BaseMap):
-
-    line_options = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/links.py b/iris_sdk/models/maps/links.py
deleted file mode 100644
index f8ab7cf..0000000
--- a/iris_sdk/models/maps/links.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LinksMap(BaseMap):
-
-    first = None
-    next = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/lnp_losing_carriers.py b/iris_sdk/models/maps/lnp_losing_carriers.py
deleted file mode 100644
index 7548da6..0000000
--- a/iris_sdk/models/maps/lnp_losing_carriers.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LnpLosingCarriersMap(BaseMap):
-
-    losing_carrier_tn_list = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/lnp_rate_center_list.py b/iris_sdk/models/maps/lnp_rate_center_list.py
deleted file mode 100644
index 7cc36f9..0000000
--- a/iris_sdk/models/maps/lnp_rate_center_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LnpRateCenterListMap(BaseMap):
-
-    rate_center_group = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/lnpchecker.py b/iris_sdk/models/maps/lnpchecker.py
deleted file mode 100644
index c60a31d..0000000
--- a/iris_sdk/models/maps/lnpchecker.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LnpCheckerMap(BaseMap):
-
-    tn_list = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/local_rate_center_list.py b/iris_sdk/models/maps/local_rate_center_list.py
deleted file mode 100644
index 0112992..0000000
--- a/iris_sdk/models/maps/local_rate_center_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LocalRateCenterListMap(BaseMap):
-
-    rate_center_id = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/location.py b/iris_sdk/models/maps/location.py
deleted file mode 100644
index 8770fb5..0000000
--- a/iris_sdk/models/maps/location.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LocationMap(BaseMap):
-
-    rate_centers = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/movetns.py b/iris_sdk/models/maps/movetns.py
deleted file mode 100644
index 773473a..0000000
--- a/iris_sdk/models/maps/movetns.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class MovetnsMap(BaseMap):
-
-    full_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/notes.py b/iris_sdk/models/maps/notes.py
deleted file mode 100644
index 42cdc9a..0000000
--- a/iris_sdk/models/maps/notes.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class NotesMap(BaseMap):
-
-    note = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/npanxx_list.py b/iris_sdk/models/maps/npanxx_list.py
deleted file mode 100644
index 521af1a..0000000
--- a/iris_sdk/models/maps/npanxx_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class NpanxxListMap(BaseMap):
-
-    npanxx = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/ord/lata_search_order.py b/iris_sdk/models/maps/ord/lata_search_order.py
deleted file mode 100644
index 51e30b8..0000000
--- a/iris_sdk/models/maps/ord/lata_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class LataSearchOrderMap(BaseMap):
-
-    lata = None
-    quantity = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/ord/vanity_search_order.py b/iris_sdk/models/maps/ord/vanity_search_order.py
deleted file mode 100644
index e9da2b2..0000000
--- a/iris_sdk/models/maps/ord/vanity_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class VanitySearchOrderMap(BaseMap):
-
-    quantity = None
-    toll_free_vanity = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/ord/wildcard_search_order.py b/iris_sdk/models/maps/ord/wildcard_search_order.py
deleted file mode 100644
index 6633927..0000000
--- a/iris_sdk/models/maps/ord/wildcard_search_order.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class WildcardSearchOrderMap(BaseMap):
-
-    quantity = None
-    toll_free_wild_card_pattern = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/order_tns.py b/iris_sdk/models/maps/order_tns.py
deleted file mode 100644
index 6f6c29e..0000000
--- a/iris_sdk/models/maps/order_tns.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class OrderTnsMap(BaseMap):
-
-    count = None
-    telephone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/permission.py b/iris_sdk/models/maps/permission.py
deleted file mode 100644
index 54de8d8..0000000
--- a/iris_sdk/models/maps/permission.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class PermissionMap(BaseMap):
-
-    permission_name = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/permissions_list.py b/iris_sdk/models/maps/permissions_list.py
deleted file mode 100644
index 34f8f0f..0000000
--- a/iris_sdk/models/maps/permissions_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class PermissionsListMap(BaseMap):
-
-    permission = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/phone_number_list.py b/iris_sdk/models/maps/phone_number_list.py
deleted file mode 100644
index 461423f..0000000
--- a/iris_sdk/models/maps/phone_number_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class PhoneNumberListMap(BaseMap):
-
-    phone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/rate_centers.py b/iris_sdk/models/maps/rate_centers.py
deleted file mode 100644
index 0994f64..0000000
--- a/iris_sdk/models/maps/rate_centers.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class RateCentersMap(BaseMap):
-
-    result_count = None
-    rate_centers = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/rate_centers_list.py b/iris_sdk/models/maps/rate_centers_list.py
deleted file mode 100644
index b7a17c5..0000000
--- a/iris_sdk/models/maps/rate_centers_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class RateCentersListMap(BaseMap):
-
-    rate_center = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/response_status.py b/iris_sdk/models/maps/response_status.py
deleted file mode 100644
index 2244283..0000000
--- a/iris_sdk/models/maps/response_status.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class ResponseStatusMap(BaseMap):
-
-    description = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/role.py b/iris_sdk/models/maps/role.py
deleted file mode 100644
index ecee2a2..0000000
--- a/iris_sdk/models/maps/role.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class RoleMap(BaseMap):
-
-    permissions = None
-    role_name = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/roles_list.py b/iris_sdk/models/maps/roles_list.py
deleted file mode 100644
index c8f654a..0000000
--- a/iris_sdk/models/maps/roles_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class RolesListMap(BaseMap):
-
-    role = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/sip_peer_hosts.py b/iris_sdk/models/maps/sip_peer_hosts.py
deleted file mode 100644
index a183b3e..0000000
--- a/iris_sdk/models/maps/sip_peer_hosts.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SipPeerHostsMap(BaseMap):
-
-    sip_peer_host = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/sip_peer_telephone_numbers.py b/iris_sdk/models/maps/sip_peer_telephone_numbers.py
deleted file mode 100644
index a9b1e91..0000000
--- a/iris_sdk/models/maps/sip_peer_telephone_numbers.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SipPeerTelephoneNumbersMap(BaseMap):
-
-    sip_peer_telephone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/sip_peer_tns.py b/iris_sdk/models/maps/sip_peer_tns.py
deleted file mode 100644
index b4f7be6..0000000
--- a/iris_sdk/models/maps/sip_peer_tns.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SipPeerTnsMap(BaseMap):
-
-    sip_peer_telephone_numbers = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/sip_peers.py b/iris_sdk/models/maps/sip_peers.py
deleted file mode 100644
index 444c8cf..0000000
--- a/iris_sdk/models/maps/sip_peers.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SipPeersMap(BaseMap):
-
-    sip_peer = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/site_hosts.py b/iris_sdk/models/maps/site_hosts.py
deleted file mode 100644
index 8aa7c98..0000000
--- a/iris_sdk/models/maps/site_hosts.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SiteHostsMap(BaseMap):
-
-    site_host = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/site_totaltns.py b/iris_sdk/models/maps/site_totaltns.py
deleted file mode 100644
index a44d2a6..0000000
--- a/iris_sdk/models/maps/site_totaltns.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SiteTotaltnsMap(BaseMap):
-
-    total_count = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/sites.py b/iris_sdk/models/maps/sites.py
deleted file mode 100644
index e8b5c81..0000000
--- a/iris_sdk/models/maps/sites.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SitesMap(BaseMap):
-
-    site = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/subscriptions.py b/iris_sdk/models/maps/subscriptions.py
deleted file mode 100644
index 37ebc41..0000000
--- a/iris_sdk/models/maps/subscriptions.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class SubscriptionsMap(BaseMap):
-
-    subscription = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/telephone_number_detail_list.py b/iris_sdk/models/maps/telephone_number_detail_list.py
deleted file mode 100644
index c8f8744..0000000
--- a/iris_sdk/models/maps/telephone_number_detail_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TelephoneNumberDetailListMap(BaseMap):
-
-    telephone_number_detail = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/telephone_number_detail_list_tn.py b/iris_sdk/models/maps/telephone_number_detail_list_tn.py
deleted file mode 100644
index cf5ee5a..0000000
--- a/iris_sdk/models/maps/telephone_number_detail_list_tn.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TelephoneNumberDetailListTnMap(BaseMap):
-
-    telephone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/telephone_number_list.py b/iris_sdk/models/maps/telephone_number_list.py
deleted file mode 100644
index 51a1d09..0000000
--- a/iris_sdk/models/maps/telephone_number_list.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TelephoneNumberListMap(BaseMap):
-
-    count = None
-    telephone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/telephone_numbers.py b/iris_sdk/models/maps/telephone_numbers.py
deleted file mode 100644
index 977ba54..0000000
--- a/iris_sdk/models/maps/telephone_numbers.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TelephoneNumbersMap(BaseMap):
-
-    telephone_number = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/termination_hosts.py b/iris_sdk/models/maps/termination_hosts.py
deleted file mode 100644
index 100cd2e..0000000
--- a/iris_sdk/models/maps/termination_hosts.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TerminationHostsMap(BaseMap):
-
-    termination_host = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tier_list.py b/iris_sdk/models/maps/tier_list.py
deleted file mode 100644
index 9e1ba94..0000000
--- a/iris_sdk/models/maps/tier_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TierListMap(BaseMap):
-
-    tier = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tn_attributes.py b/iris_sdk/models/maps/tn_attributes.py
deleted file mode 100644
index b063d83..0000000
--- a/iris_sdk/models/maps/tn_attributes.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TnAttributesMap(BaseMap):
-
-    tn_attribute = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tn_lca.py b/iris_sdk/models/maps/tn_lca.py
deleted file mode 100644
index d9fbb5a..0000000
--- a/iris_sdk/models/maps/tn_lca.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TnLcaMap(BaseMap):
-
-    listof_npanxx = None
-    location = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tn_line_options.py b/iris_sdk/models/maps/tn_line_options.py
deleted file mode 100644
index a71b334..0000000
--- a/iris_sdk/models/maps/tn_line_options.py
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TnLineOptionsMap(BaseMap):
-
-    telephone_number = None
-    calling_name_display = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tn_list.py b/iris_sdk/models/maps/tn_list.py
deleted file mode 100644
index 5b75d0f..0000000
--- a/iris_sdk/models/maps/tn_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TnListMap(BaseMap):
-
-    tn = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/tn_rc_list.py b/iris_sdk/models/maps/tn_rc_list.py
deleted file mode 100644
index 9bcd1d5..0000000
--- a/iris_sdk/models/maps/tn_rc_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TelephoneNumberRcListMap(BaseMap):
-
-    rc = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/totals.py b/iris_sdk/models/maps/totals.py
deleted file mode 100644
index 3a0cd23..0000000
--- a/iris_sdk/models/maps/totals.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class TotalsMap(BaseMap):
-
-    count = None
\ No newline at end of file
diff --git a/iris_sdk/models/maps/zip_code_list.py b/iris_sdk/models/maps/zip_code_list.py
deleted file mode 100644
index 3c036ad..0000000
--- a/iris_sdk/models/maps/zip_code_list.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-from iris_sdk.models.maps.base_map import BaseMap
-
-class ZipCodeListMap(BaseMap):
-
-    zip_code = None
\ No newline at end of file
diff --git a/setup.py b/setup.py
index a4d2625..39ca10d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,22 +1,29 @@
+import os
 from setuptools import setup, find_packages
 
+NAME = "bandwidth-numbers-sdk"
+VERSION = os.environ['RELEASE_VERSION']
+
+with open('README.md', 'r', encoding='utf-8') as fh:
+    long_description = fh.read()
+
+with open('requirements.txt') as f:
+    REQUIRES = f.read().splitlines()
+
+PYTHON_REQUIRES = ">=3.7"
+
 setup(
-    name             = "iris_sdk",
-    version          = "0.1",
-    description      = "IRIS / BBS Python API",
-    author           = "Bandwidth",
-    maintainer       = "Bandwidth",
-    url              = "https://github.com/scottbarstow/iris-python",
-    license          = "MIT",
-    packages         = find_packages(),
-    long_description = "Python client library for IRIS / BBS API",
-    classifiers = [
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-    ],
-    install_requires=[
-        "future",
-        "requests",
-    ]
-)
\ No newline at end of file
+    name=NAME,
+    version=VERSION,
+    description="Bandwidth Numbers SDK",
+    author="Bandwidth",
+    author_email="letstalk@bandwidth.com",
+    url="https://github.com/bandwidth/python-numbers-sdk",
+    keywords=["Bandwidth", "Numbers"],
+    python_requires=PYTHON_REQUIRES,
+    install_requires=REQUIRES,
+    packages=find_packages(exclude=["test", "tests"]),
+    include_package_data=True,
+    long_description=long_description,
+    long_description_content_type='text/markdown'
+)
diff --git a/tests/test_account.py b/tests/test_account.py
index 217c919..fa3b39a 100644
--- a/tests/test_account.py
+++ b/tests/test_account.py
@@ -12,9 +12,9 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
-from iris_sdk.utils.rest import RestError
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
+from bandwidth_numbers.utils.rest import RestError
 
 XML_RESPONSE_ACCOUNT_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -490,4 +490,4 @@ def test_tn_reservation_save(self):
             self.assertEqual(res.reserved_tn, "123456789")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_basedata.py b/tests/test_basedata.py
index b930371..4a13a08 100644
--- a/tests/test_basedata.py
+++ b/tests/test_basedata.py
@@ -9,7 +9,7 @@
 
 from unittest import main, TestCase
 
-from iris_sdk.models.base_resource import BaseData
+from bandwidth_numbers.models.base_resource import BaseData
 
 class BaseDataStub(BaseData):
     foo = 1
@@ -77,4 +77,4 @@ def test_basedata_clear(self):
         self.assertEqual(self._test_stub.eggs.spam, "foo")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_baseresource.py b/tests/test_baseresource.py
index b45ec3d..321ecf6 100644
--- a/tests/test_baseresource.py
+++ b/tests/test_baseresource.py
@@ -10,7 +10,7 @@
 if __package__ is None:
     sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..")
 
-from iris_sdk.utils.py_compat import PY_VER_MAJOR
+from bandwidth_numbers.utils.py_compat import PY_VER_MAJOR
 
 from unittest import main, TestCase
 
@@ -21,8 +21,8 @@
 
 from xml.etree.ElementTree import Element, ElementTree, fromstring
 
-from iris_sdk.models.base_resource import BaseResource
-from iris_sdk.models.maps.base_map import BaseMap
+from bandwidth_numbers.models.base_resource import BaseResource
+from bandwidth_numbers.models.maps.base_map import BaseMap
 
 class FooMap(BaseMap):
     fred = "A"
@@ -48,7 +48,7 @@ class ClassBaseResourceInitTest(TestCase):
     """Test class initialization and properties"""
 
     def setUp(self):
-        _patcher = patch("iris_sdk.utils.strings.Converter.__init__",
+        _patcher = patch("bandwidth_numbers.utils.strings.Converter.__init__",
             return_value=None)
         self._converter = _patcher.start()
         self.addCleanup(patch.stopall)
@@ -98,4 +98,4 @@ def test_baseresource_to_xml(self):
         self.assertEqual(self.str, xml)
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_cities.py b/tests/test_cities.py
index af7517e..76fc35a 100644
--- a/tests/test_cities.py
+++ b/tests/test_cities.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.cities import Cities
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.cities import Cities
 
 XML_RESPONSE_CITIES_LIST = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -50,4 +50,4 @@ def test_cities_list(self):
             self.assertEqual(city.name, "ABERDEEN")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_client.py b/tests/test_client.py
index ad3f106..7434f9a 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -7,7 +7,7 @@
 if __package__ is None:
     sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..")
 
-from iris_sdk.utils.py_compat import PY_VER_MAJOR
+from bandwidth_numbers.utils.py_compat import PY_VER_MAJOR
 
 from unittest import main, TestCase
 
@@ -16,7 +16,7 @@
 else:
     from mock import patch, MagicMock, PropertyMock
 
-from iris_sdk.client import Client
+from bandwidth_numbers.client import Client
 
 class ClassClientInitTest(TestCase):
 
@@ -24,7 +24,7 @@ class ClassClientInitTest(TestCase):
 
     @classmethod
     def setUpClass(cls):
-        with patch("iris_sdk.utils.config.Config"):
+        with patch("bandwidth_numbers.utils.config.Config"):
             cls._client = Client()
 
     @classmethod
@@ -45,8 +45,8 @@ def setUp(self):
     def tearDown(self):
         del self._client
 
-    @patch("iris_sdk.utils.rest.RestClient.__init__", return_value = None)
-    @patch("iris_sdk.utils.config.Config.__init__", return_value = None)
+    @patch("bandwidth_numbers.utils.rest.RestClient.__init__", return_value = None)
+    @patch("bandwidth_numbers.utils.config.Config.__init__", return_value = None)
     def test_client_init(self, mock1, mock2):
         self._client = Client("foo", "bar", "baz", "qux", "quux")
         mock1.assert_called_once_with("foo", "bar", "baz", "qux", "quux")
@@ -58,8 +58,8 @@ class ClassClientStrings(TestCase):
 
     @classmethod
     def setUpClass(cls):
-        with patch("iris_sdk.utils.config.Config"):
-            with patch("iris_sdk.utils.rest.RestClient"):
+        with patch("bandwidth_numbers.utils.config.Config"):
+            with patch("bandwidth_numbers.utils.rest.RestClient"):
                 cls._client = Client("foo///")
 
     @classmethod
@@ -80,12 +80,12 @@ class ClassClientRequests(TestCase):
 
     def setUp(self):
 
-        patcher_req = patch("iris_sdk.utils.rest.RestClient.request")
-        patcher_url = patch("iris_sdk.utils.config.Config.url",
+        patcher_req = patch("bandwidth_numbers.utils.rest.RestClient.request")
+        patcher_url = patch("bandwidth_numbers.utils.config.Config.url",
             new_callable = PropertyMock, return_value = "foo")
-        patcher_pass = patch("iris_sdk.utils.config.Config.password",
+        patcher_pass = patch("bandwidth_numbers.utils.config.Config.password",
             new_callable = PropertyMock, return_value = "bar")
-        patcher_user = patch("iris_sdk.utils.config.Config.username",
+        patcher_user = patch("bandwidth_numbers.utils.config.Config.username",
             new_callable = PropertyMock, return_value = "baz")
 
         self._url = patcher_url.start()
@@ -105,8 +105,8 @@ def setUpClass(cls):
         cls._mock_res.content = b"foobar"
         cls._mock_res.status_code = 1337
 
-        with patch("iris_sdk.utils.config.Config"):
-            with patch("iris_sdk.utils.rest.RestClient"):
+        with patch("bandwidth_numbers.utils.config.Config"):
+            with patch("bandwidth_numbers.utils.rest.RestClient"):
                 cls._client = Client()
 
     @classmethod
@@ -143,4 +143,4 @@ def test_client_put(self):
             params="qux", data="quux", headers=None)
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_config.py b/tests/test_config.py
index 67801fc..94744ce 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -8,7 +8,7 @@
 if __package__ is None:
     sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..")
 
-from iris_sdk.utils.py_compat import PY_VER_MAJOR
+from bandwidth_numbers.utils.py_compat import PY_VER_MAJOR
 
 from unittest import main, TestCase
 
@@ -17,7 +17,7 @@
 else:
     from mock import mock_open, patch, MagicMock
 
-from iris_sdk.utils.config import *
+from bandwidth_numbers.utils.config import *
 
 class ClassConfigPropsTest(TestCase):
 
@@ -56,7 +56,7 @@ class ClassConfigInitializationTest (TestCase) :
     """Test class initialization"""
 
     def setUp(self):
-        patcher = patch("iris_sdk.utils.config.Config.load_from_file")
+        patcher = patch("bandwidth_numbers.utils.config.Config.load_from_file")
         self._patch = patcher.start()
         self.addCleanup(patch.stopall)
 
@@ -110,7 +110,7 @@ def test_config_load_from_huge_file(self):
 
     def test_config_load_from_good_file(self):
 
-        from iris_sdk.utils import config
+        from bandwidth_numbers.utils import config
 
         m = mock_open()
         if PY_VER_MAJOR == 3:
@@ -136,4 +136,4 @@ def test_config_load_from_good_file(self):
             self.assertEqual(self._config.url, "qux")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_covered_rate_centers.py b/tests/test_covered_rate_centers.py
index 52f9239..2dd90ca 100644
--- a/tests/test_covered_rate_centers.py
+++ b/tests/test_covered_rate_centers.py
@@ -12,9 +12,9 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.covered_rate_centers import CoveredRateCenters
-from iris_sdk.models.rate_center import RateCenter
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.covered_rate_centers import CoveredRateCenters
+from bandwidth_numbers.models.rate_center import RateCenter
 
 XML_RESPONSE_CRC_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?> "
@@ -123,4 +123,4 @@ def test_rate_centers_list(self):
             self.assertEqual(item.id, "1")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_disconnects.py b/tests/test_disconnects.py
index 72237a7..6d23e33 100644
--- a/tests/test_disconnects.py
+++ b/tests/test_disconnects.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_DISCONNECT_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -183,4 +183,4 @@ def test_disconnects_get(self):
             self.assertEqual(disc.order_status, "COMPLETE")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_dlda.py b/tests/test_dlda.py
index dba1ac1..04a6ac8 100644
--- a/tests/test_dlda.py
+++ b/tests/test_dlda.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_DLDA_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>"
@@ -426,4 +426,4 @@ def test_dlda_put(self):
             dlda.save()
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_lidb.py b/tests/test_lidb.py
index 9734ed7..ba2c3a9 100644
--- a/tests/test_lidb.py
+++ b/tests/test_lidb.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_LIDB_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -254,4 +254,4 @@ def test_lidb_post(self):
             self.assertEqual(grp.full_number, "8042105760")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_notes.py b/tests/test_notes.py
index a853975..5218b90 100644
--- a/tests/test_notes.py
+++ b/tests/test_notes.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_NOTES_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Notes>"
@@ -72,4 +72,4 @@ def test_notes_list(self):
             self.assertEqual(notes.items[0].id, "11425")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_notes_urls.py b/tests/test_notes_urls.py
index 59b3c5d..e7eb809 100644
--- a/tests/test_notes_urls.py
+++ b/tests/test_notes_urls.py
@@ -12,9 +12,9 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
-from iris_sdk.models.portout import PortOut
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
+from bandwidth_numbers.models.portout import PortOut
 
 class ClassNotesUrlsTest(TestCase):
 
@@ -56,4 +56,4 @@ def test_notes_portouts(self):
             po.notes.list()
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_orders.py b/tests/test_orders.py
index 536d832..76f7723 100644
--- a/tests/test_orders.py
+++ b/tests/test_orders.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_ORDER_CREATE = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -324,4 +324,4 @@ def test_zip_search_and_order(self):
         self.assertEqual(order.zip_search_and_order_type.quantity,"1")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_portins.py b/tests/test_portins.py
index ea3e8cc..bebd39d 100644
--- a/tests/test_portins.py
+++ b/tests/test_portins.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_ACTIVATION_STATUS = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -317,4 +317,4 @@ def test_portin_update(self):
                 "Supp request received.")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_rc.py b/tests/test_rc.py
index 625cc31..4df414d 100644
--- a/tests/test_rc.py
+++ b/tests/test_rc.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.rate_centers import RateCenters
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.rate_centers import RateCenters
 
 XML_RESPONSE_RC_LIST = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -50,4 +50,4 @@ def test_rc_list(self):
             self.assertEqual(rc.abbreviation, "AGOURA")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_rest.py b/tests/test_rest.py
index 4ab9bd6..6b88d7e 100644
--- a/tests/test_rest.py
+++ b/tests/test_rest.py
@@ -7,7 +7,7 @@
 if __package__ is None:
     sys.path.append(os.path.dirname(os.path.abspath(__file__)) + "/..")
 
-from iris_sdk.utils.py_compat import PY_VER_MAJOR
+from bandwidth_numbers.utils.py_compat import PY_VER_MAJOR
 
 from unittest import main, TestCase
 
@@ -18,7 +18,7 @@
 
 from requests.exceptions import HTTPError
 
-from iris_sdk.utils.rest import ERROR_TAG, ERROR_TEMPLATE, HEADERS, HTTP_OK,\
+from bandwidth_numbers.utils.rest import ERROR_TAG, ERROR_TEMPLATE, HEADERS, HTTP_OK,\
     RestClient, RestError
 
 class HttpErrorStub(HTTPError):
@@ -144,4 +144,4 @@ def getchildren(self):
                 self._rest_client.request("GET","foo","bar","baz","qux")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_sip_peers.py b/tests/test_sip_peers.py
index 40dec32..875ea03 100644
--- a/tests/test_sip_peers.py
+++ b/tests/test_sip_peers.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_SIP_PEER_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -187,4 +187,4 @@ def test_totaltns(self):
             self.assertEqual(count, "4")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_sites.py b/tests/test_sites.py
index 69c21d2..6d0c802 100644
--- a/tests/test_sites.py
+++ b/tests/test_sites.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_PORTINS_LIST = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -191,4 +191,4 @@ def test_sites_list(self):
             self.assertEqual(sites.items[0].id, "2297")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_strings.py b/tests/test_strings.py
index 5527bec..87122e4 100644
--- a/tests/test_strings.py
+++ b/tests/test_strings.py
@@ -9,7 +9,7 @@
 
 from unittest import main, TestCase
 
-from iris_sdk.utils.strings import Converter
+from bandwidth_numbers.utils.strings import Converter
 
 class ClassStringsConverterTest(TestCase):
 
@@ -47,4 +47,4 @@ def test_to_underscore(self):
             self.assertEqual(self._converter.to_underscore(input), output)
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_subscriptions.py b/tests/test_subscriptions.py
index 95c31dd..c8650cf 100644
--- a/tests/test_subscriptions.py
+++ b/tests/test_subscriptions.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_SUBSCRIPTIONS_LIST = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -144,4 +144,4 @@ def test_subscriptions_delete(self):
             self.assertEqual(m.request_history[0].url, url)
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_tn_option_orders.py b/tests/test_tn_option_orders.py
index 38fb304..52e87fb 100644
--- a/tests/test_tn_option_orders.py
+++ b/tests/test_tn_option_orders.py
@@ -12,8 +12,8 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
 
 XML_RESPONSE_CREATE_TN_OPTION_ORDER = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
diff --git a/tests/test_tns.py b/tests/test_tns.py
index 86fb56a..af21755 100644
--- a/tests/test_tns.py
+++ b/tests/test_tns.py
@@ -12,9 +12,9 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
-from iris_sdk.models.tns import Tns
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
+from bandwidth_numbers.models.tns import Tns
 
 XML_RESPONSE_LCA_GET = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -325,4 +325,4 @@ def test_tnreservation(self):
             self.assertEqual(tnr.account_id, "111")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/tests/test_users.py b/tests/test_users.py
index 49d3549..d2fb09c 100644
--- a/tests/test_users.py
+++ b/tests/test_users.py
@@ -12,9 +12,9 @@
 import requests
 import requests_mock
 
-from iris_sdk.client import Client
-from iris_sdk.models.account import Account
-from iris_sdk.models.users import Users
+from bandwidth_numbers.client import Client
+from bandwidth_numbers.models.account import Account
+from bandwidth_numbers.models.users import Users
 
 XML_RESPONSE_USERS_LIST = (
     b"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"
@@ -105,4 +105,4 @@ def test_users_list(self):
                 "UPDATE")
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()