diff --git a/template/clean.sls b/template/clean.sls
new file mode 100644
index 00000000..60c375e4
--- /dev/null
+++ b/template/clean.sls
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .service.clean
+  - .config.clean
+  - .pkg.clean
diff --git a/template/config/clean.sls b/template/config/clean.sls
new file mode 100644
index 00000000..ad0802dc
--- /dev/null
+++ b/template/config/clean.sls
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `topdir` from `tpldir` #}
+{%- set topdir = tpldir.split('/')[0] %}
+{%- from topdir ~ "/map.jinja" import template with context %}
+{%- from topdir ~ "/macros.jinja" import files_switch with context %}
+
+include:
+  - {{ topdir }}.service.clean
+
+template-config-absent:
+  file.absent:
+    - name: {{ template.config }}
+    - require:
+      - sls: {{ topdir }}.service.clean
diff --git a/template/pkg/config.sls b/template/config/file.sls
similarity index 100%
rename from template/pkg/config.sls
rename to template/config/file.sls
diff --git a/template/config/init.sls b/template/config/init.sls
new file mode 100644
index 00000000..465ddfea
--- /dev/null
+++ b/template/config/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .file
diff --git a/template/init.sls b/template/init.sls
index 6d1b0ba4..a9dc5226 100644
--- a/template/init.sls
+++ b/template/init.sls
@@ -3,3 +3,5 @@
 
 include:
   - .pkg
+  - .config
+  - .service
diff --git a/template/pkg/clean.sls b/template/pkg/clean.sls
index daf3dfb9..da522ceb 100644
--- a/template/pkg/clean.sls
+++ b/template/pkg/clean.sls
@@ -5,19 +5,11 @@
 {%- set topdir = tpldir.split('/')[0] %}
 {%- from topdir ~ "/map.jinja" import template with context %}
 
-template-service-dead:
-  service.dead:
-    - name: {{ template.service.name }}
-    - enable: False
-
-template-config-absent:
-  file.absent:
-    - name: {{ template.config }}
-    - require:
-      - service: template-service-dead
+include:
+  - {{ topdir }}.config.clean
 
 template-pkg-removed:
   pkg.removed:
     - name: {{ template.pkg }}
     - require:
-      - file: template-config-absent
+      - sls: {{ topdir }}.config.clean
diff --git a/template/pkg/init.sls b/template/pkg/init.sls
index 5a3145a3..d3e55181 100644
--- a/template/pkg/init.sls
+++ b/template/pkg/init.sls
@@ -3,5 +3,3 @@
 
 include:
   - .install
-  - .config
-  - .service
diff --git a/template/service/clean.sls b/template/service/clean.sls
new file mode 100644
index 00000000..2142822a
--- /dev/null
+++ b/template/service/clean.sls
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{#- Get the `topdir` from `tpldir` #}
+{%- set topdir = tpldir.split('/')[0] %}
+{%- from topdir ~ "/map.jinja" import template with context %}
+
+template-service-dead:
+  service.dead:
+    - name: {{ template.service.name }}
+    - enable: False
diff --git a/template/service/init.sls b/template/service/init.sls
new file mode 100644
index 00000000..6fe4d1a3
--- /dev/null
+++ b/template/service/init.sls
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .running
diff --git a/template/pkg/service.sls b/template/service/running.sls
similarity index 81%
rename from template/pkg/service.sls
rename to template/service/running.sls
index ea48fead..963dae8a 100644
--- a/template/pkg/service.sls
+++ b/template/service/running.sls
@@ -6,11 +6,11 @@
 {%- from topdir ~ "/map.jinja" import template with context %}
 
 include:
-  - {{ topdir }}.pkg.config
+  - {{ topdir }}.config.file
 
 template-service:
   service.running:
     - name: {{ template.service.name }}
     - enable: True
     - require:
-      - sls: {{ topdir }}.pkg.config
+      - sls: {{ topdir }}.config.file