diff --git a/confluent/auth.py b/confluent/auth.py
index 3e8a0185..e52f089a 100644
--- a/confluent/auth.py
+++ b/confluent/auth.py
@@ -68,10 +68,10 @@ def authorize(name, element, tenant=False, access='rw'):
     user, tenant = _get_usertenant(name, tenant)
     if tenant is not None and not configmanager.is_tenant(tenant):
         return None
-    configmanager = configmanager.ConfigManager(tenant)
-    userobj = configmanager.get_user(user)
+    manager = configmanager.ConfigManager(tenant)
+    userobj = manager.get_user(user)
     if userobj: #returning
-        return (userobj, configmanager)
+        return (userobj, manager)
     return None
 
 
diff --git a/confluent/config/configmanager.py b/confluent/config/configmanager.py
index ab3efc81..6be92af9 100644
--- a/confluent/config/configmanager.py
+++ b/confluent/config/configmanager.py
@@ -35,7 +35,7 @@
 import array
 import ast
 import collections
-import confluent.crypto
+import confluent.config.crypto as crypto
 import confluent.util
 import copy
 import cPickle
@@ -182,7 +182,7 @@ def _decode_attribute(attribute, nodeobj, formatter=None, decrypt=False):
         return nodeobj[attribute]
     elif 'cryptvalue' in nodeobj[attribute] and decrypt:
         retdict = copy.deepcopy(nodeobj[attribute])
-        retdict['value'] = confluent.crypto.decrypt_value(
+        retdict['value'] = crypto.decrypt_value(
                                 nodeobj[attribute]['cryptvalue'])
         return retdict
     return nodeobj[attribute]
@@ -356,7 +356,7 @@ class ConfigManager(object):
                     groups=attribmap[node]['groups'])
                 if 'value' in newdict and attrname.startswith("secret."):
                     newdict['cryptvalue' ] = \
-                        confluent.crypto.crypt_value(newdict['value'])
+                        crypto.crypt_value(newdict['value'])
                     del newdict['value']
                 cfgobj[attrname] = newdict
                 if ('_expressionkeys' in cfgobj and
diff --git a/confluent/crypto.py b/confluent/config/crypto.py
similarity index 92%
rename from confluent/crypto.py
rename to confluent/config/crypto.py
index ef8774c0..dfada403 100644
--- a/confluent/crypto.py
+++ b/confluent/config/crypto.py
@@ -8,7 +8,7 @@
 # by passphrase and optionally TPM
 
 import array
-import confluent.config
+import confluent.config.configmanager as configmanager
 import math
 import os
 
@@ -60,21 +60,21 @@ def _format_key(key, passphrase=None):
 def init_masterkey(passphrase=None):
     global _masterkey
     global _masterintegritykey
-    cfgn = confluent.config.get_global('master_privacy_key')
+    cfgn = configmanager.get_global('master_privacy_key')
 
     if cfgn:
         _masterkey = _get_protected_key(cfgn, passphrase=passphrase)
     else:
         _masterkey = os.urandom(32)
-        confluent.config.set_global('master_privacy_key', _format_key(
+        configmanager.set_global('master_privacy_key', _format_key(
             _masterkey,
             passphrase=passphrase))
-    cfgn = confluent.config.get_global('master_integrity_key')
+    cfgn = configmanager.get_global('master_integrity_key')
     if cfgn:
         _masterintegritykey = _get_protected_key(cfgn, passphrase=passphrase)
     else:
         _masterintegritykey = os.urandom(64)
-        confluent.config.set_global('master_integrity_key', _format_key(
+        configmanager.set_global('master_integrity_key', _format_key(
             _masterintegritykey,
             passphrase=passphrase))