Refactor the util directory to use subpackages.

data/migrations/versions/1c5b738283a5_backfill_user_uuids.py

@@ -13,7 +13,7 @@ down_revision = '2fb36d4be80d'
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.dialects import mysql
-from util.backfill_user_uuids import backfill_user_uuids
+from util.migrate.backfill_user_uuids import backfill_user_uuids
 
 def upgrade(tables):
   backfill_user_uuids()

data/migrations/versions/2430f55c41d5_calculate_uncompressed_sizes_for_all_.py

@@ -12,7 +12,7 @@ down_revision = '3b4d3a4461dc'
 
 from alembic import op
 import sqlalchemy as sa
-from util.uncompressedsize import backfill_sizes_from_data
+from util.migrate.uncompressedsize import backfill_sizes_from_data
 
 
 def upgrade(tables):

data/migrations/versions/437ee6269a9d_migrate_bitbucket_services_to_webhooks.py

@@ -6,7 +6,7 @@ Create Date: 2015-07-21 14:03:44.964200
 
 """
 
-from util.migratebitbucketservices import run_bitbucket_migration
+from util.migrate.migratebitbucketservices import run_bitbucket_migration
 
 # revision identifiers, used by Alembic.
 revision = '437ee6269a9d'

data/migrations/versions/5b84373e5db_convert_slack_webhook_data.py

@@ -13,7 +13,7 @@ down_revision = '1c5b738283a5'
 from alembic import op
 import sqlalchemy as sa
 
-from util.migrateslackwebhook import run_slackwebhook_migration
+from util.migrate.migrateslackwebhook import run_slackwebhook_migration
 
 
 def upgrade(tables):

data/users/__init__.py

@@ -10,8 +10,7 @@ from data.users.database import DatabaseUsers
 from data.users.externalldap import LDAPUsers
 from data.users.externaljwt import ExternalJWTAuthN
 from data.users.keystone import KeystoneUsers
-
-from util.aes import AESCipher
+from util.security.aes import AESCipher
 
 logger = logging.getLogger(__name__)