diff --git a/apache/init.sls b/base/apache/init.sls
similarity index 100%
rename from apache/init.sls
rename to base/apache/init.sls
diff --git a/apache/templates/index.html b/base/apache/templates/index.html
similarity index 100%
rename from apache/templates/index.html
rename to base/apache/templates/index.html
diff --git a/top.sls b/base/top.sls
similarity index 100%
rename from top.sls
rename to base/top.sls
diff --git a/master.yml b/master.yml
index 3c27bfd..48025cc 100644
--- a/master.yml
+++ b/master.yml
@@ -81,7 +81,7 @@
 
     - name: Create salt base dir.
       file:
-        path: /srv/salt/base
+        path: /srv/salt
         state: directory
         mode: u=rwX,g=rwX,o=rX
       become: true
@@ -92,10 +92,22 @@
         state: present
       become: true
 
+    - name: Check base state.
+      stat:
+        path: /srv/salt/base/.git
+      register: base_git_state
+
+    - name: Remove bad base dir.
+      file:
+        state: absent
+        recurse: true
+      become: true
+      when: base_git_state.stat.exists
+
     - name: Ensure salt base state is cloned.
       git:
         repo: https://gitea.zigford.org/zigford/salt_class.git
-        dest: /srv/salt/base
+        dest: /srv/salt
         accept_hostkey: yes
       become: true