diff --git a/VERSION b/VERSION
index f00fa32..18d3400 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.32
+2.1.33
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
index c996e52..861a1aa 100644
--- a/containers/chameleon/Dockerfile.chameleon
+++ b/containers/chameleon/Dockerfile.chameleon
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/chameleon
-FROM xosproject/xos-base:2.1.32
+FROM xosproject/xos-base:2.1.33
 
 # xos-base already has protoc and dependencies installed
 
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
index 3514dc1..f950968 100644
--- a/containers/xos/Dockerfile.client
+++ b/containers/xos/Dockerfile.client
@@ -13,20 +13,19 @@
 # limitations under the License.
 
 # xosproject/xos-client
-FROM xosproject/xos-libraries:2.1.32
+FROM xosproject/xos-libraries:2.1.33
 
 # Install XOS client
-COPY xos/xos_client /tmp/xos_client
+COPY lib/xos-api /tmp/xos-api
 
 # Install the VERSION file
-COPY VERSION tmp/xos_client
+COPY VERSION tmp/xos-api
 
 # Install chameleon
-COPY containers/xos/tmp.chameleon /tmp/xos_client/xosapi/chameleon
-#WORKDIR /opt/xos
+COPY containers/xos/tmp.chameleon /tmp/xos-api/xosapi/chameleon
 
 # install the client library and xossh
-RUN chdir /tmp/xos_client && make
+RUN chdir /tmp/xos-api && make
 
 # Label image
 ARG org_label_schema_schema_version=1.0
diff --git a/containers/xos/Dockerfile.libraries b/containers/xos/Dockerfile.libraries
index 29fc7a8..105bc97 100644
--- a/containers/xos/Dockerfile.libraries
+++ b/containers/xos/Dockerfile.libraries
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-libraries
-FROM xosproject/xos-base:2.1.32
+FROM xosproject/xos-base:2.1.33
 
 # Add libraries
 COPY lib /opt/xos/lib
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
index 00da3ef..6fd81f5 100644
--- a/containers/xos/Dockerfile.synchronizer-base
+++ b/containers/xos/Dockerfile.synchronizer-base
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:2.1.32
+FROM xosproject/xos-client:2.1.33
 
 COPY xos/synchronizers/new_base /opt/xos/synchronizers/new_base
 COPY xos/xos/logger.py /opt/xos/xos/logger.py
diff --git a/containers/xos/Dockerfile.xos-core b/containers/xos/Dockerfile.xos-core
index f3e5d7c..d3935db 100644
--- a/containers/xos/Dockerfile.xos-core
+++ b/containers/xos/Dockerfile.xos-core
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # xosproject/xos-core
-FROM xosproject/xos-libraries:2.1.32
+FROM xosproject/xos-libraries:2.1.33
 
 # Install XOS
 ADD xos /opt/xos
