diff --git a/salt-pillar/ospf/gw.sls b/salt-pillar/quagga/ospfd/gw.sls
similarity index 100%
rename from salt-pillar/ospf/gw.sls
rename to salt-pillar/quagga/ospfd/gw.sls
diff --git a/salt-pillar/ospf/init.sls b/salt-pillar/quagga/ospfd/init.sls
similarity index 100%
rename from salt-pillar/ospf/init.sls
rename to salt-pillar/quagga/ospfd/init.sls
diff --git a/salt-pillar/top.sls b/salt-pillar/top.sls
index 32b9d5c..5cfc5f0 100644
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@@ -3,18 +3,18 @@ base:
     - hosts
     - subnets
     - vlans
-    - ospf
+    - quagga.ospfd
   'priv*-gw':
     - dhcp
-    - ospf.gw
+    - quagga.ospfd.gw
   'pub-gw':
     - dhcp
-    - ospf.gw
+    - quagga.ospfd.gw
   'serv-gw':
     - dhcp
-    - ospf.gw
+    - quagga.ospfd.gw
   'c3d2-gw or c3d2-anon':
-    - ospf.gw
+    - quagga.ospfd.gw
   'anon1':
     - vpn.anon1
     - upstream.anon1
diff --git a/salt/ospf/init.sls b/salt/ospf/init.sls
deleted file mode 100644
index f98235e..000000000
--- a/salt/ospf/init.sls
+++ /dev/null
@@ -1,31 +0,0 @@
-quagga:
-  pkg.installed: []
-
-{%- for daemon in ['zebra', 'ospfd'] %}
-/etc/systemd/system/{{ daemon }}.service:
-  file.managed:
-    - source: salt://ospf/{{ daemon }}.service
-
-/etc/quagga/{{ daemon }}.conf:
-  file.managed:
-    - source: salt://ospf/{{ daemon }}.conf
-    - template: 'jinja'
-    - require:
-      - pkg: quagga
-
-autostart-{{ daemon }}:
-  service.enabled:
-    - name: {{ daemon }}
-      require:
-        - file: /etc/systemd/system/{{ daemon }}.service
-        - file: /etc/quagga/{{ daemon }}.conf
-
-start-{{ daemon }}:
-  service.running:
-    - name: {{ daemon }}
-      require:
-        - service: autostart-{{ daemon }}
-      watch:
-        - file: /etc/quagga/{{ daemon }}.conf
-
-{%- endfor %}
diff --git a/salt/quagga/ospfd/init.sls b/salt/quagga/ospfd/init.sls
new file mode 100644
index 000000000..960a327
--- /dev/null
+++ b/salt/quagga/ospfd/init.sls
@@ -0,0 +1,28 @@
+quagga:
+  pkg.installed: []
+
+/etc/systemd/system/ospfd.service:
+  file.managed:
+    - source: salt://quagga/ospfd/ospfd.service
+
+/etc/quagga/ospfd.conf:
+  file.managed:
+    - source: salt://quagga/ospfd/ospfd.conf
+    - template: 'jinja'
+    - require:
+      - pkg: quagga
+
+autostart-ospfd:
+  service.enabled:
+    - name: ospfd
+      require:
+        - file: /etc/systemd/system/ospfd.service
+        - file: /etc/quagga/ospfd.conf
+
+start-ospfd:
+  service.running:
+    - name: ospfd
+      require:
+        - service: autostart-ospfd
+      watch:
+        - file: /etc/quagga/ospfd.conf
diff --git a/salt/ospf/ospfd.conf b/salt/quagga/ospfd/ospfd.conf
similarity index 100%
rename from salt/ospf/ospfd.conf
rename to salt/quagga/ospfd/ospfd.conf
diff --git a/salt/ospf/ospfd.service b/salt/quagga/ospfd/ospfd.service
similarity index 100%
rename from salt/ospf/ospfd.service
rename to salt/quagga/ospfd/ospfd.service
diff --git a/salt/ospf/zebra.conf b/salt/quagga/zebra/zebra.conf
similarity index 100%
rename from salt/ospf/zebra.conf
rename to salt/quagga/zebra/zebra.conf
diff --git a/salt/ospf/zebra.service b/salt/quagga/zebra/zebra.service
similarity index 100%
rename from salt/ospf/zebra.service
rename to salt/quagga/zebra/zebra.service
diff --git a/salt/top.sls b/salt/top.sls
index 9e9805a..91b00a6 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -3,22 +3,26 @@ base:
     - salt-master
     - server1-network
     - lxc-containers
-    - ospf
+    - quagga.zebra
+    - quagga.ospfd
     - switches
     - cpe
   'priv*-gw':
     - no-ssh
     - forwarding
-    - ospf
+    - quagga.zebra
+    - quagga.ospfd
     - dhcp
   'c3d2-gw or c3d2-anon':
     - no-ssh
     - forwarding
-    - ospf
+    - quagga.zebra
+    - quagga.ospfd
   'upstream*':
     - no-ssh
     - forwarding
-    - ospf
+    - quagga.zebra
+    - quagga.ospfd
     - unbound
     - upstream.dhcp
     - upstream.shaping
@@ -32,7 +36,8 @@ base:
   'anon*':
     - no-ssh
     - forwarding
-    - ospf
+    - quagga.zebra
+    - quagga.ospfd
     - vpn.openvpn
     - upstream.masquerade
     - upstream.shaping