diff --git a/plugins/home/src/templates/DefaultTemplate.stories.tsx b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
similarity index 95%
rename from plugins/home/src/templates/DefaultTemplate.stories.tsx
rename to packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
index e2e570dcf6..b2f6034709 100644
--- a/plugins/home/src/templates/DefaultTemplate.stories.tsx
+++ b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx
@@ -20,8 +20,8 @@ import {
   HomePageToolkit,
   HomePageCompanyLogo,
   HomePageStarredEntities,
-} from '../plugin';
-import { wrapInTestApp, TestApiProvider} from '@backstage/test-utils';
+} from '@backstage/plugin-home';
+import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils';
 import { Content, Page, InfoCard } from '@backstage/core-components';
 import {
   starredEntitiesApiRef,
@@ -32,10 +32,9 @@ import { configApiRef } from '@backstage/core-plugin-api';
 import { ConfigReader } from '@backstage/config';
 import {
   HomePageSearchBar,
-  SearchContextProvider,
-  searchApiRef,
   searchPlugin,
 } from '@backstage/plugin-search';
+import { searchApiRef, SearchContextProvider } from '@backstage/plugin-search-react';
 import { HomePageStackOverflowQuestions } from '@backstage/plugin-stack-overflow';
 import { Grid, makeStyles } from '@material-ui/core';
 import React, { ComponentType } from 'react';
@@ -54,10 +53,7 @@ export default {
         <>
           <TestApiProvider
             apis={[
-              [
-                starredEntitiesApiRef,
-                starredEntitiesApi,
-              ],
+              [starredEntitiesApiRef, starredEntitiesApi],
               [searchApiRef, { query: () => Promise.resolve({ results: [] }) }],
               [
                 configApiRef,
diff --git a/plugins/home/src/templates/TemplateBackstageLogo.tsx b/packages/app/src/components/home/templates/TemplateBackstageLogo.tsx
similarity index 100%
rename from plugins/home/src/templates/TemplateBackstageLogo.tsx
rename to packages/app/src/components/home/templates/TemplateBackstageLogo.tsx
diff --git a/plugins/home/src/templates/TemplateBackstageLogoIcon.tsx b/packages/app/src/components/home/templates/TemplateBackstageLogoIcon.tsx
similarity index 100%
rename from plugins/home/src/templates/TemplateBackstageLogoIcon.tsx
rename to packages/app/src/components/home/templates/TemplateBackstageLogoIcon.tsx
diff --git a/plugins/home/src/templates/index.ts b/packages/app/src/components/home/templates/index.ts
similarity index 100%
rename from plugins/home/src/templates/index.ts
rename to packages/app/src/components/home/templates/index.ts
diff --git a/storybook/.storybook/main.js b/storybook/.storybook/main.js
index 2356e4e41b..8ed4949cf3 100644
--- a/storybook/.storybook/main.js
+++ b/storybook/.storybook/main.js
@@ -6,6 +6,7 @@ const WebpackPluginFailBuildOnWarning = require('./webpack-plugin-fail-build-on-
  */
 const BACKSTAGE_CORE_STORIES = [
   'packages/core-components',
+  'packages/app',
   'plugins/org',
   'plugins/search',
   'plugins/home',