diff --git a/manifests/burrow.pp b/manifests/burrow.pp
deleted file mode 100644
index daca842c2b..0000000000
--- a/manifests/burrow.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  package { "python-eventlet":
-    ensure => latest
-  }
-}
diff --git a/manifests/burrow_java.pp b/manifests/burrow_java.pp
deleted file mode 100644
index cb603c8b4b..0000000000
--- a/manifests/burrow_java.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  package { "maven2":
-    ensure => latest
-  }
-}
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
deleted file mode 100644
index 4d559c7ea0..0000000000
--- a/manifests/dashboard.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  package { "python-virtualenv":
-    ensure => present
-  }
-}
diff --git a/manifests/docs.pp b/manifests/docs.pp
deleted file mode 100644
index 85a3865a9c..0000000000
--- a/manifests/docs.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-import "openstack_ci_admins_users"
-import "doc_server"
-
-node default {
-  include openstack_ci_admins_users
-  include doc_server
-}
diff --git a/manifests/glance.pp b/manifests/glance.pp
deleted file mode 100644
index 674a53956c..0000000000
--- a/manifests/glance.pp
+++ /dev/null
@@ -1,81 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  apt::ppa { "ppa:glance-core/trunk":
-    ensure => present
-  }
-
-  apt::builddep { "glance":
-    ensure => present,
-    require => Apt::Ppa["ppa:glance-core/trunk"]
-  }
-
-package { "python-argparse":
-  ensure => latest
-}
-package { "python-decorator":
-  ensure => latest
-}
-package { "python-eventlet":
-  ensure => latest
-}
-package { "python-formencode":
-  ensure => latest
-}
-package { "python-greenlet":
-  ensure => latest
-}
-package { "python-migrate":
-  ensure => latest
-}
-package { "python-mox":
-  ensure => latest
-}
-package { "python-netifaces":
-  ensure => latest
-}
-package { "python-openid":
-  ensure => latest
-}
-package { "python-openssl":
-  ensure => latest
-}
-package { "python-paste":
-  ensure => latest
-}
-package { "python-pastedeploy":
-  ensure => latest
-}
-package { "python-pastescript":
-  ensure => latest
-}
-package { "python-routes":
-  ensure => latest
-}
-package { "python-scgi":
-  ensure => latest
-}
-package { "python-sqlalchemy":
-  ensure => latest
-}
-package { "python-sqlalchemy-ext":
-  ensure => latest
-}
-package { "python-swift":
-  ensure => latest
-}
-package { "python-tempita":
-  ensure => latest
-}
-package { "python-webob":
-  ensure => latest
-}
-package { "python-xattr":
-  ensure => latest
-}
-
-}
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
deleted file mode 100644
index 7011a4f5af..0000000000
--- a/manifests/keystone.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-}
diff --git a/manifests/libburrow.pp b/manifests/libburrow.pp
deleted file mode 100644
index 2811b5b791..0000000000
--- a/manifests/libburrow.pp
+++ /dev/null
@@ -1,27 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  package { "build-essential":
-    ensure => latest
-  }
-
-  package { "libcurl4-gnutls-dev":
-    ensure => latest
-  }
-
-  package { "libtool":
-    ensure => latest
-  }
-
-  package { "autoconf":
-    ensure => latest
-  }
-
-  package { "automake":
-    ensure => latest
-  }
-}
diff --git a/manifests/manuals.pp b/manifests/manuals.pp
deleted file mode 100644
index cb603c8b4b..0000000000
--- a/manifests/manuals.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  package { "maven2":
-    ensure => latest
-  }
-}
diff --git a/manifests/nova.pp b/manifests/nova.pp
deleted file mode 100644
index d8e8380068..0000000000
--- a/manifests/nova.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  apt::ppa { "ppa:nova-core/trunk":
-    ensure => present
-  }
-  apt::builddep { "nova":
-    ensure => present,
-    require => Apt::Ppa["ppa:nova-core/trunk"]
-  }
-
-}
diff --git a/manifests/openstack_ci.pp b/manifests/openstack_ci.pp
deleted file mode 100644
index 7011a4f5af..0000000000
--- a/manifests/openstack_ci.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-}
diff --git a/manifests/server.pp b/manifests/server.pp
deleted file mode 100644
index 8c2442a76b..0000000000
--- a/manifests/server.pp
+++ /dev/null
@@ -1,30 +0,0 @@
-import "openstack_admins_users"
-
-node default {
-  include openstack_admins_users
-  include ssh  
-
-    package { "python-software-properties":
-        ensure => latest
-          }
-
-    package { "puppet":
-        ensure => latest
-          }
-    
-    package { "bzr":
-        ensure => latest
-          }
-    
-    package { "git":
-        ensure => latest
-          }
-    
-    package { "python-setuptools":
-        ensure => latest
-          }
-    
-    package { "byobu":
-        ensure => latest
-          }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
new file mode 100644
index 0000000000..0b030bb699
--- /dev/null
+++ b/manifests/site.pp
@@ -0,0 +1,169 @@
+import "openstack_admins_users"    #TODO: refactor
+import "openstack_ci_admins_users" #TODO: refactor
+import "doc_server" # TODO: refactor out of module
+
+#
+# Abstract classes:
+#
+class openstack_base {
+  include ssh  
+
+  package { "ntp":
+    ensure => installed
+    }
+    
+  service { 'ntpd':
+    name       => 'ntp',
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+    require => Package['ntp'],
+  }
+  
+  $packages = ["python-software-properties",
+               "puppet",
+               "bzr",
+               "git",
+               "python-setuptools",
+               "byobu"]
+  package { $packages: ensure => "latest" }
+}
+
+class openstack_server {
+  include openstack_base
+  include openstack_admins_users
+}
+
+class openstack_jenkins_slave {
+  include openstack_base
+  include openstack_ci_admins_users
+  include jenkins_slave
+}
+
+#
+# Long lived servers:
+#
+node "gerrit.openstack.org", "gerrit-dev.openstack.org" {
+  include openstack_server
+}
+
+node "docs.openstack.org" {
+  include openstack_server
+  include doc_server
+}
+
+#
+# Jenkins slaves:
+#
+node /^burrow-java(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  package { "maven2":
+    ensure => latest
+  }
+}
+
+node /^burrow(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  package { "python-eventlet":
+    ensure => latest
+  }
+}
+
+node /^libburrow(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  $slave_packages = ["build-essential",
+                     "libcurl4-gnutls-dev",
+                     "libtool",
+                     "autoconf",
+                     "automake"]
+  package { $slave_packages: ensure => "latest" }
+}
+
+node /^dashboard(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  package { "python-virtualenv":
+    ensure => present
+  }
+}
+
+node /^glance(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  apt::ppa { "ppa:glance-core/trunk":
+    ensure => present
+  }
+
+  apt::builddep { "glance":
+    ensure => present,
+    require => Apt::Ppa["ppa:glance-core/trunk"]
+  }
+
+  $slave_packages = ["python-argparse",
+                     "python-decorator",
+                     "python-eventlet",
+                     "python-formencode",
+                     "python-greenlet",
+                     "python-migrate",
+                     "python-mox",
+                     "python-netifaces",
+                     "python-openid",
+                     "python-openssl",
+                     "python-paste",
+                     "python-pastedeploy",
+                     "python-pastescript",
+                     "python-routes",
+                     "python-scgi",
+                     "python-sqlalchemy",
+                     "python-sqlalchemy-ext",
+                     "python-swift",
+                     "python-tempita",
+                     "python-webob",
+                     "python-xattr"]
+  package { $slave_packages: ensure => "latest" }
+}
+
+node /^keystone(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+}
+
+node /^manuals(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  package { "maven2":
+    ensure => latest
+  }
+}
+
+node /^nova(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  apt::ppa { "ppa:nova-core/trunk":
+    ensure => present
+  }
+
+  apt::builddep { "nova":
+    ensure => present,
+    require => Apt::Ppa["ppa:nova-core/trunk"]
+  }
+}
+
+node /^openstack-ci(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+}
+
+node /^swift(-\d+)?\.slave\.openstack\.org$/ {
+  include openstack_jenkins_slave
+
+  apt::ppa { "ppa:swift-core/trunk":
+    ensure => present
+  }
+
+  apt::builddep { "swift":
+    ensure => present,
+    require => Apt::Ppa["ppa:swift-core/trunk"]
+  }
+}
diff --git a/manifests/slave.pp b/manifests/slave.pp
deleted file mode 100644
index 7011a4f5af..0000000000
--- a/manifests/slave.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-}
diff --git a/manifests/swift.pp b/manifests/swift.pp
deleted file mode 100644
index 5f6a90bf1e..0000000000
--- a/manifests/swift.pp
+++ /dev/null
@@ -1,16 +0,0 @@
-import "openstack_ci_admins_users"
-import "jenkins_slave"
-
-node default {
-  include openstack_ci_admins_users
-  include jenkins_slave
-
-  apt::ppa { "ppa:swift-core/trunk":
-    ensure => present
-  }
-  apt::builddep { "swift":
-    ensure => present,
-    require => Apt::Ppa["ppa:swift-core/trunk"]
-  }
-
-}