diff --git a/recipe_modules/environment/api.py b/recipe_modules/environment/api.py
index 4d6b1a4..00f2b65 100644
--- a/recipe_modules/environment/api.py
+++ b/recipe_modules/environment/api.py
@@ -45,7 +45,8 @@
 
     with self.m.step.nest('setup cipd'):
       json_paths = [
-          checkout_root.join('env_setup', 'cipd', 'pigweed.json'),
+          checkout_root.join('pw_env_setup', 'py', 'pw_env_setup',
+                             'cipd_setup', 'pigweed.json'),
           # TODO(mohrr) handle multiple files in non-predetermined places
       ]
 
@@ -143,7 +144,8 @@
         self.m.step('pigweed tools', pw_cmd)
 
         requirements = checkout_root.join(
-            'env_setup/virtualenv/requirements.txt')
+            'pw_env_setup', 'py', 'pw_env_setup', 'virtualenv_setup',
+            'requirements.txt')
         req_cmd = list(pip_install_prefix)
         req_cmd.extend(('-r', requirements))
         self.m.step('build requirements', req_cmd)
diff --git a/recipe_modules/environment/tests/full.expected/simple.json b/recipe_modules/environment/tests/full.expected/simple.json
index 1b0e71a..432d22b 100644
--- a/recipe_modules/environment/tests/full.expected/simple.json
+++ b/recipe_modules/environment/tests/full.expected/simple.json
@@ -18,7 +18,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/env_setup/cipd/pigweed.json",
+      "[START_DIR]/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -206,7 +206,7 @@
       "pip",
       "install",
       "-r",
-      "[START_DIR]/env_setup/virtualenv/requirements.txt"
+      "[START_DIR]/pw_env_setup/py/pw_env_setup/virtualenv_setup/requirements.txt"
     ],
     "env": {
       "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
diff --git a/recipe_modules/environment/tests/full.expected/windows.json b/recipe_modules/environment/tests/full.expected/windows.json
index 3ede332..dc80acc 100644
--- a/recipe_modules/environment/tests/full.expected/windows.json
+++ b/recipe_modules/environment/tests/full.expected/windows.json
@@ -18,7 +18,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]\\env_setup\\cipd\\pigweed.json",
+      "[START_DIR]\\pw_env_setup\\py\\pw_env_setup\\cipd_setup\\pigweed.json",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -239,7 +239,7 @@
       "pip",
       "install",
       "-r",
-      "[START_DIR]\\env_setup/virtualenv/requirements.txt"
+      "[START_DIR]\\pw_env_setup\\py\\pw_env_setup\\virtualenv_setup\\requirements.txt"
     ],
     "env": {
       "PW_CIPD_INSTALL_DIR": "[START_DIR]\\cipd",
diff --git a/recipes/pigweed.expected/pigweed.json b/recipes/pigweed.expected/pigweed.json
index 027a27d..1a954a5 100644
--- a/recipes/pigweed.expected/pigweed.json
+++ b/recipes/pigweed.expected/pigweed.json
@@ -295,7 +295,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/checkout/env_setup/cipd/pigweed.json",
+      "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -483,7 +483,7 @@
       "pip",
       "install",
       "-r",
-      "[START_DIR]/checkout/env_setup/virtualenv/requirements.txt"
+      "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/virtualenv_setup/requirements.txt"
     ],
     "env": {
       "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",
diff --git a/recipes/pigweed.expected/step.json b/recipes/pigweed.expected/step.json
index b3e78f5..e4e80d7 100644
--- a/recipes/pigweed.expected/step.json
+++ b/recipes/pigweed.expected/step.json
@@ -575,7 +575,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[START_DIR]/checkout/env_setup/cipd/pigweed.json",
+      "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
       "/path/to/tmp/"
     ],
     "infra_step": true,
@@ -763,7 +763,7 @@
       "pip",
       "install",
       "-r",
-      "[START_DIR]/checkout/env_setup/virtualenv/requirements.txt"
+      "[START_DIR]/checkout/pw_env_setup/py/pw_env_setup/virtualenv_setup/requirements.txt"
     ],
     "env": {
       "PW_CIPD_INSTALL_DIR": "[START_DIR]/cipd",