diff --git a/xos/xos_client/.gitignore b/lib/xos-api/.gitignore
similarity index 100%
rename from xos/xos_client/.gitignore
rename to lib/xos-api/.gitignore
diff --git a/xos/xos_client/Makefile b/lib/xos-api/Makefile
similarity index 100%
rename from xos/xos_client/Makefile
rename to lib/xos-api/Makefile
diff --git a/xos/xos_client/README.md b/lib/xos-api/README.md
similarity index 100%
rename from xos/xos_client/README.md
rename to lib/xos-api/README.md
diff --git a/xos/xos_client/xosapi/__init__.py b/lib/xos-api/__init__.py
similarity index 100%
copy from xos/xos_client/xosapi/__init__.py
copy to lib/xos-api/__init__.py
diff --git a/xos/xos_client/setup.py b/lib/xos-api/setup.py
similarity index 100%
rename from xos/xos_client/setup.py
rename to lib/xos-api/setup.py
diff --git a/xos/xos_client/tests/csr_introspect.py b/lib/xos-api/tests/csr_introspect.py
similarity index 100%
rename from xos/xos_client/tests/csr_introspect.py
rename to lib/xos-api/tests/csr_introspect.py
diff --git a/xos/xos_client/tests/nopper.py b/lib/xos-api/tests/nopper.py
similarity index 100%
rename from xos/xos_client/tests/nopper.py
rename to lib/xos-api/tests/nopper.py
diff --git a/xos/xos_client/tests/orm_listall.py b/lib/xos-api/tests/orm_listall.py
similarity index 100%
rename from xos/xos_client/tests/orm_listall.py
rename to lib/xos-api/tests/orm_listall.py
diff --git a/xos/xos_client/tests/orm_nodelabel.py b/lib/xos-api/tests/orm_nodelabel.py
similarity index 100%
rename from xos/xos_client/tests/orm_nodelabel.py
rename to lib/xos-api/tests/orm_nodelabel.py
diff --git a/xos/xos_client/tests/orm_reverse_relations.py b/lib/xos-api/tests/orm_reverse_relations.py
similarity index 100%
rename from xos/xos_client/tests/orm_reverse_relations.py
rename to lib/xos-api/tests/orm_reverse_relations.py
diff --git a/xos/xos_client/tests/orm_user_crud.py b/lib/xos-api/tests/orm_user_crud.py
similarity index 100%
rename from xos/xos_client/tests/orm_user_crud.py
rename to lib/xos-api/tests/orm_user_crud.py
diff --git a/xos/xos_client/tests/run_tests.sh b/lib/xos-api/tests/run_tests.sh
similarity index 100%
rename from xos/xos_client/tests/run_tests.sh
rename to lib/xos-api/tests/run_tests.sh
diff --git a/xos/xos_client/tests/vsg_introspect.py b/lib/xos-api/tests/vsg_introspect.py
similarity index 100%
rename from xos/xos_client/tests/vsg_introspect.py
rename to lib/xos-api/tests/vsg_introspect.py
diff --git a/xos/xos_client/tests/vtr_crud.py b/lib/xos-api/tests/vtr_crud.py
similarity index 100%
rename from xos/xos_client/tests/vtr_crud.py
rename to lib/xos-api/tests/vtr_crud.py
diff --git a/xos/xos_client/xosapi/__init__.py b/lib/xos-api/xosapi/__init__.py
similarity index 100%
rename from xos/xos_client/xosapi/__init__.py
rename to lib/xos-api/xosapi/__init__.py
diff --git a/xos/xos_client/xosapi/convenience/__init__.py b/lib/xos-api/xosapi/convenience/__init__.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/__init__.py
rename to lib/xos-api/xosapi/convenience/__init__.py
diff --git a/xos/xos_client/xosapi/convenience/addresspool.py b/lib/xos-api/xosapi/convenience/addresspool.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/addresspool.py
rename to lib/xos-api/xosapi/convenience/addresspool.py
diff --git a/xos/xos_client/xosapi/convenience/controller.py b/lib/xos-api/xosapi/convenience/controller.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/controller.py
rename to lib/xos-api/xosapi/convenience/controller.py
diff --git a/xos/xos_client/xosapi/convenience/instance.py b/lib/xos-api/xosapi/convenience/instance.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/instance.py
rename to lib/xos-api/xosapi/convenience/instance.py
diff --git a/xos/xos_client/xosapi/convenience/network.py b/lib/xos-api/xosapi/convenience/network.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/network.py
rename to lib/xos-api/xosapi/convenience/network.py
diff --git a/xos/xos_client/xosapi/convenience/onosapp.py b/lib/xos-api/xosapi/convenience/onosapp.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/onosapp.py
rename to lib/xos-api/xosapi/convenience/onosapp.py
diff --git a/xos/xos_client/xosapi/convenience/port.py b/lib/xos-api/xosapi/convenience/port.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/port.py
rename to lib/xos-api/xosapi/convenience/port.py
diff --git a/xos/xos_client/xosapi/convenience/privilege.py b/lib/xos-api/xosapi/convenience/privilege.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/privilege.py
rename to lib/xos-api/xosapi/convenience/privilege.py
diff --git a/xos/xos_client/xosapi/convenience/service.py b/lib/xos-api/xosapi/convenience/service.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/service.py
rename to lib/xos-api/xosapi/convenience/service.py
diff --git a/xos/xos_client/xosapi/convenience/serviceinstance.py b/lib/xos-api/xosapi/convenience/serviceinstance.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/serviceinstance.py
rename to lib/xos-api/xosapi/convenience/serviceinstance.py
diff --git a/xos/xos_client/xosapi/convenience/slice.py b/lib/xos-api/xosapi/convenience/slice.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/slice.py
rename to lib/xos-api/xosapi/convenience/slice.py
diff --git a/xos/xos_client/xosapi/convenience/tag.py b/lib/xos-api/xosapi/convenience/tag.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/tag.py
rename to lib/xos-api/xosapi/convenience/tag.py
diff --git a/xos/xos_client/xosapi/convenience/user.py b/lib/xos-api/xosapi/convenience/user.py
similarity index 100%
rename from xos/xos_client/xosapi/convenience/user.py
rename to lib/xos-api/xosapi/convenience/user.py
diff --git a/xos/xos_client/xosapi/fake_stub.py b/lib/xos-api/xosapi/fake_stub.py
similarity index 100%
rename from xos/xos_client/xosapi/fake_stub.py
rename to lib/xos-api/xosapi/fake_stub.py
diff --git a/xos/xos_client/xosapi/orm.py b/lib/xos-api/xosapi/orm.py
similarity index 100%
rename from xos/xos_client/xosapi/orm.py
rename to lib/xos-api/xosapi/orm.py
diff --git a/xos/xos_client/xosapi/test_config.yaml b/lib/xos-api/xosapi/test_config.yaml
similarity index 100%
rename from xos/xos_client/xosapi/test_config.yaml
rename to lib/xos-api/xosapi/test_config.yaml
diff --git a/xos/xos_client/xosapi/test_orm.py b/lib/xos-api/xosapi/test_orm.py
similarity index 100%
rename from xos/xos_client/xosapi/test_orm.py
rename to lib/xos-api/xosapi/test_orm.py
diff --git a/xos/xos_client/xosapi/test_wrapper.py b/lib/xos-api/xosapi/test_wrapper.py
similarity index 100%
rename from xos/xos_client/xosapi/test_wrapper.py
rename to lib/xos-api/xosapi/test_wrapper.py
diff --git a/xos/xos_client/xosapi/version.py b/lib/xos-api/xosapi/version.py
similarity index 100%
rename from xos/xos_client/xosapi/version.py
rename to lib/xos-api/xosapi/version.py
diff --git a/xos/xos_client/xosapi/xos_grpc_client.py b/lib/xos-api/xosapi/xos_grpc_client.py
similarity index 100%
rename from xos/xos_client/xosapi/xos_grpc_client.py
rename to lib/xos-api/xosapi/xos_grpc_client.py
diff --git a/xos/xos_client/xossh b/lib/xos-api/xossh
similarity index 100%
rename from xos/xos_client/xossh
rename to lib/xos-api/xossh
diff --git a/scripts/setup_venv.sh b/scripts/setup_venv.sh
index feab72a..61f834d 100755
--- a/scripts/setup_venv.sh
+++ b/scripts/setup_venv.sh
@@ -56,9 +56,9 @@
 echo "xos-kafka Installed"
 popd
 
-pushd "$XOS_DIR/xos/xos_client"
+pushd "$XOS_DIR/lib/xos-api"
 make
-echo "xos-client Installed"
+echo "xos-api Installed"
 popd
 
 echo "XOS dev/test virtualenv created. Run 'source ${VENVDIR}/bin/activate'."
diff --git a/unittest.cfg b/unittest.cfg
index 65eba41..5630a56 100644
--- a/unittest.cfg
+++ b/unittest.cfg
@@ -2,6 +2,7 @@
 plugins=nose2.plugins.junitxml
 
 code-directories=xos-genx
+                 xos-api
                  xos-config
                  coreapi
 
diff --git a/xos/xos_client/__init__.py b/xos/xos_client/__init__.py
deleted file mode 100644
index b0fb0b2..0000000
--- a/xos/xos_client/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.