diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts
new file mode 100644
index 0000000000..e8406231a5
--- /dev/null
+++ b/packages/cli/src/commands/index.ts
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CommanderStatic } from 'commander';
+import { exitWithError } from '../lib/errors';
+
+export function registerCommands(program: CommanderStatic) {
+  program
+    .command('app:build')
+    .description('Build an app for a production release')
+    .option('--stats', 'Write bundle stats to output directory')
+    .action(lazy(() => import('./app/build').then(m => m.default)));
+
+  program
+    .command('app:serve')
+    .description('Serve an app for local development')
+    .option('--check', 'Enable type checking and linting')
+    .action(lazy(() => import('./app/serve').then(m => m.default)));
+
+  program
+    .command('backend:build')
+    .description('Build a backend plugin')
+    .action(lazy(() => import('./backend/build').then(m => m.default)));
+
+  program
+    .command('backend:build-image <image-tag>')
+    .description(
+      'Builds a docker image from the package, with all local deps included',
+    )
+    .action(lazy(() => import('./backend/buildImage').then(m => m.default)));
+
+  program
+    .command('backend:dev')
+    .description('Start local development server with HMR for the backend')
+    .option('--check', 'Enable type checking and linting')
+    .option('--inspect', 'Enable debugger')
+    .action(lazy(() => import('./backend/dev').then(m => m.default)));
+
+  program
+    .command('app:diff')
+    .option('--check', 'Fail if changes are required')
+    .option('--yes', 'Apply all changes')
+    .description('Diff an existing app with the creation template')
+    .action(lazy(() => import('./app/diff').then(m => m.default)));
+
+  program
+    .command('create-plugin')
+    .description('Creates a new plugin in the current repository')
+    .action(
+      lazy(() => import('./create-plugin/createPlugin').then(m => m.default)),
+    );
+
+  program
+    .command('remove-plugin')
+    .description('Removes plugin in the current repository')
+    .action(
+      lazy(() => import('./remove-plugin/removePlugin').then(m => m.default)),
+    );
+
+  program
+    .command('plugin:build')
+    .description('Build a plugin')
+    .action(lazy(() => import('./plugin/build').then(m => m.default)));
+
+  program
+    .command('plugin:serve')
+    .description('Serves the dev/ folder of a plugin')
+    .option('--check', 'Enable type checking and linting')
+    .action(lazy(() => import('./plugin/serve').then(m => m.default)));
+
+  program
+    .command('plugin:export')
+    .description('Exports the dev/ folder of a plugin')
+    .option('--stats', 'Write bundle stats to output directory')
+    .action(lazy(() => import('./plugin/export').then(m => m.default)));
+
+  program
+    .command('plugin:diff')
+    .option('--check', 'Fail if changes are required')
+    .option('--yes', 'Apply all changes')
+    .description('Diff an existing plugin with the creation template')
+    .action(lazy(() => import('./plugin/diff').then(m => m.default)));
+
+  program
+    .command('build')
+    .description('Build a package for publishing')
+    .option('--outputs <formats>', 'List of formats to output [types,cjs,esm]')
+    .action(lazy(() => import('./build').then(m => m.default)));
+
+  program
+    .command('lint')
+    .option(
+      '--format <format>',
+      'Lint report output format',
+      'eslint-formatter-friendly',
+    )
+    .option('--fix', 'Attempt to automatically fix violations')
+    .description('Lint a package')
+    .action(lazy(() => import('./lint').then(m => m.default)));
+
+  program
+    .command('test')
+    .allowUnknownOption(true) // Allows the command to run, but we still need to parse raw args
+    .helpOption(', --backstage-cli-help') // Let Jest handle help
+    .description('Run tests, forwarding args to Jest, defaulting to watch mode')
+    .action(lazy(() => import('./testCommand').then(m => m.default)));
+
+  program
+    .command('config:print')
+    .option('--with-secrets', 'Include secrets in the printed configuration')
+    .option(
+      '--env <env>',
+      'The environment to print configuration for [NODE_ENV or development]',
+    )
+    .option(
+      '--format <format>',
+      'Format to print the configuration in, either json or yaml [yaml]',
+    )
+    .description('Print the app configuration for the current package')
+    .action(lazy(() => import('./config/print').then(m => m.default)));
+
+  program
+    .command('prepack')
+    .description('Prepares a package for packaging before publishing')
+    .action(lazy(() => import('./pack').then(m => m.pre)));
+
+  program
+    .command('postpack')
+    .description('Restores the changes made by the prepack command')
+    .action(lazy(() => import('./pack').then(m => m.post)));
+
+  program
+    .command('clean')
+    .description('Delete cache directories')
+    .action(lazy(() => import('./clean/clean').then(m => m.default)));
+
+  program
+    .command('build-workspace <workspace-dir> ...<packages>')
+    .description('Builds a temporary dist workspace from the provided packages')
+    .action(lazy(() => import('./buildWorkspace').then(m => m.default)));
+}
+
+// Wraps an action function so that it always exits and handles errors
+function lazy(
+  getActionFunc: () => Promise<(...args: any[]) => Promise<void>>,
+): (...args: any[]) => Promise<never> {
+  return async (...args: any[]) => {
+    try {
+      const actionFunc = await getActionFunc();
+      await actionFunc(...args);
+      process.exit(0);
+    } catch (error) {
+      exitWithError(error);
+    }
+  };
+}
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 9fb909592b..e278164f4c 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -18,151 +18,12 @@ import program from 'commander';
 import chalk from 'chalk';
 import { exitWithError } from './lib/errors';
 import { version } from './lib/version';
