diff --git a/config.json b/config.json
index 25ec8ff..cd47c30 100644
--- a/config.json
+++ b/config.json
@@ -48,7 +48,6 @@
          "States": [
             "NC"
          ],
-         "UseZips": true,
          "Zips": [
             "27006"
          ],
@@ -75,6 +74,7 @@
    },
    "Once": false,
    "Brokers": {
+      "UseZips": true,
       "FastExact": {
 			"RadiusMiles": 100,
          "Enabled": true,
diff --git a/config.main_test.json b/config.main_test.json
index 9480d35..b666dac 100644
--- a/config.main_test.json
+++ b/config.main_test.json
@@ -48,7 +48,6 @@
          "States": [
             "NC"
          ],
-         "UseZips": true,
          "Zips": [
             "27006"
          ],
@@ -75,6 +74,7 @@
    },
    "Once": true,
    "Brokers": {
+      "UseZips": true,
       "FastExact": {
 			"RadiusMiles": 100,
          "Enabled": true,
diff --git a/config/config.go b/config/config.go
index d515a12..f4c52e6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -64,7 +64,8 @@ type Config struct {
 	}
 	Once    bool
 	Brokers struct {
-		NTG struct {
+		UseZips bool
+		NTG     struct {
 			Enabled              bool
 			JobInfo              bool
 			Mock                 bool
@@ -87,10 +88,9 @@ type Config struct {
 }
 
 type Client struct {
-	UseZips bool
-	States  []State
-	Zips    []string
-	IDs     struct {
+	States []State
+	Zips   []string
+	IDs    struct {
 		Matrix string
 	}
 	Available Time