diff --git a/barbican/charm-helpers/.bzr/README b/charm/charm-helpers/.bzr/README
similarity index 100%
rename from barbican/charm-helpers/.bzr/README
rename to charm/charm-helpers/.bzr/README
diff --git a/barbican/charm-helpers/.bzr/branch-format b/charm/charm-helpers/.bzr/branch-format
similarity index 100%
rename from barbican/charm-helpers/.bzr/branch-format
rename to charm/charm-helpers/.bzr/branch-format
diff --git a/barbican/charm-helpers/.bzr/branch/branch.conf b/charm/charm-helpers/.bzr/branch/branch.conf
similarity index 100%
rename from barbican/charm-helpers/.bzr/branch/branch.conf
rename to charm/charm-helpers/.bzr/branch/branch.conf
diff --git a/barbican/charm-helpers/.bzr/branch/format b/charm/charm-helpers/.bzr/branch/format
similarity index 100%
rename from barbican/charm-helpers/.bzr/branch/format
rename to charm/charm-helpers/.bzr/branch/format
diff --git a/barbican/charm-helpers/.bzr/branch/last-revision b/charm/charm-helpers/.bzr/branch/last-revision
similarity index 100%
rename from barbican/charm-helpers/.bzr/branch/last-revision
rename to charm/charm-helpers/.bzr/branch/last-revision
diff --git a/barbican/charm-helpers/.bzr/branch/tags b/charm/charm-helpers/.bzr/branch/tags
similarity index 100%
rename from barbican/charm-helpers/.bzr/branch/tags
rename to charm/charm-helpers/.bzr/branch/tags
diff --git a/barbican/charm-helpers/.bzr/checkout/conflicts b/charm/charm-helpers/.bzr/checkout/conflicts
similarity index 100%
rename from barbican/charm-helpers/.bzr/checkout/conflicts
rename to charm/charm-helpers/.bzr/checkout/conflicts
diff --git a/barbican/charm-helpers/.bzr/checkout/dirstate b/charm/charm-helpers/.bzr/checkout/dirstate
similarity index 100%
rename from barbican/charm-helpers/.bzr/checkout/dirstate
rename to charm/charm-helpers/.bzr/checkout/dirstate
diff --git a/barbican/charm-helpers/.bzr/checkout/format b/charm/charm-helpers/.bzr/checkout/format
similarity index 100%
rename from barbican/charm-helpers/.bzr/checkout/format
rename to charm/charm-helpers/.bzr/checkout/format
diff --git a/barbican/charm-helpers/.bzr/checkout/views b/charm/charm-helpers/.bzr/checkout/views
similarity index 100%
rename from barbican/charm-helpers/.bzr/checkout/views
rename to charm/charm-helpers/.bzr/checkout/views
diff --git a/barbican/charm-helpers/.bzr/repository/format b/charm/charm-helpers/.bzr/repository/format
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/format
rename to charm/charm-helpers/.bzr/repository/format
diff --git a/barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.cix b/charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.cix
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.cix
rename to charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.cix
diff --git a/barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.iix b/charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.iix
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.iix
rename to charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.iix
diff --git a/barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.rix b/charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.rix
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.rix
rename to charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.rix
diff --git a/barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.six b/charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.six
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.six
rename to charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.six
diff --git a/barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.tix b/charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.tix
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.tix
rename to charm/charm-helpers/.bzr/repository/indices/eaaa5a9b8e675c29fdba1c45352f31be.tix
diff --git a/barbican/charm-helpers/.bzr/repository/pack-names b/charm/charm-helpers/.bzr/repository/pack-names
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/pack-names
rename to charm/charm-helpers/.bzr/repository/pack-names
diff --git a/barbican/charm-helpers/.bzr/repository/packs/eaaa5a9b8e675c29fdba1c45352f31be.pack b/charm/charm-helpers/.bzr/repository/packs/eaaa5a9b8e675c29fdba1c45352f31be.pack
similarity index 100%
rename from barbican/charm-helpers/.bzr/repository/packs/eaaa5a9b8e675c29fdba1c45352f31be.pack
rename to charm/charm-helpers/.bzr/repository/packs/eaaa5a9b8e675c29fdba1c45352f31be.pack
diff --git a/barbican/charm-helpers/.bzrignore b/charm/charm-helpers/.bzrignore
similarity index 100%
rename from barbican/charm-helpers/.bzrignore
rename to charm/charm-helpers/.bzrignore
diff --git a/barbican/charm-helpers/HACKING b/charm/charm-helpers/HACKING
similarity index 100%
rename from barbican/charm-helpers/HACKING
rename to charm/charm-helpers/HACKING
diff --git a/barbican/charm-helpers/LICENSE.GPL b/charm/charm-helpers/LICENSE.GPL
similarity index 100%
rename from barbican/charm-helpers/LICENSE.GPL
rename to charm/charm-helpers/LICENSE.GPL
diff --git a/barbican/charm-helpers/LICENSE.LESSER b/charm/charm-helpers/LICENSE.LESSER
similarity index 100%
rename from barbican/charm-helpers/LICENSE.LESSER
rename to charm/charm-helpers/LICENSE.LESSER
diff --git a/barbican/charm-helpers/MANIFEST.in b/charm/charm-helpers/MANIFEST.in
similarity index 100%
rename from barbican/charm-helpers/MANIFEST.in
rename to charm/charm-helpers/MANIFEST.in
diff --git a/barbican/charm-helpers/Makefile b/charm/charm-helpers/Makefile
similarity index 100%
rename from barbican/charm-helpers/Makefile
rename to charm/charm-helpers/Makefile
diff --git a/barbican/charm-helpers/README.test b/charm/charm-helpers/README.test
similarity index 100%
rename from barbican/charm-helpers/README.test
rename to charm/charm-helpers/README.test
diff --git a/barbican/charm-helpers/README.txt b/charm/charm-helpers/README.txt
similarity index 100%
rename from barbican/charm-helpers/README.txt
rename to charm/charm-helpers/README.txt
diff --git a/barbican/charm-helpers/VERSION b/charm/charm-helpers/VERSION
similarity index 100%
rename from barbican/charm-helpers/VERSION
rename to charm/charm-helpers/VERSION
diff --git a/barbican/charm-helpers/bin/README b/charm/charm-helpers/bin/README
similarity index 100%
rename from barbican/charm-helpers/bin/README
rename to charm/charm-helpers/bin/README
diff --git a/barbican/charm-helpers/bin/chlp b/charm/charm-helpers/bin/chlp
similarity index 100%
rename from barbican/charm-helpers/bin/chlp
rename to charm/charm-helpers/bin/chlp
diff --git a/barbican/charm-helpers/bin/contrib/charmsupport/charmsupport b/charm/charm-helpers/bin/contrib/charmsupport/charmsupport
similarity index 100%
rename from barbican/charm-helpers/bin/contrib/charmsupport/charmsupport
rename to charm/charm-helpers/bin/contrib/charmsupport/charmsupport
diff --git a/barbican/charm-helpers/bin/contrib/saltstack/salt-call b/charm/charm-helpers/bin/contrib/saltstack/salt-call
similarity index 100%
rename from barbican/charm-helpers/bin/contrib/saltstack/salt-call
rename to charm/charm-helpers/bin/contrib/saltstack/salt-call
diff --git a/barbican/charm-helpers/charmhelpers/__init__.py b/charm/charm-helpers/charmhelpers/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/__init__.py
rename to charm/charm-helpers/charmhelpers/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/README.rst b/charm/charm-helpers/charmhelpers/cli/README.rst
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/README.rst
rename to charm/charm-helpers/charmhelpers/cli/README.rst
diff --git a/barbican/charm-helpers/charmhelpers/cli/__init__.py b/charm/charm-helpers/charmhelpers/cli/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/__init__.py
rename to charm/charm-helpers/charmhelpers/cli/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/benchmark.py b/charm/charm-helpers/charmhelpers/cli/benchmark.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/benchmark.py
rename to charm/charm-helpers/charmhelpers/cli/benchmark.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/commands.py b/charm/charm-helpers/charmhelpers/cli/commands.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/commands.py
rename to charm/charm-helpers/charmhelpers/cli/commands.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/hookenv.py b/charm/charm-helpers/charmhelpers/cli/hookenv.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/hookenv.py
rename to charm/charm-helpers/charmhelpers/cli/hookenv.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/host.py b/charm/charm-helpers/charmhelpers/cli/host.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/host.py
rename to charm/charm-helpers/charmhelpers/cli/host.py
diff --git a/barbican/charm-helpers/charmhelpers/cli/unitdata.py b/charm/charm-helpers/charmhelpers/cli/unitdata.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/cli/unitdata.py
rename to charm/charm-helpers/charmhelpers/cli/unitdata.py
diff --git a/barbican/charm-helpers/charmhelpers/context.py b/charm/charm-helpers/charmhelpers/context.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/context.py
rename to charm/charm-helpers/charmhelpers/context.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/__init__.py b/charm/charm-helpers/charmhelpers/contrib/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/amulet/__init__.py b/charm/charm-helpers/charmhelpers/contrib/amulet/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/amulet/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/amulet/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/amulet/deployment.py b/charm/charm-helpers/charmhelpers/contrib/amulet/deployment.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/amulet/deployment.py
rename to charm/charm-helpers/charmhelpers/contrib/amulet/deployment.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/amulet/utils.py b/charm/charm-helpers/charmhelpers/contrib/amulet/utils.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/amulet/utils.py
rename to charm/charm-helpers/charmhelpers/contrib/amulet/utils.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/ansible/__init__.py b/charm/charm-helpers/charmhelpers/contrib/ansible/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/ansible/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/ansible/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/benchmark/__init__.py b/charm/charm-helpers/charmhelpers/contrib/benchmark/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/benchmark/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/benchmark/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT b/charm/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT
rename to charm/charm-helpers/charmhelpers/contrib/charmhelpers/IMPORT
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py b/charm/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/charmhelpers/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT b/charm/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT
rename to charm/charm-helpers/charmhelpers/contrib/charmsupport/IMPORT
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmsupport/__init__.py b/charm/charm-helpers/charmhelpers/contrib/charmsupport/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmsupport/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/charmsupport/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py b/charm/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py
rename to charm/charm-helpers/charmhelpers/contrib/charmsupport/nrpe.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py b/charm/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py
rename to charm/charm-helpers/charmhelpers/contrib/charmsupport/volumes.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/database/__init__.py b/charm/charm-helpers/charmhelpers/contrib/database/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/database/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/database/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/database/mysql.py b/charm/charm-helpers/charmhelpers/contrib/database/mysql.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/database/mysql.py
rename to charm/charm-helpers/charmhelpers/contrib/database/mysql.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/hahelpers/__init__.py b/charm/charm-helpers/charmhelpers/contrib/hahelpers/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/hahelpers/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/hahelpers/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/hahelpers/apache.py b/charm/charm-helpers/charmhelpers/contrib/hahelpers/apache.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/hahelpers/apache.py
rename to charm/charm-helpers/charmhelpers/contrib/hahelpers/apache.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py b/charm/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py
rename to charm/charm-helpers/charmhelpers/contrib/hahelpers/cluster.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/mellanox/__init__.py b/charm/charm-helpers/charmhelpers/contrib/mellanox/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/mellanox/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/mellanox/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/mellanox/infiniband.py b/charm/charm-helpers/charmhelpers/contrib/mellanox/infiniband.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/mellanox/infiniband.py
rename to charm/charm-helpers/charmhelpers/contrib/mellanox/infiniband.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/network/__init__.py b/charm/charm-helpers/charmhelpers/contrib/network/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/network/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/network/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/network/ip.py b/charm/charm-helpers/charmhelpers/contrib/network/ip.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/network/ip.py
rename to charm/charm-helpers/charmhelpers/contrib/network/ip.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py b/charm/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/network/ovs/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/network/ufw.py b/charm/charm-helpers/charmhelpers/contrib/network/ufw.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/network/ufw.py
rename to charm/charm-helpers/charmhelpers/contrib/network/ufw.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/__init__.py b/charm/charm-helpers/charmhelpers/contrib/openstack/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/alternatives.py b/charm/charm-helpers/charmhelpers/contrib/openstack/alternatives.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/alternatives.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/alternatives.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/__init__.py b/charm/charm-helpers/charmhelpers/contrib/openstack/amulet/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/amulet/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/deployment.py b/charm/charm-helpers/charmhelpers/contrib/openstack/amulet/deployment.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/deployment.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/amulet/deployment.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/utils.py b/charm/charm-helpers/charmhelpers/contrib/openstack/amulet/utils.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/amulet/utils.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/amulet/utils.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/context.py b/charm/charm-helpers/charmhelpers/contrib/openstack/context.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/context.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/context.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/files/__init__.py b/charm/charm-helpers/charmhelpers/contrib/openstack/files/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/files/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/files/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy.sh b/charm/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy.sh
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy.sh
rename to charm/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy.sh
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh b/charm/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh
rename to charm/charm-helpers/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/ip.py b/charm/charm-helpers/charmhelpers/contrib/openstack/ip.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/ip.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/ip.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/neutron.py b/charm/charm-helpers/charmhelpers/contrib/openstack/neutron.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/neutron.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/neutron.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/ceph.conf
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/git.upstart b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/git.upstart
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/git.upstart
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/git.upstart
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/haproxy.cfg
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-keystone-authtoken b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-keystone-authtoken
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-keystone-authtoken
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-keystone-authtoken
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-rabbitmq-oslo
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-zeromq b/charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-zeromq
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templates/section-zeromq
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templates/section-zeromq
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/templating.py b/charm/charm-helpers/charmhelpers/contrib/openstack/templating.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/templating.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/templating.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/openstack/utils.py b/charm/charm-helpers/charmhelpers/contrib/openstack/utils.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/openstack/utils.py
rename to charm/charm-helpers/charmhelpers/contrib/openstack/utils.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/peerstorage/__init__.py b/charm/charm-helpers/charmhelpers/contrib/peerstorage/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/peerstorage/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/peerstorage/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/python/__init__.py b/charm/charm-helpers/charmhelpers/contrib/python/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/python/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/python/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/python/debug.py b/charm/charm-helpers/charmhelpers/contrib/python/debug.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/python/debug.py
rename to charm/charm-helpers/charmhelpers/contrib/python/debug.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/python/packages.py b/charm/charm-helpers/charmhelpers/contrib/python/packages.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/python/packages.py
rename to charm/charm-helpers/charmhelpers/contrib/python/packages.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/python/rpdb.py b/charm/charm-helpers/charmhelpers/contrib/python/rpdb.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/python/rpdb.py
rename to charm/charm-helpers/charmhelpers/contrib/python/rpdb.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/python/version.py b/charm/charm-helpers/charmhelpers/contrib/python/version.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/python/version.py
rename to charm/charm-helpers/charmhelpers/contrib/python/version.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/saltstack/__init__.py b/charm/charm-helpers/charmhelpers/contrib/saltstack/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/saltstack/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/saltstack/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/ssl/__init__.py b/charm/charm-helpers/charmhelpers/contrib/ssl/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/ssl/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/ssl/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/ssl/service.py b/charm/charm-helpers/charmhelpers/contrib/ssl/service.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/ssl/service.py
rename to charm/charm-helpers/charmhelpers/contrib/ssl/service.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/__init__.py b/charm/charm-helpers/charmhelpers/contrib/storage/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/linux/__init__.py b/charm/charm-helpers/charmhelpers/contrib/storage/linux/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/linux/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/linux/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/linux/ceph.py b/charm/charm-helpers/charmhelpers/contrib/storage/linux/ceph.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/linux/ceph.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/linux/ceph.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py b/charm/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/linux/loopback.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py b/charm/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/linux/lvm.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/storage/linux/utils.py b/charm/charm-helpers/charmhelpers/contrib/storage/linux/utils.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/storage/linux/utils.py
rename to charm/charm-helpers/charmhelpers/contrib/storage/linux/utils.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/templating/__init__.py b/charm/charm-helpers/charmhelpers/contrib/templating/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/templating/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/templating/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/templating/contexts.py b/charm/charm-helpers/charmhelpers/contrib/templating/contexts.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/templating/contexts.py
rename to charm/charm-helpers/charmhelpers/contrib/templating/contexts.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/templating/jinja.py b/charm/charm-helpers/charmhelpers/contrib/templating/jinja.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/templating/jinja.py
rename to charm/charm-helpers/charmhelpers/contrib/templating/jinja.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/templating/pyformat.py b/charm/charm-helpers/charmhelpers/contrib/templating/pyformat.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/templating/pyformat.py
rename to charm/charm-helpers/charmhelpers/contrib/templating/pyformat.py
diff --git a/barbican/charm-helpers/charmhelpers/contrib/unison/__init__.py b/charm/charm-helpers/charmhelpers/contrib/unison/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/contrib/unison/__init__.py
rename to charm/charm-helpers/charmhelpers/contrib/unison/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/coordinator.py b/charm/charm-helpers/charmhelpers/coordinator.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/coordinator.py
rename to charm/charm-helpers/charmhelpers/coordinator.py
diff --git a/barbican/charm-helpers/charmhelpers/core/__init__.py b/charm/charm-helpers/charmhelpers/core/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/__init__.py
rename to charm/charm-helpers/charmhelpers/core/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/core/decorators.py b/charm/charm-helpers/charmhelpers/core/decorators.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/decorators.py
rename to charm/charm-helpers/charmhelpers/core/decorators.py
diff --git a/barbican/charm-helpers/charmhelpers/core/files.py b/charm/charm-helpers/charmhelpers/core/files.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/files.py
rename to charm/charm-helpers/charmhelpers/core/files.py
diff --git a/barbican/charm-helpers/charmhelpers/core/fstab.py b/charm/charm-helpers/charmhelpers/core/fstab.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/fstab.py
rename to charm/charm-helpers/charmhelpers/core/fstab.py
diff --git a/barbican/charm-helpers/charmhelpers/core/hookenv.py b/charm/charm-helpers/charmhelpers/core/hookenv.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/hookenv.py
rename to charm/charm-helpers/charmhelpers/core/hookenv.py
diff --git a/barbican/charm-helpers/charmhelpers/core/host.py b/charm/charm-helpers/charmhelpers/core/host.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/host.py
rename to charm/charm-helpers/charmhelpers/core/host.py
diff --git a/barbican/charm-helpers/charmhelpers/core/hugepage.py b/charm/charm-helpers/charmhelpers/core/hugepage.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/hugepage.py
rename to charm/charm-helpers/charmhelpers/core/hugepage.py
diff --git a/barbican/charm-helpers/charmhelpers/core/kernel.py b/charm/charm-helpers/charmhelpers/core/kernel.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/kernel.py
rename to charm/charm-helpers/charmhelpers/core/kernel.py
diff --git a/barbican/charm-helpers/charmhelpers/core/services/__init__.py b/charm/charm-helpers/charmhelpers/core/services/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/services/__init__.py
rename to charm/charm-helpers/charmhelpers/core/services/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/core/services/base.py b/charm/charm-helpers/charmhelpers/core/services/base.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/services/base.py
rename to charm/charm-helpers/charmhelpers/core/services/base.py
diff --git a/barbican/charm-helpers/charmhelpers/core/services/helpers.py b/charm/charm-helpers/charmhelpers/core/services/helpers.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/services/helpers.py
rename to charm/charm-helpers/charmhelpers/core/services/helpers.py
diff --git a/barbican/charm-helpers/charmhelpers/core/strutils.py b/charm/charm-helpers/charmhelpers/core/strutils.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/strutils.py
rename to charm/charm-helpers/charmhelpers/core/strutils.py
diff --git a/barbican/charm-helpers/charmhelpers/core/sysctl.py b/charm/charm-helpers/charmhelpers/core/sysctl.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/sysctl.py
rename to charm/charm-helpers/charmhelpers/core/sysctl.py
diff --git a/barbican/charm-helpers/charmhelpers/core/templating.py b/charm/charm-helpers/charmhelpers/core/templating.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/templating.py
rename to charm/charm-helpers/charmhelpers/core/templating.py
diff --git a/barbican/charm-helpers/charmhelpers/core/unitdata.py b/charm/charm-helpers/charmhelpers/core/unitdata.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/core/unitdata.py
rename to charm/charm-helpers/charmhelpers/core/unitdata.py
diff --git a/barbican/charm-helpers/charmhelpers/fetch/__init__.py b/charm/charm-helpers/charmhelpers/fetch/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/fetch/__init__.py
rename to charm/charm-helpers/charmhelpers/fetch/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/fetch/archiveurl.py b/charm/charm-helpers/charmhelpers/fetch/archiveurl.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/fetch/archiveurl.py
rename to charm/charm-helpers/charmhelpers/fetch/archiveurl.py
diff --git a/barbican/charm-helpers/charmhelpers/fetch/bzrurl.py b/charm/charm-helpers/charmhelpers/fetch/bzrurl.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/fetch/bzrurl.py
rename to charm/charm-helpers/charmhelpers/fetch/bzrurl.py
diff --git a/barbican/charm-helpers/charmhelpers/fetch/giturl.py b/charm/charm-helpers/charmhelpers/fetch/giturl.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/fetch/giturl.py
rename to charm/charm-helpers/charmhelpers/fetch/giturl.py
diff --git a/barbican/charm-helpers/charmhelpers/payload/__init__.py b/charm/charm-helpers/charmhelpers/payload/__init__.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/payload/__init__.py
rename to charm/charm-helpers/charmhelpers/payload/__init__.py
diff --git a/barbican/charm-helpers/charmhelpers/payload/archive.py b/charm/charm-helpers/charmhelpers/payload/archive.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/payload/archive.py
rename to charm/charm-helpers/charmhelpers/payload/archive.py
diff --git a/barbican/charm-helpers/charmhelpers/payload/execd.py b/charm/charm-helpers/charmhelpers/payload/execd.py
similarity index 100%
rename from barbican/charm-helpers/charmhelpers/payload/execd.py
rename to charm/charm-helpers/charmhelpers/payload/execd.py
diff --git a/barbican/charm-helpers/debian/compat b/charm/charm-helpers/debian/compat
similarity index 100%
rename from barbican/charm-helpers/debian/compat
rename to charm/charm-helpers/debian/compat
diff --git a/barbican/charm-helpers/debian/control b/charm/charm-helpers/debian/control
similarity index 100%
rename from barbican/charm-helpers/debian/control
rename to charm/charm-helpers/debian/control
diff --git a/barbican/charm-helpers/debian/rules b/charm/charm-helpers/debian/rules
similarity index 100%
rename from barbican/charm-helpers/debian/rules
rename to charm/charm-helpers/debian/rules
diff --git a/barbican/charm-helpers/debian/source/format b/charm/charm-helpers/debian/source/format
similarity index 100%
rename from barbican/charm-helpers/debian/source/format
rename to charm/charm-helpers/debian/source/format
diff --git a/barbican/charm-helpers/docs/Makefile b/charm/charm-helpers/docs/Makefile
similarity index 100%
rename from barbican/charm-helpers/docs/Makefile
rename to charm/charm-helpers/docs/Makefile
diff --git a/barbican/charm-helpers/docs/_extensions/automembersummary.py b/charm/charm-helpers/docs/_extensions/automembersummary.py
similarity index 100%
rename from barbican/charm-helpers/docs/_extensions/automembersummary.py
rename to charm/charm-helpers/docs/_extensions/automembersummary.py
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/__init__.py b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/__init__.py
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/__init__.py
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/__init__.py
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/breadcrumbs.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/breadcrumbs.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/breadcrumbs.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/breadcrumbs.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/footer.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/footer.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/footer.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/footer.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/layout.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/layout.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/layout.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/layout.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/layout_old.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/layout_old.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/layout_old.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/layout_old.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/search.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/search.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/search.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/search.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/searchbox.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/searchbox.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/searchbox.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/searchbox.html
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/theme.css b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/theme.css
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/theme.css
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/css/theme.css
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/js/theme.js b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/js/theme.js
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/static/js/theme.js
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/static/js/theme.js
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/theme.conf b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/theme.conf
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/theme.conf
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/theme.conf
diff --git a/barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/versions.html b/charm/charm-helpers/docs/_themes/sphinx_rtd_theme/versions.html
similarity index 100%
rename from barbican/charm-helpers/docs/_themes/sphinx_rtd_theme/versions.html
rename to charm/charm-helpers/docs/_themes/sphinx_rtd_theme/versions.html
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.cli.rst b/charm/charm-helpers/docs/api/charmhelpers.cli.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.cli.rst
rename to charm/charm-helpers/docs/api/charmhelpers.cli.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.ansible.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.ansible.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.ansible.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.ansible.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.charmhelpers.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.charmhelpers.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.charmhelpers.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.charmhelpers.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.charmsupport.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.charmsupport.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.charmsupport.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.charmsupport.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.hahelpers.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.hahelpers.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.hahelpers.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.hahelpers.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.network.ovs.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.network.ovs.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.network.ovs.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.network.ovs.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.network.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.network.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.network.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.network.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.openstack.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.openstack.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.openstack.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.openstack.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.openstack.templates.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.openstack.templates.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.openstack.templates.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.openstack.templates.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.peerstorage.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.peerstorage.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.peerstorage.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.peerstorage.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.python.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.python.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.python.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.python.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.saltstack.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.saltstack.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.saltstack.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.saltstack.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.ssl.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.ssl.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.ssl.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.ssl.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.storage.linux.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.storage.linux.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.storage.linux.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.storage.linux.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.storage.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.storage.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.storage.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.storage.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.templating.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.templating.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.templating.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.templating.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.contrib.unison.rst b/charm/charm-helpers/docs/api/charmhelpers.contrib.unison.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.contrib.unison.rst
rename to charm/charm-helpers/docs/api/charmhelpers.contrib.unison.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.coordinator.rst b/charm/charm-helpers/docs/api/charmhelpers.coordinator.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.coordinator.rst
rename to charm/charm-helpers/docs/api/charmhelpers.coordinator.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.decorators.rst b/charm/charm-helpers/docs/api/charmhelpers.core.decorators.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.decorators.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.decorators.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.fstab.rst b/charm/charm-helpers/docs/api/charmhelpers.core.fstab.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.fstab.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.fstab.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.hookenv.rst b/charm/charm-helpers/docs/api/charmhelpers.core.hookenv.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.hookenv.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.hookenv.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.host.rst b/charm/charm-helpers/docs/api/charmhelpers.core.host.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.host.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.host.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.rst b/charm/charm-helpers/docs/api/charmhelpers.core.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.services.base.rst b/charm/charm-helpers/docs/api/charmhelpers.core.services.base.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.services.base.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.services.base.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.services.helpers.rst b/charm/charm-helpers/docs/api/charmhelpers.core.services.helpers.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.services.helpers.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.services.helpers.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.services.rst b/charm/charm-helpers/docs/api/charmhelpers.core.services.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.services.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.services.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.strutils.rst b/charm/charm-helpers/docs/api/charmhelpers.core.strutils.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.strutils.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.strutils.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.sysctl.rst b/charm/charm-helpers/docs/api/charmhelpers.core.sysctl.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.sysctl.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.sysctl.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.templating.rst b/charm/charm-helpers/docs/api/charmhelpers.core.templating.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.templating.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.templating.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.core.unitdata.rst b/charm/charm-helpers/docs/api/charmhelpers.core.unitdata.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.core.unitdata.rst
rename to charm/charm-helpers/docs/api/charmhelpers.core.unitdata.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.fetch.rst b/charm/charm-helpers/docs/api/charmhelpers.fetch.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.fetch.rst
rename to charm/charm-helpers/docs/api/charmhelpers.fetch.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.payload.rst b/charm/charm-helpers/docs/api/charmhelpers.payload.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.payload.rst
rename to charm/charm-helpers/docs/api/charmhelpers.payload.rst
diff --git a/barbican/charm-helpers/docs/api/charmhelpers.rst b/charm/charm-helpers/docs/api/charmhelpers.rst
similarity index 100%
rename from barbican/charm-helpers/docs/api/charmhelpers.rst
rename to charm/charm-helpers/docs/api/charmhelpers.rst
diff --git a/barbican/charm-helpers/docs/conf.py b/charm/charm-helpers/docs/conf.py
similarity index 100%
rename from barbican/charm-helpers/docs/conf.py
rename to charm/charm-helpers/docs/conf.py
diff --git a/barbican/charm-helpers/docs/contributing.rst b/charm/charm-helpers/docs/contributing.rst
similarity index 100%
rename from barbican/charm-helpers/docs/contributing.rst
rename to charm/charm-helpers/docs/contributing.rst
diff --git a/barbican/charm-helpers/docs/example-index.rst b/charm/charm-helpers/docs/example-index.rst
similarity index 100%
rename from barbican/charm-helpers/docs/example-index.rst
rename to charm/charm-helpers/docs/example-index.rst
diff --git a/barbican/charm-helpers/docs/examples/config.rst b/charm/charm-helpers/docs/examples/config.rst
similarity index 100%
rename from barbican/charm-helpers/docs/examples/config.rst
rename to charm/charm-helpers/docs/examples/config.rst
diff --git a/barbican/charm-helpers/docs/examples/services.rst b/charm/charm-helpers/docs/examples/services.rst
similarity index 100%
rename from barbican/charm-helpers/docs/examples/services.rst
rename to charm/charm-helpers/docs/examples/services.rst
diff --git a/barbican/charm-helpers/docs/getting-started.rst b/charm/charm-helpers/docs/getting-started.rst
similarity index 100%
rename from barbican/charm-helpers/docs/getting-started.rst
rename to charm/charm-helpers/docs/getting-started.rst
diff --git a/barbican/charm-helpers/docs/index.rst b/charm/charm-helpers/docs/index.rst
similarity index 100%
rename from barbican/charm-helpers/docs/index.rst
rename to charm/charm-helpers/docs/index.rst
diff --git a/barbican/charm-helpers/scripts/README b/charm/charm-helpers/scripts/README
similarity index 100%
rename from barbican/charm-helpers/scripts/README
rename to charm/charm-helpers/scripts/README
diff --git a/barbican/charm-helpers/scripts/update-revno b/charm/charm-helpers/scripts/update-revno
similarity index 100%
rename from barbican/charm-helpers/scripts/update-revno
rename to charm/charm-helpers/scripts/update-revno
diff --git a/barbican/charm-helpers/setup.cfg b/charm/charm-helpers/setup.cfg
similarity index 100%
rename from barbican/charm-helpers/setup.cfg
rename to charm/charm-helpers/setup.cfg
diff --git a/barbican/charm-helpers/setup.py b/charm/charm-helpers/setup.py
similarity index 100%
rename from barbican/charm-helpers/setup.py
rename to charm/charm-helpers/setup.py
diff --git a/barbican/charm-helpers/tarmac_tests.sh b/charm/charm-helpers/tarmac_tests.sh
similarity index 100%
rename from barbican/charm-helpers/tarmac_tests.sh
rename to charm/charm-helpers/tarmac_tests.sh
diff --git a/barbican/charm-helpers/test_requirements.txt b/charm/charm-helpers/test_requirements.txt
similarity index 100%
rename from barbican/charm-helpers/test_requirements.txt
rename to charm/charm-helpers/test_requirements.txt
diff --git a/barbican/charm-helpers/tests/__init__.py b/charm/charm-helpers/tests/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/__init__.py
rename to charm/charm-helpers/tests/__init__.py
diff --git a/barbican/charm-helpers/tests/cli/__init__.py b/charm/charm-helpers/tests/cli/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/cli/__init__.py
rename to charm/charm-helpers/tests/cli/__init__.py
diff --git a/barbican/charm-helpers/tests/cli/test_cmdline.py b/charm/charm-helpers/tests/cli/test_cmdline.py
similarity index 100%
rename from barbican/charm-helpers/tests/cli/test_cmdline.py
rename to charm/charm-helpers/tests/cli/test_cmdline.py
diff --git a/barbican/charm-helpers/tests/cli/test_function_signature_analysis.py b/charm/charm-helpers/tests/cli/test_function_signature_analysis.py
similarity index 100%
rename from barbican/charm-helpers/tests/cli/test_function_signature_analysis.py
rename to charm/charm-helpers/tests/cli/test_function_signature_analysis.py
diff --git a/barbican/charm-helpers/tests/context/__init__.py b/charm/charm-helpers/tests/context/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/context/__init__.py
rename to charm/charm-helpers/tests/context/__init__.py
diff --git a/barbican/charm-helpers/tests/context/test_context.py b/charm/charm-helpers/tests/context/test_context.py
similarity index 100%
rename from barbican/charm-helpers/tests/context/test_context.py
rename to charm/charm-helpers/tests/context/test_context.py
diff --git a/barbican/charm-helpers/tests/contrib/__init__.py b/charm/charm-helpers/tests/contrib/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/__init__.py
rename to charm/charm-helpers/tests/contrib/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/amulet/__init__.py b/charm/charm-helpers/tests/contrib/amulet/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/amulet/__init__.py
rename to charm/charm-helpers/tests/contrib/amulet/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/amulet/test_utils.py b/charm/charm-helpers/tests/contrib/amulet/test_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/amulet/test_utils.py
rename to charm/charm-helpers/tests/contrib/amulet/test_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/ansible/__init__.py b/charm/charm-helpers/tests/contrib/ansible/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/ansible/__init__.py
rename to charm/charm-helpers/tests/contrib/ansible/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/ansible/test_ansible.py b/charm/charm-helpers/tests/contrib/ansible/test_ansible.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/ansible/test_ansible.py
rename to charm/charm-helpers/tests/contrib/ansible/test_ansible.py
diff --git a/barbican/charm-helpers/tests/contrib/benchmark/__init__.py b/charm/charm-helpers/tests/contrib/benchmark/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/benchmark/__init__.py
rename to charm/charm-helpers/tests/contrib/benchmark/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/benchmark/test_benchmark.py b/charm/charm-helpers/tests/contrib/benchmark/test_benchmark.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/benchmark/test_benchmark.py
rename to charm/charm-helpers/tests/contrib/benchmark/test_benchmark.py
diff --git a/barbican/charm-helpers/tests/contrib/charmhelpers/__init__.py b/charm/charm-helpers/tests/contrib/charmhelpers/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/charmhelpers/__init__.py
rename to charm/charm-helpers/tests/contrib/charmhelpers/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py b/charm/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py
rename to charm/charm-helpers/tests/contrib/charmhelpers/test_charmhelpers.py
diff --git a/barbican/charm-helpers/tests/contrib/charmsupport/__init__.py b/charm/charm-helpers/tests/contrib/charmsupport/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/charmsupport/__init__.py
rename to charm/charm-helpers/tests/contrib/charmsupport/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/charmsupport/test_nrpe.py b/charm/charm-helpers/tests/contrib/charmsupport/test_nrpe.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/charmsupport/test_nrpe.py
rename to charm/charm-helpers/tests/contrib/charmsupport/test_nrpe.py
diff --git a/barbican/charm-helpers/tests/contrib/database/README b/charm/charm-helpers/tests/contrib/database/README
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/database/README
rename to charm/charm-helpers/tests/contrib/database/README
diff --git a/barbican/charm-helpers/tests/contrib/database/test_mysql.py b/charm/charm-helpers/tests/contrib/database/test_mysql.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/database/test_mysql.py
rename to charm/charm-helpers/tests/contrib/database/test_mysql.py
diff --git a/barbican/charm-helpers/tests/contrib/hahelpers/__init__.py b/charm/charm-helpers/tests/contrib/hahelpers/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/hahelpers/__init__.py
rename to charm/charm-helpers/tests/contrib/hahelpers/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py b/charm/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py
rename to charm/charm-helpers/tests/contrib/hahelpers/test_apache_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py b/charm/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py
rename to charm/charm-helpers/tests/contrib/hahelpers/test_cluster_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/mellanox/test_infiniband.py b/charm/charm-helpers/tests/contrib/mellanox/test_infiniband.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/mellanox/test_infiniband.py
rename to charm/charm-helpers/tests/contrib/mellanox/test_infiniband.py
diff --git a/barbican/charm-helpers/tests/contrib/network/__init__.py b/charm/charm-helpers/tests/contrib/network/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/network/__init__.py
rename to charm/charm-helpers/tests/contrib/network/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/network/test_ip.py b/charm/charm-helpers/tests/contrib/network/test_ip.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/network/test_ip.py
rename to charm/charm-helpers/tests/contrib/network/test_ip.py
diff --git a/barbican/charm-helpers/tests/contrib/network/test_ovs.py b/charm/charm-helpers/tests/contrib/network/test_ovs.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/network/test_ovs.py
rename to charm/charm-helpers/tests/contrib/network/test_ovs.py
diff --git a/barbican/charm-helpers/tests/contrib/network/test_ufw.py b/charm/charm-helpers/tests/contrib/network/test_ufw.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/network/test_ufw.py
rename to charm/charm-helpers/tests/contrib/network/test_ufw.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/__init__.py b/charm/charm-helpers/tests/contrib/openstack/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/__init__.py
rename to charm/charm-helpers/tests/contrib/openstack/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_alternatives.py b/charm/charm-helpers/tests/contrib/openstack/test_alternatives.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_alternatives.py
rename to charm/charm-helpers/tests/contrib/openstack/test_alternatives.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_ip.py b/charm/charm-helpers/tests/contrib/openstack/test_ip.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_ip.py
rename to charm/charm-helpers/tests/contrib/openstack/test_ip.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_neutron_utils.py b/charm/charm-helpers/tests/contrib/openstack/test_neutron_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_neutron_utils.py
rename to charm/charm-helpers/tests/contrib/openstack/test_neutron_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_openstack_utils.py b/charm/charm-helpers/tests/contrib/openstack/test_openstack_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_openstack_utils.py
rename to charm/charm-helpers/tests/contrib/openstack/test_openstack_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_os_contexts.py b/charm/charm-helpers/tests/contrib/openstack/test_os_contexts.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_os_contexts.py
rename to charm/charm-helpers/tests/contrib/openstack/test_os_contexts.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_os_templating.py b/charm/charm-helpers/tests/contrib/openstack/test_os_templating.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_os_templating.py
rename to charm/charm-helpers/tests/contrib/openstack/test_os_templating.py
diff --git a/barbican/charm-helpers/tests/contrib/openstack/test_os_utils.py b/charm/charm-helpers/tests/contrib/openstack/test_os_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/openstack/test_os_utils.py
rename to charm/charm-helpers/tests/contrib/openstack/test_os_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/peerstorage/__init__.py b/charm/charm-helpers/tests/contrib/peerstorage/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/peerstorage/__init__.py
rename to charm/charm-helpers/tests/contrib/peerstorage/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/peerstorage/test_peerstorage.py b/charm/charm-helpers/tests/contrib/peerstorage/test_peerstorage.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/peerstorage/test_peerstorage.py
rename to charm/charm-helpers/tests/contrib/peerstorage/test_peerstorage.py
diff --git a/barbican/charm-helpers/tests/contrib/python/__init__.py b/charm/charm-helpers/tests/contrib/python/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/python/__init__.py
rename to charm/charm-helpers/tests/contrib/python/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/python/test_debug.py b/charm/charm-helpers/tests/contrib/python/test_debug.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/python/test_debug.py
rename to charm/charm-helpers/tests/contrib/python/test_debug.py
diff --git a/barbican/charm-helpers/tests/contrib/python/test_packages.py b/charm/charm-helpers/tests/contrib/python/test_packages.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/python/test_packages.py
rename to charm/charm-helpers/tests/contrib/python/test_packages.py
diff --git a/barbican/charm-helpers/tests/contrib/python/test_version.py b/charm/charm-helpers/tests/contrib/python/test_version.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/python/test_version.py
rename to charm/charm-helpers/tests/contrib/python/test_version.py
diff --git a/barbican/charm-helpers/tests/contrib/saltstack/__init__.py b/charm/charm-helpers/tests/contrib/saltstack/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/saltstack/__init__.py
rename to charm/charm-helpers/tests/contrib/saltstack/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/saltstack/test_saltstates.py b/charm/charm-helpers/tests/contrib/saltstack/test_saltstates.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/saltstack/test_saltstates.py
rename to charm/charm-helpers/tests/contrib/saltstack/test_saltstates.py
diff --git a/barbican/charm-helpers/tests/contrib/ssl/__init__.py b/charm/charm-helpers/tests/contrib/ssl/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/ssl/__init__.py
rename to charm/charm-helpers/tests/contrib/ssl/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/ssl/test_service.py b/charm/charm-helpers/tests/contrib/ssl/test_service.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/ssl/test_service.py
rename to charm/charm-helpers/tests/contrib/ssl/test_service.py
diff --git a/barbican/charm-helpers/tests/contrib/ssl/test_ssl.py b/charm/charm-helpers/tests/contrib/ssl/test_ssl.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/ssl/test_ssl.py
rename to charm/charm-helpers/tests/contrib/ssl/test_ssl.py
diff --git a/barbican/charm-helpers/tests/contrib/storage/__init__.py b/charm/charm-helpers/tests/contrib/storage/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/storage/__init__.py
rename to charm/charm-helpers/tests/contrib/storage/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/storage/test_linux_ceph.py b/charm/charm-helpers/tests/contrib/storage/test_linux_ceph.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/storage/test_linux_ceph.py
rename to charm/charm-helpers/tests/contrib/storage/test_linux_ceph.py
diff --git a/barbican/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py b/charm/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py
rename to charm/charm-helpers/tests/contrib/storage/test_linux_storage_loopback.py
diff --git a/barbican/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py b/charm/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py
rename to charm/charm-helpers/tests/contrib/storage/test_linux_storage_lvm.py
diff --git a/barbican/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py b/charm/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py
rename to charm/charm-helpers/tests/contrib/storage/test_linux_storage_utils.py
diff --git a/barbican/charm-helpers/tests/contrib/templating/__init__.py b/charm/charm-helpers/tests/contrib/templating/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/templating/__init__.py
rename to charm/charm-helpers/tests/contrib/templating/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/templating/test_contexts.py b/charm/charm-helpers/tests/contrib/templating/test_contexts.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/templating/test_contexts.py
rename to charm/charm-helpers/tests/contrib/templating/test_contexts.py
diff --git a/barbican/charm-helpers/tests/contrib/templating/test_jinja.py b/charm/charm-helpers/tests/contrib/templating/test_jinja.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/templating/test_jinja.py
rename to charm/charm-helpers/tests/contrib/templating/test_jinja.py
diff --git a/barbican/charm-helpers/tests/contrib/templating/test_pyformat.py b/charm/charm-helpers/tests/contrib/templating/test_pyformat.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/templating/test_pyformat.py
rename to charm/charm-helpers/tests/contrib/templating/test_pyformat.py
diff --git a/barbican/charm-helpers/tests/contrib/unison/__init__.py b/charm/charm-helpers/tests/contrib/unison/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/unison/__init__.py
rename to charm/charm-helpers/tests/contrib/unison/__init__.py
diff --git a/barbican/charm-helpers/tests/contrib/unison/test_unison.py b/charm/charm-helpers/tests/contrib/unison/test_unison.py
similarity index 100%
rename from barbican/charm-helpers/tests/contrib/unison/test_unison.py
rename to charm/charm-helpers/tests/contrib/unison/test_unison.py
diff --git a/barbican/charm-helpers/tests/coordinator/__init__.py b/charm/charm-helpers/tests/coordinator/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/coordinator/__init__.py
rename to charm/charm-helpers/tests/coordinator/__init__.py
diff --git a/barbican/charm-helpers/tests/coordinator/test_coordinator.py b/charm/charm-helpers/tests/coordinator/test_coordinator.py
similarity index 100%
rename from barbican/charm-helpers/tests/coordinator/test_coordinator.py
rename to charm/charm-helpers/tests/coordinator/test_coordinator.py
diff --git a/barbican/charm-helpers/tests/core/__init__.py b/charm/charm-helpers/tests/core/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/__init__.py
rename to charm/charm-helpers/tests/core/__init__.py
diff --git a/barbican/charm-helpers/tests/core/templates/cloud_controller_ng.yml b/charm/charm-helpers/tests/core/templates/cloud_controller_ng.yml
similarity index 100%
rename from barbican/charm-helpers/tests/core/templates/cloud_controller_ng.yml
rename to charm/charm-helpers/tests/core/templates/cloud_controller_ng.yml
diff --git a/barbican/charm-helpers/tests/core/templates/fake_cc.yml b/charm/charm-helpers/tests/core/templates/fake_cc.yml
similarity index 100%
rename from barbican/charm-helpers/tests/core/templates/fake_cc.yml
rename to charm/charm-helpers/tests/core/templates/fake_cc.yml
diff --git a/barbican/charm-helpers/tests/core/templates/nginx.conf b/charm/charm-helpers/tests/core/templates/nginx.conf
similarity index 100%
rename from barbican/charm-helpers/tests/core/templates/nginx.conf
rename to charm/charm-helpers/tests/core/templates/nginx.conf
diff --git a/barbican/charm-helpers/tests/core/templates/test.conf b/charm/charm-helpers/tests/core/templates/test.conf
similarity index 100%
rename from barbican/charm-helpers/tests/core/templates/test.conf
rename to charm/charm-helpers/tests/core/templates/test.conf
diff --git a/barbican/charm-helpers/tests/core/test_files.py b/charm/charm-helpers/tests/core/test_files.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_files.py
rename to charm/charm-helpers/tests/core/test_files.py
diff --git a/barbican/charm-helpers/tests/core/test_fstab.py b/charm/charm-helpers/tests/core/test_fstab.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_fstab.py
rename to charm/charm-helpers/tests/core/test_fstab.py
diff --git a/barbican/charm-helpers/tests/core/test_hookenv.py b/charm/charm-helpers/tests/core/test_hookenv.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_hookenv.py
rename to charm/charm-helpers/tests/core/test_hookenv.py
diff --git a/barbican/charm-helpers/tests/core/test_host.py b/charm/charm-helpers/tests/core/test_host.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_host.py
rename to charm/charm-helpers/tests/core/test_host.py
diff --git a/barbican/charm-helpers/tests/core/test_hugepage.py b/charm/charm-helpers/tests/core/test_hugepage.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_hugepage.py
rename to charm/charm-helpers/tests/core/test_hugepage.py
diff --git a/barbican/charm-helpers/tests/core/test_kernel.py b/charm/charm-helpers/tests/core/test_kernel.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_kernel.py
rename to charm/charm-helpers/tests/core/test_kernel.py
diff --git a/barbican/charm-helpers/tests/core/test_services.py b/charm/charm-helpers/tests/core/test_services.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_services.py
rename to charm/charm-helpers/tests/core/test_services.py
diff --git a/barbican/charm-helpers/tests/core/test_strutils.py b/charm/charm-helpers/tests/core/test_strutils.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_strutils.py
rename to charm/charm-helpers/tests/core/test_strutils.py
diff --git a/barbican/charm-helpers/tests/core/test_sysctl.py b/charm/charm-helpers/tests/core/test_sysctl.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_sysctl.py
rename to charm/charm-helpers/tests/core/test_sysctl.py
diff --git a/barbican/charm-helpers/tests/core/test_templating.py b/charm/charm-helpers/tests/core/test_templating.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_templating.py
rename to charm/charm-helpers/tests/core/test_templating.py
diff --git a/barbican/charm-helpers/tests/core/test_unitdata.py b/charm/charm-helpers/tests/core/test_unitdata.py
similarity index 100%
rename from barbican/charm-helpers/tests/core/test_unitdata.py
rename to charm/charm-helpers/tests/core/test_unitdata.py
diff --git a/barbican/charm-helpers/tests/fetch/__init__.py b/charm/charm-helpers/tests/fetch/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/fetch/__init__.py
rename to charm/charm-helpers/tests/fetch/__init__.py
diff --git a/barbican/charm-helpers/tests/fetch/test_archiveurl.py b/charm/charm-helpers/tests/fetch/test_archiveurl.py
similarity index 100%
rename from barbican/charm-helpers/tests/fetch/test_archiveurl.py
rename to charm/charm-helpers/tests/fetch/test_archiveurl.py
diff --git a/barbican/charm-helpers/tests/fetch/test_bzrurl.py b/charm/charm-helpers/tests/fetch/test_bzrurl.py
similarity index 100%
rename from barbican/charm-helpers/tests/fetch/test_bzrurl.py
rename to charm/charm-helpers/tests/fetch/test_bzrurl.py
diff --git a/barbican/charm-helpers/tests/fetch/test_fetch.py b/charm/charm-helpers/tests/fetch/test_fetch.py
similarity index 100%
rename from barbican/charm-helpers/tests/fetch/test_fetch.py
rename to charm/charm-helpers/tests/fetch/test_fetch.py
diff --git a/barbican/charm-helpers/tests/fetch/test_giturl.py b/charm/charm-helpers/tests/fetch/test_giturl.py
similarity index 100%
rename from barbican/charm-helpers/tests/fetch/test_giturl.py
rename to charm/charm-helpers/tests/fetch/test_giturl.py
diff --git a/barbican/charm-helpers/tests/helpers.py b/charm/charm-helpers/tests/helpers.py
similarity index 100%
rename from barbican/charm-helpers/tests/helpers.py
rename to charm/charm-helpers/tests/helpers.py
diff --git a/barbican/charm-helpers/tests/payload/__init__.py b/charm/charm-helpers/tests/payload/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/payload/__init__.py
rename to charm/charm-helpers/tests/payload/__init__.py
diff --git a/barbican/charm-helpers/tests/payload/test_archive.py b/charm/charm-helpers/tests/payload/test_archive.py
similarity index 100%
rename from barbican/charm-helpers/tests/payload/test_archive.py
rename to charm/charm-helpers/tests/payload/test_archive.py
diff --git a/barbican/charm-helpers/tests/payload/test_execd.py b/charm/charm-helpers/tests/payload/test_execd.py
similarity index 100%
rename from barbican/charm-helpers/tests/payload/test_execd.py
rename to charm/charm-helpers/tests/payload/test_execd.py
diff --git a/barbican/charm-helpers/tests/tools/__init__.py b/charm/charm-helpers/tests/tools/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tests/tools/__init__.py
rename to charm/charm-helpers/tests/tools/__init__.py
diff --git a/barbican/charm-helpers/tests/tools/test_charm_helper_sync.py b/charm/charm-helpers/tests/tools/test_charm_helper_sync.py
similarity index 100%
rename from barbican/charm-helpers/tests/tools/test_charm_helper_sync.py
rename to charm/charm-helpers/tests/tools/test_charm_helper_sync.py
diff --git a/barbican/charm-helpers/tools/__init__.py b/charm/charm-helpers/tools/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tools/__init__.py
rename to charm/charm-helpers/tools/__init__.py
diff --git a/barbican/charm-helpers/tools/charm_helpers_sync/README b/charm/charm-helpers/tools/charm_helpers_sync/README
similarity index 100%
rename from barbican/charm-helpers/tools/charm_helpers_sync/README
rename to charm/charm-helpers/tools/charm_helpers_sync/README
diff --git a/barbican/charm-helpers/tools/charm_helpers_sync/__init__.py b/charm/charm-helpers/tools/charm_helpers_sync/__init__.py
similarity index 100%
rename from barbican/charm-helpers/tools/charm_helpers_sync/__init__.py
rename to charm/charm-helpers/tools/charm_helpers_sync/__init__.py
diff --git a/barbican/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py b/charm/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py
similarity index 100%
rename from barbican/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py
rename to charm/charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py
diff --git a/barbican/charm-helpers/tools/charm_helpers_sync/example-config.yaml b/charm/charm-helpers/tools/charm_helpers_sync/example-config.yaml
similarity index 100%
rename from barbican/charm-helpers/tools/charm_helpers_sync/example-config.yaml
rename to charm/charm-helpers/tools/charm_helpers_sync/example-config.yaml
diff --git a/barbican/config.yaml b/charm/config.yaml
similarity index 100%
rename from barbican/config.yaml
rename to charm/config.yaml
diff --git a/barbican/hooks/install b/charm/hooks/install
similarity index 100%
rename from barbican/hooks/install
rename to charm/hooks/install
diff --git a/barbican/layer.yaml b/charm/layer.yaml
similarity index 100%
rename from barbican/layer.yaml
rename to charm/layer.yaml
diff --git a/barbican/metadata.yaml b/charm/metadata.yaml
similarity index 100%
rename from barbican/metadata.yaml
rename to charm/metadata.yaml
diff --git a/barbican/reactive/barbican.py b/charm/reactive/barbican.py
similarity index 100%
rename from barbican/reactive/barbican.py
rename to charm/reactive/barbican.py
diff --git a/barbican/templates/juno/barbican-admin-paste.ini b/charm/templates/juno/barbican-admin-paste.ini
similarity index 100%
rename from barbican/templates/juno/barbican-admin-paste.ini
rename to charm/templates/juno/barbican-admin-paste.ini
diff --git a/barbican/templates/juno/barbican-api-paste.ini b/charm/templates/juno/barbican-api-paste.ini
similarity index 100%
rename from barbican/templates/juno/barbican-api-paste.ini
rename to charm/templates/juno/barbican-api-paste.ini
diff --git a/barbican/templates/juno/barbican-api.conf b/charm/templates/juno/barbican-api.conf
similarity index 100%
rename from barbican/templates/juno/barbican-api.conf
rename to charm/templates/juno/barbican-api.conf