+import { registerCommands } from './commands';
 
 const main = (argv: string[]) => {
   program.name('backstage-cli').version(version);
 
-  program
-    .command('app:build')
-    .description('Build an app for a production release')
-    .option('--stats', 'Write bundle stats to output directory')
-    .action(lazyAction(() => import('./commands/app/build'), 'default'));
-
-  program
-    .command('app:serve')
-    .description('Serve an app for local development')
-    .option('--check', 'Enable type checking and linting')
-    .action(lazyAction(() => import('./commands/app/serve'), 'default'));
-
-  program
-    .command('backend:build')
-    .description('Build a backend plugin')
-    .action(lazyAction(() => import('./commands/backend/build'), 'default'));
-
-  program
-    .command('backend:build-image <image-tag>')
-    .description(
-      'Builds a docker image from the package, with all local deps included',
-    )
-    .action(
-      lazyAction(() => import('./commands/backend/buildImage'), 'default'),
-    );
-
-  program
-    .command('backend:dev')
-    .description('Start local development server with HMR for the backend')
-    .option('--check', 'Enable type checking and linting')
-    .option('--inspect', 'Enable debugger')
-    .action(lazyAction(() => import('./commands/backend/dev'), 'default'));
-
-  program
-    .command('app:diff')
-    .option('--check', 'Fail if changes are required')
-    .option('--yes', 'Apply all changes')
-    .description('Diff an existing app with the creation template')
-    .action(lazyAction(() => import('./commands/app/diff'), 'default'));
-
-  program
-    .command('create-plugin')
-    .description('Creates a new plugin in the current repository')
-    .action(
-      lazyAction(
-        () => import('./commands/create-plugin/createPlugin'),
-        'default',
-      ),
-    );
-
-  program
-    .command('remove-plugin')
-    .description('Removes plugin in the current repository')
-    .action(
-      lazyAction(
-        () => import('./commands/remove-plugin/removePlugin'),
-        'default',
-      ),
-    );
-
-  program
-    .command('plugin:build')
-    .description('Build a plugin')
-    .action(lazyAction(() => import('./commands/plugin/build'), 'default'));
-
-  program
-    .command('plugin:serve')
-    .description('Serves the dev/ folder of a plugin')
-    .option('--check', 'Enable type checking and linting')
-    .action(lazyAction(() => import('./commands/plugin/serve'), 'default'));
-
-  program
-    .command('plugin:export')
-    .description('Exports the dev/ folder of a plugin')
-    .option('--stats', 'Write bundle stats to output directory')
-    .action(lazyAction(() => import('./commands/plugin/export'), 'default'));
-
-  program
-    .command('plugin:diff')
-    .option('--check', 'Fail if changes are required')
-    .option('--yes', 'Apply all changes')
-    .description('Diff an existing plugin with the creation template')
-    .action(lazyAction(() => import('./commands/plugin/diff'), 'default'));
-
-  program
-    .command('build')
-    .description('Build a package for publishing')
-    .option('--outputs <formats>', 'List of formats to output [types,cjs,esm]')
-    .action(lazyAction(() => import('./commands/build'), 'default'));
-
-  program
-    .command('lint')
-    .option(
-      '--format <format>',
-      'Lint report output format',
-      'eslint-formatter-friendly',
-    )
-    .option('--fix', 'Attempt to automatically fix violations')
-    .description('Lint a package')
-    .action(lazyAction(() => import('./commands/lint'), 'default'));
-
-  program
-    .command('test')
-    .allowUnknownOption(true) // Allows the command to run, but we still need to parse raw args
-    .helpOption(', --backstage-cli-help') // Let Jest handle help
-    .description('Run tests, forwarding args to Jest, defaulting to watch mode')
-    .action(lazyAction(() => import('./commands/testCommand'), 'default'));
-
-  program
-    .command('config:print')
-    .option('--with-secrets', 'Include secrets in the printed configuration')
-    .option(
-      '--env <env>',
-      'The environment to print configuration for [NODE_ENV or development]',
-    )
-    .option(
-      '--format <format>',
-      'Format to print the configuration in, either json or yaml [yaml]',
-    )
-    .description('Print the app configuration for the current package')
-    .action(lazyAction(() => import('./commands/config/print'), 'default'));
-
-  program
-    .command('prepack')
-    .description('Prepares a package for packaging before publishing')
-    .action(lazyAction(() => import('./commands/pack'), 'pre'));
-
-  program
-    .command('postpack')
-    .description('Restores the changes made by the prepack command')
-    .action(lazyAction(() => import('./commands/pack'), 'post'));
-
-  program
-    .command('clean')
-    .description('Delete cache directories')
-    .action(lazyAction(() => import('./commands/clean/clean'), 'default'));
-
-  program
-    .command('build-workspace <workspace-dir> ...<packages>')
-    .description('Builds a temporary dist workspace from the provided packages')
-    .action(lazyAction(() => import('./commands/buildWorkspace'), 'default'));
+  registerCommands(program);
 
   program.on('command:*', () => {
     console.log();
@@ -181,25 +42,6 @@ const main = (argv: string[]) => {
   program.parse(argv);
 };
 
-// Wraps an action function so that it always exits and handles errors
-function lazyAction<T extends readonly any[], Export extends string>(
-  actionRequireFunc: () => Promise<
-    { [name in Export]: (...args: T) => Promise<any> }
-  >,
-  exportName: Export,
-): (...args: T) => Promise<never> {
-  return async (...args: T) => {
-    try {
-      const module = await actionRequireFunc();
-      const actionFunc = module[exportName];
-      await actionFunc(...args);
-      process.exit(0);
-    } catch (error) {
-      exitWithError(error);
-    }
-  };
-}
-
 process.on('unhandledRejection', rejection => {
   if (rejection instanceof Error) {
     exitWithError(rejection);