diff --git a/intellij/localconfig/data/watcherTasks.xml b/intellij/localconfig/data/watcherTasks.xml
deleted file mode 100644
index df92a5b..0000000
--- a/intellij/localconfig/data/watcherTasks.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-    <component name="ProjectTasksOptions">
-        <TaskOptions isEnabled="true">
-            <option name="arguments" value="build //core/api/... //core/internal/..." />
-            <option name="checkSyntaxErrors" value="true" />
-            <option name="description" />
-            <option name="exitCodeBehavior" value="ERROR" />
-            <option name="fileExtension" value="proto" />
-            <option name="immediateSync" value="false" />
-            <option name="name" value="Regenerate protobuf files" />
-            <option name="output" value="" />
-            <option name="outputFilters">
-                <array />
-            </option>
-            <option name="outputFromStdout" value="false" />
-            <option name="program" value="$WorkspaceRoot$/scripts/bin/bazel" />
-            <option name="runOnExternalChanges" value="true" />
-            <option name="scopeName" value="All Places" />
-            <option name="trackOnlyRoot" value="false" />
-            <option name="workingDir" value="" />
-            <envs />
-        </TaskOptions>
-        <TaskOptions isEnabled="true">
-            <option name="arguments" value="run //:goimports -- -local git.monogon.dev -w $FilePath$" />
-            <option name="checkSyntaxErrors" value="true" />
-            <option name="description" />
-            <option name="exitCodeBehavior" value="ERROR" />
-            <option name="fileExtension" value="go" />
-            <option name="immediateSync" value="false" />
-            <option name="name" value="goimports" />
-            <option name="output" value="$FilePath$" />
-            <option name="outputFilters">
-                <array />
-            </option>
-            <option name="outputFromStdout" value="false" />
-            <option name="program" value="$WorkspaceRoot$/scripts/bin/bazel" />
-            <option name="runOnExternalChanges" value="false" />
-            <option name="scopeName" value="Project Files" />
-            <option name="trackOnlyRoot" value="true" />
-            <option name="workingDir" value="$ProjectFileDir$" />
-            <envs>
-                <env name="GOROOT" value="$GOROOT$" />
-                <env name="GOPATH" value="$GOPATH$" />
-                <env name="PATH" value="$GoBinDirs$" />
-            </envs>
-        </TaskOptions>
-    </component>
-</project>
diff --git a/intellij/run/e2e_test.xml b/intellij/run/e2e_test.xml
index 00bc505..0c45c56 100644
--- a/intellij/run/e2e_test.xml
+++ b/intellij/run/e2e_test.xml
@@ -1 +1 @@
-<configuration default="false" name="e2e test" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//core/tests/e2e:go_default_test</blaze-target><blaze-user-flag>--test_output=streamed</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
+<configuration default="false" name="e2e test" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//metropolis/test/e2e:go_default_test</blaze-target><blaze-user-flag>--test_output=streamed</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
diff --git a/intellij/run/e2e_test_in_dbg_mode.xml b/intellij/run/e2e_test_in_dbg_mode.xml
index 8077a5d..578e76c 100644
--- a/intellij/run/e2e_test_in_dbg_mode.xml
+++ b/intellij/run/e2e_test_in_dbg_mode.xml
@@ -1 +1 @@
-<configuration default="false" name="e2e test in dbg mode" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//core/tests/e2e:go_default_test</blaze-target><blaze-user-flag>--test_output=streamed</blaze-user-flag><blaze-user-flag>--cache_test_results=no</blaze-user-flag><blaze-user-flag>--compilation_mode=dbg</blaze-user-flag><blaze-user-flag>--test_timeout=3600</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
+<configuration default="false" name="e2e test in dbg mode" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//metropolis/test/e2e:go_default_test</blaze-target><blaze-user-flag>--test_output=streamed</blaze-user-flag><blaze-user-flag>--cache_test_results=no</blaze-user-flag><blaze-user-flag>--compilation_mode=dbg</blaze-user-flag><blaze-user-flag>--test_timeout=3600</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
diff --git a/intellij/run/e2e_test_in_dbg_mode_with_dlv.xml b/intellij/run/e2e_test_in_dbg_mode_with_dlv.xml
index bbe4379..49f775b 100644
--- a/intellij/run/e2e_test_in_dbg_mode_with_dlv.xml
+++ b/intellij/run/e2e_test_in_dbg_mode_with_dlv.xml
@@ -1 +1 @@
-<configuration default="false" name="e2e test in dbg mode with dlv" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//core/tests/e2e:go_default_test</blaze-target><blaze-user-flag>--local_test_jobs=1</blaze-user-flag><blaze-user-flag>--runs_per_test=1</blaze-user-flag><blaze-user-flag>--test_output=streamed</blaze-user-flag><blaze-user-flag>--cache_test_results=no</blaze-user-flag><blaze-user-flag>--compilation_mode=dbg</blaze-user-flag><blaze-user-flag>--run_under="@//:dlv exec --continue --headless --accept-multiclient --listen=:2345 --api-version=2</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>
\ No newline at end of file
+<configuration default="false" name="e2e test in dbg mode with dlv" type="BlazeCommandRunConfigurationType" factoryName="Bazel Command"><blaze-settings handler-id="BlazeGoRunConfigurationHandlerProvider" kind="go_test" blaze-command="test"><blaze-target>//metropolis/test/e2e:go_default_test</blaze-target><blaze-user-flag>--local_test_jobs=1</blaze-user-flag><blaze-user-flag>--runs_per_test=1</blaze-user-flag><blaze-user-flag>--test_output=streamed</blaze-user-flag><blaze-user-flag>--cache_test_results=no</blaze-user-flag><blaze-user-flag>--compilation_mode=dbg</blaze-user-flag><blaze-user-flag>--run_under="@//:dlv exec --continue --headless --accept-multiclient --listen=:2345 --api-version=2</blaze-user-flag></blaze-settings><method v="2"><option name="Blaze.BeforeRunTask" enabled="true" /></method></configuration>