diff --git a/manifests/swift.pp b/manifests/swift.pp
index 2d5b89c4a..98ad73505 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -45,6 +45,8 @@ class openstack_integration::swift {
   class { 'swift':
     swift_hash_path_suffix => 'secrete',
   }
+
+  # proxy server
   class { 'swift::proxy':
     proxy_local_net_ip => $::openstack_integration::config::host,
     workers            => '2',
@@ -88,6 +90,8 @@ class openstack_integration::swift {
   include swift::proxy::slo
   include swift::proxy::symlink
   include swift::proxy::versioned_writes
+
+  # keystone resources
   class { 'swift::keystone::auth':
     public_url     => "http://${::openstack_integration::config::ip_for_url}:8080/v1/AUTH_%(tenant_id)s",
     admin_url      => "http://${::openstack_integration::config::ip_for_url}:8080",
@@ -95,6 +99,20 @@ class openstack_integration::swift {
     password       => 'a_big_secret',
     operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'],
   }
+
+  # internal client
+  class { 'swift::internal_client':
+    pipeline     => [ 'catch_errors', 'proxy-logging', 'cache', 'symlink', 'proxy-server' ],
+    node_timeout => 30,
+  }
+  include swift::internal_client::catch_errors
+  include swift::internal_client::proxy_logging
+  class { 'swift::internal_client::cache':
+    memcache_servers => $::openstack_integration::config::swift_memcached_servers
+  }
+  include swift::internal_client::symlink
+
+  # data directories
   file { '/srv/node':
     ensure  => directory,
     owner   => 'swift',
@@ -110,7 +128,8 @@ class openstack_integration::swift {
       require => File['/srv/node'],
     }
   }
-  include swift::ringbuilder
+
+  # storage servers
   class { 'swift::storage::all':
     storage_local_net_ip => $::openstack_integration::config::host,
     mount_check          => false,
@@ -121,6 +140,9 @@ class openstack_integration::swift {
   class { 'swift::objectexpirer':
     memcache_servers => $::openstack_integration::config::swift_memcached_servers
   }
+
+  # ring builder
+  include swift::ringbuilder
   # As of mitaka swift-ring-builder requires devices >= replica count
   # Default replica count is 3
   ring_object_device { ["${::openstack_integration::config::ip_for_url}:6000/1", "${::openstack_integration::config::ip_for_url}:6000/2", "${::openstack_integration::config::ip_for_url}:6000/3"]: