diff --git a/acs/occupation/ygo_earnings_5yr.yaml b/acs/occupation/ygo_earnings.yaml
similarity index 100%
rename from acs/occupation/ygo_earnings_5yr.yaml
rename to acs/occupation/ygo_earnings.yaml
diff --git a/acs/occupation/ygo_num_emp_5yr.yaml b/acs/occupation/ygo_num_emp.yaml
similarity index 68%
rename from acs/occupation/ygo_num_emp_5yr.yaml
rename to acs/occupation/ygo_num_emp.yaml
index 90fb8ce..5b122b0 100644
--- a/acs/occupation/ygo_num_emp_5yr.yaml
+++ b/acs/occupation/ygo_num_emp.yaml
@@ -1,13 +1,20 @@
 global:
-    concat_border: "sumlevel"
-    name: acs
+    # concat_border: "sumlevel"
+    name: acs_<estimate>yr
     use_schema: True
-    source: "data/acs/<year>_<tbl>_<column>_<sumlevel>.json"
-    output: "data/output/acs/<year>/<tbl>/<column>/<sumlevel>"
+    source: "data/acs_<estimate>yr/<year>_<sumlevel>_<tbl>_<column>.json"
+    output: "data/output/acs_<estimate>yr/<year>_<sumlevel>_<tbl>_<column>"
     filetype: json
+    source_vars_nesting:
+        estimate:
+          sumlevel:
+            year:
+              - tbl
+              - column
 
     source_vars:
-        year: [2013]
+        estimate: [1, 5]
+        year: [2013, 2014]
         tbl: ["C24010"]
         column:
           start: 3
@@ -16,7 +23,7 @@ global:
           zfill: 3
         sumlevel:
           - us
-          # - state
+          - state
           - county
           - place
           - "metropolitan+statistical+area/micropolitan+statistical+area"
@@ -30,7 +37,7 @@ global:
         zfill: 3
     preprocess:
       func: "src.plugins.preprocess.acs_preprocess"
-    web_paths: "http://api.census.gov/data/<year>/acs5?get=GEOID,<tbl>_<column>E,<tbl>_<column>M&for=<sumlevel>&key=$ACS_KEY"
+    web_paths: "http://api.census.gov/data/<year>/acs<estimate>?get=GEOID,<tbl>_<column>E,<tbl>_<column>M&for=<sumlevel>&key=$ACS_KEY"
 
     import_to_db: True
     db_settings:
diff --git a/acs/ygo_wage.yaml b/acs/ygo_wage.yaml
deleted file mode 100644
index 8df5cd4..0000000
--- a/acs/ygo_wage.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-inherits: "acs/acs_template.yaml"
-global:
-
-    concat: NO
-    source_vars:
-        tbl: ["B24011"]
-        column:
-          start: 1
-          end: 36
-          zfill: 3
-
-    import_to_db: True
-    transform:
-        - type: set_val
-          column: tmp
-          value: "_"
-        - type: zfill
-          size: 3
-          column: column
-        - type: concat
-          column: census_id
-          column0: tbl
-          column1: tmp
-          column2: column
-        - type: rename
-          column: "B24011_<column>E"
-          value: "wage"
-        - type: rename
-          column: "B24011_<column>M"
-          value: "wage_moe"
-        - type: join
-          source: acs/helpers/acs_5year_B24011_crosswalk.csv
-          settings:
-            filetype: csv
-            usecols: [id, col]
-          left_on: census_id
-          right_on: col
-          how: left
-        - type: rename
-          column: id
-          value: acs_occ
-    db_settings:
-      type:
-        wage: real
-        wage_moe: real
-          
-tables:
-  "ygo_wage":
-    pk: ["year", "geo", "acs_occ"]
-    agg:
-      wage: "sum"
-      wage_moe: "sum"