4 files changed, 21 insertions, 24 deletions
diff --git a/modules/icecream/manifests/client.pp b/modules/icecream/manifests/client.pp
new file mode 100644
index 00000000..d58a5e65
--- /dev/null
+++ b/modules/icecream/manifests/client.pp
@@ -0,0 +1,6 @@
+define icecream::client($host => '') {
+    include icecream::client_common
+    file { '/etc/sysconfig/icecream':
+        content => template('icecream/sysconfig'),
+    }
+}
diff --git a/modules/icecream/manifests/client_common.pp b/modules/icecream/manifests/client_common.pp
new file mode 100644
index 00000000..b4ee4ac5
--- /dev/null
+++ b/modules/icecream/manifests/client_common.pp
@@ -0,0 +1,7 @@
+class icecream::client_common {
+    package { 'icecream': }
+
+    service { 'icecream':
+        subscribe => Package['icecream'],
+    }
+}
diff --git a/modules/icecream/manifests/init.pp b/modules/icecream/manifests/init.pp
index a4440a87..01828f03 100644
--- a/modules/icecream/manifests/init.pp
+++ b/modules/icecream/manifests/init.pp
@@ -1,24 +1 @@
-class icecream {
-    class scheduler {
-        package { 'icecream-scheduler': }
-
-        service { 'icecream-scheduler':
-            subscribe => Package['icecream-scheduler'],
-        }
-    }
-
-    class client_common {
-        package { 'icecream': }
-
-        service { 'icecream':
-            subscribe => Package['icecream'],
-        }
-    }
-
-    define client($host => '') {
-        include icecream::client_common
-        file { '/etc/sysconfig/icecream':
-            content => template('icecream/sysconfig'),
-        }
-    }
-}
+class icecream { }
diff --git a/modules/icecream/manifests/scheduler.pp b/modules/icecream/manifests/scheduler.pp
new file mode 100644
index 00000000..e3d876b8
--- /dev/null
+++ b/modules/icecream/manifests/scheduler.pp
@@ -0,0 +1,7 @@
+class icecream::scheduler {
+    package { 'icecream-scheduler': }
+
+    service { 'icecream-scheduler':
+        subscribe => Package['icecream-scheduler'],
+    }
+}