diff --git a/packages/cli/src/lib/codeowners/codeowners.test.ts b/packages/cli/src/modules/new/lib/codeowners/codeowners.test.ts
similarity index 100%
rename from packages/cli/src/lib/codeowners/codeowners.test.ts
rename to packages/cli/src/modules/new/lib/codeowners/codeowners.test.ts
diff --git a/packages/cli/src/lib/codeowners/codeowners.ts b/packages/cli/src/modules/new/lib/codeowners/codeowners.ts
similarity index 98%
rename from packages/cli/src/lib/codeowners/codeowners.ts
rename to packages/cli/src/modules/new/lib/codeowners/codeowners.ts
index 5734be95b8..32a38a71c7 100644
--- a/packages/cli/src/lib/codeowners/codeowners.ts
+++ b/packages/cli/src/modules/new/lib/codeowners/codeowners.ts
@@ -16,7 +16,7 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import { paths } from '../paths';
+import { paths } from '../../../../lib/paths';
 
 const TEAM_ID_RE = /^@[-\w]+\/[-\w]+$/;
 const USER_ID_RE = /^@[-\w]+$/;
diff --git a/packages/cli/src/lib/codeowners/index.ts b/packages/cli/src/modules/new/lib/codeowners/index.ts
similarity index 100%
rename from packages/cli/src/lib/codeowners/index.ts
rename to packages/cli/src/modules/new/lib/codeowners/index.ts
diff --git a/packages/cli/src/modules/new/lib/execution/executePortableTemplate.ts b/packages/cli/src/modules/new/lib/execution/executePortableTemplate.ts
index cb076f3aa0..039575128e 100644
--- a/packages/cli/src/modules/new/lib/execution/executePortableTemplate.ts
+++ b/packages/cli/src/modules/new/lib/execution/executePortableTemplate.ts
@@ -15,7 +15,7 @@
  */
 
 import { assertError } from '@backstage/errors';
-import { addCodeownersEntry } from '../../../../lib/codeowners';
+import { addCodeownersEntry } from '../codeowners';
 import { Task } from '../../../../lib/tasks';
 import {
   PortableTemplate,
diff --git a/packages/cli/src/modules/new/lib/preparation/collectPortableTemplateInput.ts b/packages/cli/src/modules/new/lib/preparation/collectPortableTemplateInput.ts
index 23a30721b0..38e8eaddba 100644
--- a/packages/cli/src/modules/new/lib/preparation/collectPortableTemplateInput.ts
+++ b/packages/cli/src/modules/new/lib/preparation/collectPortableTemplateInput.ts
@@ -15,10 +15,7 @@
  */
 
 import inquirer, { DistinctQuestion } from 'inquirer';
-import {
-  getCodeownersFilePath,
-  parseOwnerIds,
-} from '../../../../lib/codeowners';
+import { getCodeownersFilePath, parseOwnerIds } from '../codeowners';
 import { paths } from '../../../../lib/paths';
 import {
   PortableTemplateConfig,