diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f956ca4dca..751ec4914d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,4 +6,4 @@
 
 *                     @spotify/backstage-core
 /plugins/techdocs     @spotify/techdocs-core
-/plugins/techdocs-cli @spotify/techdocs-core
+/packages/techdocs-cli @spotify/techdocs-core
diff --git a/packages/techdocs-cli/techdocs-cli/.eslintrc.js b/packages/techdocs-cli/.eslintrc.js
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/.eslintrc.js
rename to packages/techdocs-cli/.eslintrc.js
diff --git a/packages/techdocs-cli/techdocs-cli/README.md b/packages/techdocs-cli/README.md
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/README.md
rename to packages/techdocs-cli/README.md
diff --git a/packages/techdocs-cli/techdocs-cli/dev/index.tsx b/packages/techdocs-cli/dev/index.tsx
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/dev/index.tsx
rename to packages/techdocs-cli/dev/index.tsx
diff --git a/packages/techdocs-cli/techdocs-cli/package.json b/packages/techdocs-cli/package.json
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/package.json
rename to packages/techdocs-cli/package.json
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/ExampleComponent.test.tsx b/packages/techdocs-cli/src/components/ExampleComponent/ExampleComponent.test.tsx
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/ExampleComponent.test.tsx
rename to packages/techdocs-cli/src/components/ExampleComponent/ExampleComponent.test.tsx
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/ExampleComponent.tsx b/packages/techdocs-cli/src/components/ExampleComponent/ExampleComponent.tsx
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/ExampleComponent.tsx
rename to packages/techdocs-cli/src/components/ExampleComponent/ExampleComponent.tsx
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/index.ts b/packages/techdocs-cli/src/components/ExampleComponent/index.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleComponent/index.ts
rename to packages/techdocs-cli/src/components/ExampleComponent/index.ts
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx b/packages/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx
rename to packages/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx b/packages/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx
rename to packages/techdocs-cli/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx
diff --git a/packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/index.ts b/packages/techdocs-cli/src/components/ExampleFetchComponent/index.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/components/ExampleFetchComponent/index.ts
rename to packages/techdocs-cli/src/components/ExampleFetchComponent/index.ts
diff --git a/packages/techdocs-cli/techdocs-cli/src/index.ts b/packages/techdocs-cli/src/index.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/index.ts
rename to packages/techdocs-cli/src/index.ts
diff --git a/packages/techdocs-cli/techdocs-cli/src/plugin.test.ts b/packages/techdocs-cli/src/plugin.test.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/plugin.test.ts
rename to packages/techdocs-cli/src/plugin.test.ts
diff --git a/packages/techdocs-cli/techdocs-cli/src/plugin.ts b/packages/techdocs-cli/src/plugin.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/plugin.ts
rename to packages/techdocs-cli/src/plugin.ts
diff --git a/packages/techdocs-cli/techdocs-cli/src/setupTests.ts b/packages/techdocs-cli/src/setupTests.ts
similarity index 100%
rename from packages/techdocs-cli/techdocs-cli/src/setupTests.ts
rename to packages/techdocs-cli/src/setupTests.ts