diff --git a/config/paths.js b/config/paths.js
index e198387..67af3f3 100644
--- a/config/paths.js
+++ b/config/paths.js
@@ -36,9 +36,9 @@ function getServedPath() {
 module.exports = {
   dotenv: resolveApp(".env"),
   appBuild: resolveApp("build"),
-  appPublic: resolveApp("src/v3/app/public"),
-  appHtml: resolveApp("src/v3/app/public/index.html"),
-  appIndexJs: resolveApp("src/v3/app/index.js"),
+  appPublic: resolveApp("src/app/public"),
+  appHtml: resolveApp("src/app/public/index.html"),
+  appIndexJs: resolveApp("src/app/index.js"),
   appPackageJson: resolveApp("package.json"),
   appSrc: resolveApp("src"),
   yarnLockFile: resolveApp("yarn.lock"),
@@ -53,20 +53,18 @@ module.exports = {
   // source file, and the key will be the filename of the bundled entry
   // point within the build directory.
   backendEntryPoints: {
-    apiApp: resolveApp("src/v3/app/apiApp.js"),
+    apiApp: resolveApp("src/app/apiApp.js"),
     //
-    sourcecred: resolveApp("src/v3/cli/sourcecred.js"),
-    "commands/load": resolveApp("src/v3/cli/commands/load.js"),
-    "commands/start-v3": resolveApp("src/v3/cli/commands/start.js"),
+    sourcecred: resolveApp("src/cli/sourcecred.js"),
+    "commands/load": resolveApp("src/cli/commands/load.js"),
+    "commands/start": resolveApp("src/cli/commands/start.js"),
     //
-    fetchAndPrintGithubRepoV3: resolveApp(
-      "src/v3/plugins/github/bin/fetchAndPrintGithubRepo.js"
+    fetchAndPrintGithubRepo: resolveApp(
+      "src/plugins/github/bin/fetchAndPrintGithubRepo.js"
     ),
-    createExampleRepoV3: resolveApp(
-      "src/v3/plugins/git/bin/createExampleRepo.js"
-    ),
-    loadAndPrintGitRepositoryV3: resolveApp(
-      "src/v3/plugins/git/bin/loadAndPrintRepository.js"
+    createExampleRepo: resolveApp("src/plugins/git/bin/createExampleRepo.js"),
+    loadAndPrintGitRepository: resolveApp(
+      "src/plugins/git/bin/loadAndPrintRepository.js"
     ),
   },
 };
diff --git a/config/travis.js b/config/travis.js
index 8787a03..e59acf3 100644
--- a/config/travis.js
+++ b/config/travis.js
@@ -73,13 +73,13 @@ function makeTasks(mode /*: "BASIC" | "FULL" */) {
       deps: ["check-pretty"],
     },
     {
-      id: "fetchGithubRepoTestV3",
-      cmd: ["./src/v3/plugins/github/fetchGithubRepoTest.sh", "--no-build"],
+      id: "fetchGithubRepoTest",
+      cmd: ["./src/plugins/github/fetchGithubRepoTest.sh", "--no-build"],
       deps: ["backend-in-place"],
     },
     {
-      id: "loadRepositoryTestV3",
-      cmd: ["./src/v3/plugins/git/loadRepositoryTest.sh", "--no-build"],
+      id: "loadRepositoryTest",
+      cmd: ["./src/plugins/git/loadRepositoryTest.sh", "--no-build"],
       deps: ["backend-in-place"],
     },
   ];
diff --git a/src/v3/app/App.js b/src/app/App.js
similarity index 100%
rename from src/v3/app/App.js
rename to src/app/App.js
diff --git a/src/v3/app/LocalStore.js b/src/app/LocalStore.js
similarity index 100%
rename from src/v3/app/LocalStore.js
rename to src/app/LocalStore.js
diff --git a/src/v3/app/apiApp.js b/src/app/apiApp.js
similarity index 100%
rename from src/v3/app/apiApp.js
rename to src/app/apiApp.js
diff --git a/src/v3/app/credExplorer/App.js b/src/app/credExplorer/App.js
similarity index 100%
rename from src/v3/app/credExplorer/App.js
rename to src/app/credExplorer/App.js
diff --git a/src/v3/app/credExplorer/App.test.js b/src/app/credExplorer/App.test.js
similarity index 100%
rename from src/v3/app/credExplorer/App.test.js
rename to src/app/credExplorer/App.test.js
diff --git a/src/v3/app/credExplorer/LocalStore.js b/src/app/credExplorer/LocalStore.js
similarity index 100%
rename from src/v3/app/credExplorer/LocalStore.js
rename to src/app/credExplorer/LocalStore.js
diff --git a/src/v3/app/credExplorer/PagerankTable.js b/src/app/credExplorer/PagerankTable.js
similarity index 100%
rename from src/v3/app/credExplorer/PagerankTable.js
rename to src/app/credExplorer/PagerankTable.js
diff --git a/src/v3/app/credExplorer/PagerankTable.test.js b/src/app/credExplorer/PagerankTable.test.js
similarity index 100%
rename from src/v3/app/credExplorer/PagerankTable.test.js
rename to src/app/credExplorer/PagerankTable.test.js
diff --git a/src/v3/app/credExplorer/__snapshots__/PagerankTable.test.js.snap b/src/app/credExplorer/__snapshots__/PagerankTable.test.js.snap
similarity index 100%
rename from src/v3/app/credExplorer/__snapshots__/PagerankTable.test.js.snap
rename to src/app/credExplorer/__snapshots__/PagerankTable.test.js.snap
diff --git a/src/v3/app/index.css b/src/app/index.css
similarity index 100%
rename from src/v3/app/index.css
rename to src/app/index.css
diff --git a/src/v3/app/index.js b/src/app/index.js
similarity index 100%
rename from src/v3/app/index.js
rename to src/app/index.js
diff --git a/src/v3/app/pluginAdapter.js b/src/app/pluginAdapter.js
similarity index 100%
rename from src/v3/app/pluginAdapter.js
rename to src/app/pluginAdapter.js
diff --git a/src/v3/app/public/index.html b/src/app/public/index.html
similarity index 100%
rename from src/v3/app/public/index.html
rename to src/app/public/index.html
diff --git a/src/v3/app/registerServiceWorker.js b/src/app/registerServiceWorker.js
similarity index 100%
rename from src/v3/app/registerServiceWorker.js
rename to src/app/registerServiceWorker.js
diff --git a/src/v3/app/testUtil.js b/src/app/testUtil.js
similarity index 100%
rename from src/v3/app/testUtil.js
rename to src/app/testUtil.js
diff --git a/src/v3/cli/commands/load.js b/src/cli/commands/load.js
similarity index 97%
rename from src/v3/cli/commands/load.js
rename to src/cli/commands/load.js
index 889772c..b41aae5 100644
--- a/src/v3/cli/commands/load.js
+++ b/src/cli/commands/load.js
@@ -12,8 +12,7 @@ import {
   sourcecredDirectoryFlag,
 } from "../common";
 
-const execDependencyGraph = require("../../../tools/execDependencyGraph")
-  .default;
+const execDependencyGraph = require("../../tools/execDependencyGraph").default;
 
 export default class PluginGraphCommand extends Command {
   static description = "load data required for SourceCred";
diff --git a/src/v3/cli/commands/start.js b/src/cli/commands/start.js
similarity index 97%
rename from src/v3/cli/commands/start.js
rename to src/cli/commands/start.js
index 9574ec6..1bed719 100644
--- a/src/v3/cli/commands/start.js
+++ b/src/cli/commands/start.js
@@ -5,7 +5,7 @@ import chalk from "chalk";
 import fs from "fs";
 import {choosePort} from "react-dev-utils/WebpackDevServerUtils";
 
-import apiApp from "../../../v3/app/apiApp";
+import apiApp from "../../app/apiApp";
 import {sourcecredDirectoryFlag} from "../common";
 
 const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 4000;
diff --git a/src/v3/cli/common.js b/src/cli/common.js
similarity index 100%
rename from src/v3/cli/common.js
rename to src/cli/common.js
diff --git a/src/v3/cli/sourcecred.js b/src/cli/sourcecred.js
similarity index 74%
rename from src/v3/cli/sourcecred.js
rename to src/cli/sourcecred.js
index d8b001c..e3f2573 100644
--- a/src/v3/cli/sourcecred.js
+++ b/src/cli/sourcecred.js
@@ -1,5 +1,5 @@
 // @flow
-require("../../tools/entry");
+require("../tools/entry");
 require("@oclif/command")
   .run()
   .catch(require("@oclif/errors/handle"));
diff --git a/src/v3/core/__snapshots__/address.test.js.snap b/src/core/__snapshots__/address.test.js.snap
similarity index 100%
rename from src/v3/core/__snapshots__/address.test.js.snap
rename to src/core/__snapshots__/address.test.js.snap
diff --git a/src/v3/core/__snapshots__/graph.test.js.snap b/src/core/__snapshots__/graph.test.js.snap
similarity index 100%
rename from src/v3/core/__snapshots__/graph.test.js.snap
rename to src/core/__snapshots__/graph.test.js.snap
diff --git a/src/v3/core/address.js b/src/core/address.js
similarity index 100%
rename from src/v3/core/address.js
rename to src/core/address.js
diff --git a/src/v3/core/address.test.js b/src/core/address.test.js
similarity index 100%
rename from src/v3/core/address.test.js
rename to src/core/address.test.js
diff --git a/src/v3/core/attribution/__snapshots__/pagerank.test.js.snap b/src/core/attribution/__snapshots__/pagerank.test.js.snap
similarity index 100%
rename from src/v3/core/attribution/__snapshots__/pagerank.test.js.snap
rename to src/core/attribution/__snapshots__/pagerank.test.js.snap
diff --git a/src/v3/core/attribution/graphToMarkovChain.js b/src/core/attribution/graphToMarkovChain.js
similarity index 100%
rename from src/v3/core/attribution/graphToMarkovChain.js
rename to src/core/attribution/graphToMarkovChain.js
diff --git a/src/v3/core/attribution/graphToMarkovChain.test.js b/src/core/attribution/graphToMarkovChain.test.js
similarity index 100%
rename from src/v3/core/attribution/graphToMarkovChain.test.js
rename to src/core/attribution/graphToMarkovChain.test.js
diff --git a/src/v3/core/attribution/markovChain.js b/src/core/attribution/markovChain.js
similarity index 100%
rename from src/v3/core/attribution/markovChain.js
rename to src/core/attribution/markovChain.js
diff --git a/src/v3/core/attribution/markovChain.test.js b/src/core/attribution/markovChain.test.js
similarity index 100%
rename from src/v3/core/attribution/markovChain.test.js
rename to src/core/attribution/markovChain.test.js
diff --git a/src/v3/core/attribution/pagerank.js b/src/core/attribution/pagerank.js
similarity index 100%
rename from src/v3/core/attribution/pagerank.js
rename to src/core/attribution/pagerank.js
diff --git a/src/v3/core/attribution/pagerank.test.js b/src/core/attribution/pagerank.test.js
similarity index 100%
rename from src/v3/core/attribution/pagerank.test.js
rename to src/core/attribution/pagerank.test.js
diff --git a/src/v3/core/graph.js b/src/core/graph.js
similarity index 100%
rename from src/v3/core/graph.js
rename to src/core/graph.js
diff --git a/src/v3/core/graph.test.js b/src/core/graph.test.js
similarity index 100%
rename from src/v3/core/graph.test.js
rename to src/core/graph.test.js
diff --git a/src/v3/core/graphTestUtil.js b/src/core/graphTestUtil.js
similarity index 100%
rename from src/v3/core/graphTestUtil.js
rename to src/core/graphTestUtil.js
diff --git a/src/v3/graphql/__snapshots__/queries.test.js.snap b/src/graphql/__snapshots__/queries.test.js.snap
similarity index 100%
rename from src/v3/graphql/__snapshots__/queries.test.js.snap
rename to src/graphql/__snapshots__/queries.test.js.snap
diff --git a/src/v3/graphql/queries.js b/src/graphql/queries.js
similarity index 100%
rename from src/v3/graphql/queries.js
rename to src/graphql/queries.js
diff --git a/src/v3/graphql/queries.test.js b/src/graphql/queries.test.js
similarity index 100%
rename from src/v3/graphql/queries.test.js
rename to src/graphql/queries.test.js
diff --git a/src/v3/plugins/git/__snapshots__/createGraph.test.js.snap b/src/plugins/git/__snapshots__/createGraph.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/__snapshots__/createGraph.test.js.snap
rename to src/plugins/git/__snapshots__/createGraph.test.js.snap
diff --git a/src/v3/plugins/git/__snapshots__/edges.test.js.snap b/src/plugins/git/__snapshots__/edges.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/__snapshots__/edges.test.js.snap
rename to src/plugins/git/__snapshots__/edges.test.js.snap
diff --git a/src/v3/plugins/git/__snapshots__/loadRepository.test.js.snap b/src/plugins/git/__snapshots__/loadRepository.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/__snapshots__/loadRepository.test.js.snap
rename to src/plugins/git/__snapshots__/loadRepository.test.js.snap
diff --git a/src/v3/plugins/git/__snapshots__/nodes.test.js.snap b/src/plugins/git/__snapshots__/nodes.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/__snapshots__/nodes.test.js.snap
rename to src/plugins/git/__snapshots__/nodes.test.js.snap
diff --git a/src/v3/plugins/git/__snapshots__/render.test.js.snap b/src/plugins/git/__snapshots__/render.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/__snapshots__/render.test.js.snap
rename to src/plugins/git/__snapshots__/render.test.js.snap
diff --git a/src/v3/plugins/git/bin/createExampleRepo.js b/src/plugins/git/bin/createExampleRepo.js
similarity index 100%
rename from src/v3/plugins/git/bin/createExampleRepo.js
rename to src/plugins/git/bin/createExampleRepo.js
diff --git a/src/v3/plugins/git/bin/loadAndPrintRepository.js b/src/plugins/git/bin/loadAndPrintRepository.js
similarity index 100%
rename from src/v3/plugins/git/bin/loadAndPrintRepository.js
rename to src/plugins/git/bin/loadAndPrintRepository.js
diff --git a/src/v3/plugins/git/cloneAndLoadRepository.js b/src/plugins/git/cloneAndLoadRepository.js
similarity index 100%
rename from src/v3/plugins/git/cloneAndLoadRepository.js
rename to src/plugins/git/cloneAndLoadRepository.js
diff --git a/src/v3/plugins/git/createGraph.js b/src/plugins/git/createGraph.js
similarity index 100%
rename from src/v3/plugins/git/createGraph.js
rename to src/plugins/git/createGraph.js
diff --git a/src/v3/plugins/git/createGraph.test.js b/src/plugins/git/createGraph.test.js
similarity index 100%
rename from src/v3/plugins/git/createGraph.test.js
rename to src/plugins/git/createGraph.test.js
diff --git a/src/v3/plugins/git/edges.js b/src/plugins/git/edges.js
similarity index 100%
rename from src/v3/plugins/git/edges.js
rename to src/plugins/git/edges.js
diff --git a/src/v3/plugins/git/edges.test.js b/src/plugins/git/edges.test.js
similarity index 100%
rename from src/v3/plugins/git/edges.test.js
rename to src/plugins/git/edges.test.js
diff --git a/src/v3/plugins/git/example/__snapshots__/exampleRepo.test.js.snap b/src/plugins/git/example/__snapshots__/exampleRepo.test.js.snap
similarity index 100%
rename from src/v3/plugins/git/example/__snapshots__/exampleRepo.test.js.snap
rename to src/plugins/git/example/__snapshots__/exampleRepo.test.js.snap
diff --git a/src/v3/plugins/git/example/example-git.json b/src/plugins/git/example/example-git.json
similarity index 100%
rename from src/v3/plugins/git/example/example-git.json
rename to src/plugins/git/example/example-git.json
diff --git a/src/v3/plugins/git/example/exampleRepo.js b/src/plugins/git/example/exampleRepo.js
similarity index 100%
rename from src/v3/plugins/git/example/exampleRepo.js
rename to src/plugins/git/example/exampleRepo.js
diff --git a/src/v3/plugins/git/example/exampleRepo.test.js b/src/plugins/git/example/exampleRepo.test.js
similarity index 100%
rename from src/v3/plugins/git/example/exampleRepo.test.js
rename to src/plugins/git/example/exampleRepo.test.js
diff --git a/src/v3/plugins/git/example/synchronizeToGithub.sh b/src/plugins/git/example/synchronizeToGithub.sh
similarity index 93%
rename from src/v3/plugins/git/example/synchronizeToGithub.sh
rename to src/plugins/git/example/synchronizeToGithub.sh
index 883dd88..21e3b15 100755
--- a/src/v3/plugins/git/example/synchronizeToGithub.sh
+++ b/src/plugins/git/example/synchronizeToGithub.sh
@@ -24,7 +24,7 @@ synchronize() (
     submodule_flag="$1"  # --submodule | --no-submodule
     remote_url="$2"
     tmpdir="$(mktemp -d)"
-    node bin/createExampleRepoV3.js "${submodule_flag}" "${tmpdir}"
+    node bin/createExampleRepo.js "${submodule_flag}" "${tmpdir}"
     (
         cd "${tmpdir}"
         git remote add upstream "${remote_url}"
diff --git a/src/v3/plugins/git/gitUtils.js b/src/plugins/git/gitUtils.js
similarity index 100%
rename from src/v3/plugins/git/gitUtils.js
rename to src/plugins/git/gitUtils.js
diff --git a/src/v3/plugins/git/graphView.js b/src/plugins/git/graphView.js
similarity index 100%
rename from src/v3/plugins/git/graphView.js
rename to src/plugins/git/graphView.js
diff --git a/src/v3/plugins/git/graphView.test.js b/src/plugins/git/graphView.test.js
similarity index 100%
rename from src/v3/plugins/git/graphView.test.js
rename to src/plugins/git/graphView.test.js
diff --git a/src/v3/plugins/git/loadGitData.js b/src/plugins/git/loadGitData.js
similarity index 100%
rename from src/v3/plugins/git/loadGitData.js
rename to src/plugins/git/loadGitData.js
diff --git a/src/v3/plugins/git/loadRepository.js b/src/plugins/git/loadRepository.js
similarity index 100%
rename from src/v3/plugins/git/loadRepository.js
rename to src/plugins/git/loadRepository.js
diff --git a/src/v3/plugins/git/loadRepository.test.js b/src/plugins/git/loadRepository.test.js
similarity index 100%
rename from src/v3/plugins/git/loadRepository.test.js
rename to src/plugins/git/loadRepository.test.js
diff --git a/src/v3/plugins/git/loadRepositoryTest.sh b/src/plugins/git/loadRepositoryTest.sh
similarity index 87%
rename from src/v3/plugins/git/loadRepositoryTest.sh
rename to src/plugins/git/loadRepositoryTest.sh
index 23f5e2c..f156b64 100755
--- a/src/v3/plugins/git/loadRepositoryTest.sh
+++ b/src/plugins/git/loadRepositoryTest.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-data_file=src/v3/plugins/git/example/example-git.json
+data_file=src/plugins/git/example/example-git.json
 
 usage() {
   printf 'usage: %s [-u|--updateSnapshot] [--help]\n' "$0"
@@ -18,8 +18,8 @@ usage() {
 
 fetch() {
   tmpdir="$(mktemp -d)"
-  node bin/createExampleRepoV3.js "${tmpdir}"
-  node bin/loadAndPrintGitRepositoryV3.js "${tmpdir}"
+  node bin/createExampleRepo.js "${tmpdir}"
+  node bin/loadAndPrintGitRepository.js "${tmpdir}"
   rm -rf "${tmpdir}"
 }
 
diff --git a/src/v3/plugins/git/nodes.js b/src/plugins/git/nodes.js
similarity index 100%
rename from src/v3/plugins/git/nodes.js
rename to src/plugins/git/nodes.js
diff --git a/src/v3/plugins/git/nodes.test.js b/src/plugins/git/nodes.test.js
similarity index 100%
rename from src/v3/plugins/git/nodes.test.js
rename to src/plugins/git/nodes.test.js
diff --git a/src/v3/plugins/git/pluginAdapter.js b/src/plugins/git/pluginAdapter.js
similarity index 100%
rename from src/v3/plugins/git/pluginAdapter.js
rename to src/plugins/git/pluginAdapter.js
diff --git a/src/v3/plugins/git/render.js b/src/plugins/git/render.js
similarity index 100%
rename from src/v3/plugins/git/render.js
rename to src/plugins/git/render.js
diff --git a/src/v3/plugins/git/render.test.js b/src/plugins/git/render.test.js
similarity index 100%
rename from src/v3/plugins/git/render.test.js
rename to src/plugins/git/render.test.js
diff --git a/src/v3/plugins/git/types.js b/src/plugins/git/types.js
similarity index 100%
rename from src/v3/plugins/git/types.js
rename to src/plugins/git/types.js
diff --git a/src/v3/plugins/github/__snapshots__/createGraph.test.js.snap b/src/plugins/github/__snapshots__/createGraph.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/createGraph.test.js.snap
rename to src/plugins/github/__snapshots__/createGraph.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/edges.test.js.snap b/src/plugins/github/__snapshots__/edges.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/edges.test.js.snap
rename to src/plugins/github/__snapshots__/edges.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/graphView.test.js.snap b/src/plugins/github/__snapshots__/graphView.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/graphView.test.js.snap
rename to src/plugins/github/__snapshots__/graphView.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/graphql.test.js.snap b/src/plugins/github/__snapshots__/graphql.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/graphql.test.js.snap
rename to src/plugins/github/__snapshots__/graphql.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/nodes.test.js.snap b/src/plugins/github/__snapshots__/nodes.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/nodes.test.js.snap
rename to src/plugins/github/__snapshots__/nodes.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/relationalView.test.js.snap b/src/plugins/github/__snapshots__/relationalView.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/relationalView.test.js.snap
rename to src/plugins/github/__snapshots__/relationalView.test.js.snap
diff --git a/src/v3/plugins/github/__snapshots__/render.test.js.snap b/src/plugins/github/__snapshots__/render.test.js.snap
similarity index 100%
rename from src/v3/plugins/github/__snapshots__/render.test.js.snap
rename to src/plugins/github/__snapshots__/render.test.js.snap
diff --git a/src/v3/plugins/github/bin/fetchAndPrintGithubRepo.js b/src/plugins/github/bin/fetchAndPrintGithubRepo.js
similarity index 100%
rename from src/v3/plugins/github/bin/fetchAndPrintGithubRepo.js
rename to src/plugins/github/bin/fetchAndPrintGithubRepo.js
diff --git a/src/v3/plugins/github/createGraph.js b/src/plugins/github/createGraph.js
similarity index 100%
rename from src/v3/plugins/github/createGraph.js
rename to src/plugins/github/createGraph.js
diff --git a/src/v3/plugins/github/createGraph.test.js b/src/plugins/github/createGraph.test.js
similarity index 100%
rename from src/v3/plugins/github/createGraph.test.js
rename to src/plugins/github/createGraph.test.js
diff --git a/src/v3/plugins/github/edges.js b/src/plugins/github/edges.js
similarity index 100%
rename from src/v3/plugins/github/edges.js
rename to src/plugins/github/edges.js
diff --git a/src/v3/plugins/github/edges.test.js b/src/plugins/github/edges.test.js
similarity index 100%
rename from src/v3/plugins/github/edges.test.js
rename to src/plugins/github/edges.test.js
diff --git a/src/v3/plugins/github/example/README.md b/src/plugins/github/example/README.md
similarity index 100%
rename from src/v3/plugins/github/example/README.md
rename to src/plugins/github/example/README.md
diff --git a/src/v3/plugins/github/example/example-github.json b/src/plugins/github/example/example-github.json
similarity index 100%
rename from src/v3/plugins/github/example/example-github.json
rename to src/plugins/github/example/example-github.json
diff --git a/src/v3/plugins/github/example/example.js b/src/plugins/github/example/example.js
similarity index 100%
rename from src/v3/plugins/github/example/example.js
rename to src/plugins/github/example/example.js
diff --git a/src/v3/plugins/github/fetchGithubRepo.js b/src/plugins/github/fetchGithubRepo.js
similarity index 100%
rename from src/v3/plugins/github/fetchGithubRepo.js
rename to src/plugins/github/fetchGithubRepo.js
diff --git a/src/v3/plugins/github/fetchGithubRepoTest.sh b/src/plugins/github/fetchGithubRepoTest.sh
similarity index 93%
rename from src/v3/plugins/github/fetchGithubRepoTest.sh
rename to src/plugins/github/fetchGithubRepoTest.sh
index acc93a3..be84c26 100755
--- a/src/v3/plugins/github/fetchGithubRepoTest.sh
+++ b/src/plugins/github/fetchGithubRepoTest.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-data_file=src/v3/plugins/github/example/example-github.json
+data_file=src//plugins/github/example/example-github.json
 
 usage() {
   printf 'usage: %s [-u|--updateSnapshot] [--[no-]build] [--help]\n' "$0"
@@ -24,7 +24,7 @@ fetch() {
     printf >&2 'to a 40-character hex string API token from GitHub.\n'
     return 1
   fi
-  node bin/fetchAndPrintGithubRepoV3.js \
+  node bin/fetchAndPrintGithubRepo.js \
     sourcecred example-github "${GITHUB_TOKEN}"
 }
 
diff --git a/src/v3/plugins/github/graphView.js b/src/plugins/github/graphView.js
similarity index 100%
rename from src/v3/plugins/github/graphView.js
rename to src/plugins/github/graphView.js
diff --git a/src/v3/plugins/github/graphView.test.js b/src/plugins/github/graphView.test.js
similarity index 100%
rename from src/v3/plugins/github/graphView.test.js
rename to src/plugins/github/graphView.test.js
diff --git a/src/v3/plugins/github/graphql.js b/src/plugins/github/graphql.js
similarity index 100%
rename from src/v3/plugins/github/graphql.js
rename to src/plugins/github/graphql.js
diff --git a/src/v3/plugins/github/graphql.test.js b/src/plugins/github/graphql.test.js
similarity index 100%
rename from src/v3/plugins/github/graphql.test.js
rename to src/plugins/github/graphql.test.js
diff --git a/src/v3/plugins/github/loadGithubData.js b/src/plugins/github/loadGithubData.js
similarity index 100%
rename from src/v3/plugins/github/loadGithubData.js
rename to src/plugins/github/loadGithubData.js
diff --git a/src/v3/plugins/github/nodes.js b/src/plugins/github/nodes.js
similarity index 100%
rename from src/v3/plugins/github/nodes.js
rename to src/plugins/github/nodes.js
diff --git a/src/v3/plugins/github/nodes.test.js b/src/plugins/github/nodes.test.js
similarity index 100%
rename from src/v3/plugins/github/nodes.test.js
rename to src/plugins/github/nodes.test.js
diff --git a/src/v3/plugins/github/parseMarkdown.js b/src/plugins/github/parseMarkdown.js
similarity index 100%
rename from src/v3/plugins/github/parseMarkdown.js
rename to src/plugins/github/parseMarkdown.js
diff --git a/src/v3/plugins/github/parseMarkdown.test.js b/src/plugins/github/parseMarkdown.test.js
similarity index 100%
rename from src/v3/plugins/github/parseMarkdown.test.js
rename to src/plugins/github/parseMarkdown.test.js
diff --git a/src/v3/plugins/github/parseReferences.js b/src/plugins/github/parseReferences.js
similarity index 100%
rename from src/v3/plugins/github/parseReferences.js
rename to src/plugins/github/parseReferences.js
diff --git a/src/v3/plugins/github/parseReferences.test.js b/src/plugins/github/parseReferences.test.js
similarity index 100%
rename from src/v3/plugins/github/parseReferences.test.js
rename to src/plugins/github/parseReferences.test.js
diff --git a/src/v3/plugins/github/pluginAdapter.js b/src/plugins/github/pluginAdapter.js
similarity index 100%
rename from src/v3/plugins/github/pluginAdapter.js
rename to src/plugins/github/pluginAdapter.js
diff --git a/src/v3/plugins/github/relationalView.js b/src/plugins/github/relationalView.js
similarity index 100%
rename from src/v3/plugins/github/relationalView.js
rename to src/plugins/github/relationalView.js
diff --git a/src/v3/plugins/github/relationalView.test.js b/src/plugins/github/relationalView.test.js
similarity index 100%
rename from src/v3/plugins/github/relationalView.test.js
rename to src/plugins/github/relationalView.test.js
diff --git a/src/v3/plugins/github/render.js b/src/plugins/github/render.js
similarity index 100%
rename from src/v3/plugins/github/render.js
rename to src/plugins/github/render.js
diff --git a/src/v3/plugins/github/render.test.js b/src/plugins/github/render.test.js
similarity index 100%
rename from src/v3/plugins/github/render.test.js
rename to src/plugins/github/render.test.js
diff --git a/src/v3/plugins/github/urlIdParse.js b/src/plugins/github/urlIdParse.js
similarity index 100%
rename from src/v3/plugins/github/urlIdParse.js
rename to src/plugins/github/urlIdParse.js
diff --git a/src/v3/plugins/github/urlIdParse.test.js b/src/plugins/github/urlIdParse.test.js
similarity index 100%
rename from src/v3/plugins/github/urlIdParse.test.js
rename to src/plugins/github/urlIdParse.test.js
diff --git a/src/v3/util/compat.js b/src/util/compat.js
similarity index 100%
rename from src/v3/util/compat.js
rename to src/util/compat.js
diff --git a/src/v3/util/compat.test.js b/src/util/compat.test.js
similarity index 100%
rename from src/v3/util/compat.test.js
rename to src/util/compat.test.js