diff --git a/examples/single.pp b/examples/single.pp
index 4a194356..62c8d11f 100644
--- a/examples/single.pp
+++ b/examples/single.pp
@@ -40,7 +40,7 @@ node glance_keystone_mysql {
     log_debug    => true,
     catalog_type => 'sql',
   }->
-  class { 'keystone::mysql':
+  class { 'keystone::db::mysql':
     password => 'keystone',
   }->
   class { 'keystone::roles::admin': }
@@ -90,7 +90,7 @@ class role_glance_mysql {
   }
   class { 'glance::backend::file': }
 
-  class { 'glance::db':
+  class { 'glance::db::mysql':
     password => 'glance',
     dbname   => 'glance',
     user     => 'glance',
diff --git a/manifests/api/config.pp b/manifests/api/config.pp
index 1e48c2d5..dc9e74fd 100644
--- a/manifests/api/config.pp
+++ b/manifests/api/config.pp
@@ -11,10 +11,12 @@ define glance::api::config(
   $content   = template("glance/api/${name}.erb"),
   $order     = undef
 ) {
+
   concat::fragment { "glance-api-${name}":
     target  => '/etc/glance/glance-api.conf',
     content => $content,
     order   => $order,
   }
+
 }
 
diff --git a/manifests/db.pp b/manifests/db/mysql.pp
similarity index 81%
rename from manifests/db.pp
rename to manifests/db/mysql.pp
index d0a18193..3a062986 100644
--- a/manifests/db.pp
+++ b/manifests/db/mysql.pp
@@ -2,7 +2,7 @@
 # I should change this to mysql
 # for consistency
 #
-class glance::db(
+class glance::db::mysql(
   $password,
   $dbname = 'glance',
   $user = 'glance',
@@ -11,7 +11,7 @@ class glance::db(
   $cluster_id = 'localzone'
 ) {
 
-  Class['glance::db'] -> Exec<| title == 'glance-manage db_sync' |>
+  Class['glance::db::mysql'] -> Exec<| title == 'glance-manage db_sync' |>
   Database[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
 
   require 'mysql::python'
@@ -27,7 +27,7 @@ class glance::db(
 
   if $allowed_hosts {
      # TODO this class should be in the mysql namespace
-     glance::db::host_access { $allowed_hosts:
+     glance::db::mysql::host_access { $allowed_hosts:
       user      => $user,
       password  => $password,
       database  => $dbname,
diff --git a/manifests/db/host_access.pp b/manifests/db/mysql/host_access.pp
similarity index 74%
rename from manifests/db/host_access.pp
rename to manifests/db/mysql/host_access.pp
index 355da0d2..92dcfe8b 100644
--- a/manifests/db/host_access.pp
+++ b/manifests/db/mysql/host_access.pp
@@ -1,5 +1,7 @@
-# db/allowed_hosts.pp
-define glance::db::host_access ($user, $password, $database)  {
+#
+# Used to grant access to the glance mysql DB
+#
+define glance::db::mysql::host_access ($user, $password, $database)  {
   database_user { "${user}@${name}":
     password_hash => mysql_password($password),
     provider => 'mysql',