diff --git a/etcd/init.sls b/etcd/init.sls
index cbdd5ee..cddcbaa 100644
--- a/etcd/init.sls
+++ b/etcd/init.sls
@@ -3,7 +3,4 @@
 {%- if pillar.etcd.server is defined %}
 - etcd.server
 {%- endif %}
-{%- if pillar.etcd.server.setup is defined %}
-- etcd.setup
-{%- endif %}
 {%- endif %}
diff --git a/etcd/server/init.sls b/etcd/server/init.sls
new file mode 100644
index 0000000..8cca661
--- /dev/null
+++ b/etcd/server/init.sls
@@ -0,0 +1,5 @@
+include:
+- etcd.server.service
+{% if pillar.etcd.server.setup is defined %}
+- etcd.server.setup
+{% endif %}
diff --git a/etcd/server.sls b/etcd/server/service.sls
similarity index 100%
rename from etcd/server.sls
rename to etcd/server/service.sls
diff --git a/etcd/setup.sls b/etcd/server/setup.sls
similarity index 100%
rename from etcd/setup.sls
rename to etcd/server/setup.sls