diff --git a/new_targets/archive/api.ts b/archive/api.ts
similarity index 100%
rename from new_targets/archive/api.ts
rename to archive/api.ts
diff --git a/new_targets/archive/apply_guidance.ts b/archive/apply_guidance.ts
similarity index 100%
rename from new_targets/archive/apply_guidance.ts
rename to archive/apply_guidance.ts
diff --git a/new_targets/archive/price_queue.ms.sql b/archive/price_queue.ms.sql
similarity index 100%
rename from new_targets/archive/price_queue.ms.sql
rename to archive/price_queue.ms.sql
diff --git a/new_targets/archive/price_queue.pg.sql b/archive/price_queue.pg.sql
similarity index 100%
rename from new_targets/archive/price_queue.pg.sql
rename to archive/price_queue.pg.sql
diff --git a/new_targets/archive/set_anchors.ts b/archive/set_anchors.ts
similarity index 100%
rename from new_targets/archive/set_anchors.ts
rename to archive/set_anchors.ts
diff --git a/new_targets/archive/sql/apply_guidance.pg.sql b/archive/sql/apply_guidance.pg.sql
similarity index 100%
rename from new_targets/archive/sql/apply_guidance.pg.sql
rename to archive/sql/apply_guidance.pg.sql
diff --git a/new_targets/archive/sql/consume_pricepool.pg.sql b/archive/sql/consume_pricepool.pg.sql
similarity index 100%
rename from new_targets/archive/sql/consume_pricepool.pg.sql
rename to archive/sql/consume_pricepool.pg.sql
diff --git a/new_targets/archive/sql/db_apply.pg.sql b/archive/sql/db_apply.pg.sql
similarity index 100%
rename from new_targets/archive/sql/db_apply.pg.sql
rename to archive/sql/db_apply.pg.sql
diff --git a/new_targets/archive/sql/get.pg.sql b/archive/sql/get.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get.pg.sql
rename to archive/sql/get.pg.sql
diff --git a/new_targets/archive/sql/get_cust.pg.sql b/archive/sql/get_cust.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_cust.pg.sql
rename to archive/sql/get_cust.pg.sql
diff --git a/new_targets/archive/sql/get_dseg.pg.sql b/archive/sql/get_dseg.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_dseg.pg.sql
rename to archive/sql/get_dseg.pg.sql
diff --git a/new_targets/archive/sql/get_guidance.pg.sql b/archive/sql/get_guidance.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_guidance.pg.sql
rename to archive/sql/get_guidance.pg.sql
diff --git a/new_targets/archive/sql/get_guidance_dseg.pg.sql b/archive/sql/get_guidance_dseg.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_guidance_dseg.pg.sql
rename to archive/sql/get_guidance_dseg.pg.sql
diff --git a/new_targets/archive/sql/get_hist.pg.sql b/archive/sql/get_hist.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_hist.pg.sql
rename to archive/sql/get_hist.pg.sql
diff --git a/new_targets/archive/sql/get_hist_debug.pg.sql b/archive/sql/get_hist_debug.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_hist_debug.pg.sql
rename to archive/sql/get_hist_debug.pg.sql
diff --git a/new_targets/archive/sql/get_list.pg.sql b/archive/sql/get_list.pg.sql
similarity index 100%
rename from new_targets/archive/sql/get_list.pg.sql
rename to archive/sql/get_list.pg.sql
diff --git a/new_targets/archive/sql/gethist.sql b/archive/sql/gethist.sql
similarity index 100%
rename from new_targets/archive/sql/gethist.sql
rename to archive/sql/gethist.sql
diff --git a/new_targets/archive/sql/gethist_table.pg.sql b/archive/sql/gethist_table.pg.sql
similarity index 100%
rename from new_targets/archive/sql/gethist_table.pg.sql
rename to archive/sql/gethist_table.pg.sql
diff --git a/new_targets/archive/sql/link_matrix.pg.sql b/archive/sql/link_matrix.pg.sql
similarity index 100%
rename from new_targets/archive/sql/link_matrix.pg.sql
rename to archive/sql/link_matrix.pg.sql
diff --git a/new_targets/archive/sql/live_quotes_review.pg.sql b/archive/sql/live_quotes_review.pg.sql
similarity index 100%
rename from new_targets/archive/sql/live_quotes_review.pg.sql
rename to archive/sql/live_quotes_review.pg.sql
diff --git a/new_targets/archive/sql/price_pool.sql b/archive/sql/price_pool.sql
similarity index 100%
rename from new_targets/archive/sql/price_pool.sql
rename to archive/sql/price_pool.sql
diff --git a/new_targets/archive/sql/quote_review.pg.sql b/archive/sql/quote_review.pg.sql
similarity index 100%
rename from new_targets/archive/sql/quote_review.pg.sql
rename to archive/sql/quote_review.pg.sql
diff --git a/new_targets/archive/sql/spread.pg.sql b/archive/sql/spread.pg.sql
similarity index 100%
rename from new_targets/archive/sql/spread.pg.sql
rename to archive/sql/spread.pg.sql
diff --git a/new_targets/archive/target_prices_unpack.ms.sql b/archive/target_prices_unpack.ms.sql
similarity index 100%
rename from new_targets/archive/target_prices_unpack.ms.sql
rename to archive/target_prices_unpack.ms.sql
diff --git a/new_targets/builder/build_pricing_path.pg.sql b/builder/build_pricing_path.pg.sql
similarity index 100%
rename from new_targets/builder/build_pricing_path.pg.sql
rename to builder/build_pricing_path.pg.sql
diff --git a/new_targets/builder/get_option_costs_priceg.pg.sql b/builder/get_option_costs_priceg.pg.sql
similarity index 100%
rename from new_targets/builder/get_option_costs_priceg.pg.sql
rename to builder/get_option_costs_priceg.pg.sql
diff --git a/new_targets/builder/get_options_merged.pg.sql b/builder/get_options_merged.pg.sql
similarity index 100%
rename from new_targets/builder/get_options_merged.pg.sql
rename to builder/get_options_merged.pg.sql
diff --git a/new_targets/builder/load_target_price.pg.sql b/builder/load_target_price.pg.sql
similarity index 100%
rename from new_targets/builder/load_target_price.pg.sql
rename to builder/load_target_price.pg.sql
diff --git a/new_targets/example_usage.ms.sql b/example_usage.ms.sql
similarity index 100%
rename from new_targets/example_usage.ms.sql
rename to example_usage.ms.sql
diff --git a/new_targets/procs/guidance_logic.ms.sql b/procs/guidance_logic.ms.sql
similarity index 100%
rename from new_targets/procs/guidance_logic.ms.sql
rename to procs/guidance_logic.ms.sql
diff --git a/new_targets/procs/guidance_logic.pg.sql b/procs/guidance_logic.pg.sql
similarity index 100%
rename from new_targets/procs/guidance_logic.pg.sql
rename to procs/guidance_logic.pg.sql
diff --git a/new_targets/procs/lastprice_logic.ms.sql b/procs/lastprice_logic.ms.sql
similarity index 100%
rename from new_targets/procs/lastprice_logic.ms.sql
rename to procs/lastprice_logic.ms.sql
diff --git a/new_targets/procs/lastprice_logic.pg.sql b/procs/lastprice_logic.pg.sql
similarity index 100%
rename from new_targets/procs/lastprice_logic.pg.sql
rename to procs/lastprice_logic.pg.sql
diff --git a/new_targets/procs/matrix_guidance.ms.sql b/procs/matrix_guidance.ms.sql
similarity index 100%
rename from new_targets/procs/matrix_guidance.ms.sql
rename to procs/matrix_guidance.ms.sql
diff --git a/new_targets/procs/matrix_guidance.pg.sql b/procs/matrix_guidance.pg.sql
similarity index 100%
rename from new_targets/procs/matrix_guidance.pg.sql
rename to procs/matrix_guidance.pg.sql
diff --git a/new_targets/procs/single_price_call.ms.sql b/procs/single_price_call.ms.sql
similarity index 100%
rename from new_targets/procs/single_price_call.ms.sql
rename to procs/single_price_call.ms.sql
diff --git a/new_targets/procs/single_price_call.pg.sql b/procs/single_price_call.pg.sql
similarity index 100%
rename from new_targets/procs/single_price_call.pg.sql
rename to procs/single_price_call.pg.sql
diff --git a/new_targets/procs/single_price_call_func.ms.sql b/procs/single_price_call_func.ms.sql
similarity index 100%
rename from new_targets/procs/single_price_call_func.ms.sql
rename to procs/single_price_call_func.ms.sql
diff --git a/new_targets/tables/lastpricedetail.ms.sql b/tables/lastpricedetail.ms.sql
similarity index 100%
rename from new_targets/tables/lastpricedetail.ms.sql
rename to tables/lastpricedetail.ms.sql
diff --git a/new_targets/tables/lastpricedetail.pg.sql b/tables/lastpricedetail.pg.sql
similarity index 100%
rename from new_targets/tables/lastpricedetail.pg.sql
rename to tables/lastpricedetail.pg.sql
diff --git a/new_targets/tables/pricelist_ranged.ms.sql b/tables/pricelist_ranged.ms.sql
similarity index 100%
rename from new_targets/tables/pricelist_ranged.ms.sql
rename to tables/pricelist_ranged.ms.sql
diff --git a/new_targets/tables/pricelist_ranged.pg.sql b/tables/pricelist_ranged.pg.sql
similarity index 100%
rename from new_targets/tables/pricelist_ranged.pg.sql
rename to tables/pricelist_ranged.pg.sql
diff --git a/new_targets/tables/target_prices.ms.sql b/tables/target_prices.ms.sql
similarity index 100%
rename from new_targets/tables/target_prices.ms.sql
rename to tables/target_prices.ms.sql
diff --git a/new_targets/tables/target_prices.pg.sql b/tables/target_prices.pg.sql
similarity index 100%
rename from new_targets/tables/target_prices.pg.sql
rename to tables/target_prices.pg.sql
diff --git a/new_targets/tables/target_prices_view.pg.sql b/tables/target_prices_view.pg.sql
similarity index 100%
rename from new_targets/tables/target_prices_view.pg.sql
rename to tables/target_prices_view.pg.sql
diff --git a/new_targets/ui_schema.json b/ui_schema.json
similarity index 100%
rename from new_targets/ui_schema.json
rename to ui_schema.json