diff --git a/fah-config.xml b/config/fah-config.xml
similarity index 100%
rename from fah-config.xml
rename to config/fah-config.xml
diff --git a/firefox-policies.json b/config/firefox-policies.json
similarity index 100%
rename from firefox-policies.json
rename to config/firefox-policies.json
diff --git a/my_variables.sbc b/config/shopbot/my_variables.sbc
similarity index 100%
rename from my_variables.sbc
rename to config/shopbot/my_variables.sbc
diff --git a/shopbot.ini b/config/shopbot/shopbot.ini
similarity index 100%
rename from shopbot.ini
rename to config/shopbot/shopbot.ini
diff --git a/fah.sls b/fah.sls
index a1cc6d7..00bd8f6 100644
--- a/fah.sls
+++ b/fah.sls
@@ -16,7 +16,7 @@ Install fah:
 Create fah config file:
   file.managed:
     - name: 'C:\Users\LocalAdmin\AppData\Roaming\FAHClient\config.xml'
-    - source: 'salt://fah-config.xml'
+    - source: 'salt://config/fah-config.xml'
     - makedirs: True
 
 Add fah to path:
diff --git a/shopbot.sls b/shopbot.sls
index c92ea24..f9810e2 100644
--- a/shopbot.sls
+++ b/shopbot.sls
@@ -10,10 +10,10 @@ shopbot:
 shopbot.ini:
   file.managed:
     - name: 'C:\ProgramData\ShopBot\ShopBot 3\shopbot.ini'
-    - source: 'salt://shopbot.ini'
+    - source: 'salt://config/shopbot/shopbot.ini'
 
 my_variables.sbc:
   file.managed:
     - name: 'C:\sbParts\Custom\my_variables.sbc'
-    - source: 'salt://my_variables.sbc'
+    - source: 'salt://config/shopbot/my_variables.sbc'
     - replace: False
diff --git a/windowsWorkstation.sls b/windowsWorkstation.sls
index 8772901..6ea924f 100644
--- a/windowsWorkstation.sls
+++ b/windowsWorkstation.sls
@@ -26,7 +26,7 @@ Upgrade All:
 Firefox Policies:
   file.managed:
     - name: 'C:\\Program Files\\Mozilla Firefox\distribution\policies.json'
-    - source: 'salt://firefox-policies.json'
+    - source: 'salt://config/firefox-policies.json'
     - makedirs: true
 
 windowsUpdates: