diff --git a/amplify/auth/resource.ts b/amplify/auth/resource.ts
index ff12e84e..0091aec5 100644
--- a/amplify/auth/resource.ts
+++ b/amplify/auth/resource.ts
@@ -1,14 +1,13 @@
 import { DeepPartialAmplifyGeneratedConfigs } from '@aws-amplify/plugin-types';
 import { ClientConfig } from '@aws-amplify/client-config';
 
-const userPoolId = process.env.USER_POOL_ID!;
-const userPoolClientId = process.env.USER_POOL_CLIENT_ID ?? '67ts78qj65gn6l68kvae5gbcor'; // temporary hardcoded ID, remove once we can deploy the app
-const hostedLoginDomain = process.env.HOSTED_LOGIN_DOMAIN!;
+const userPoolId = process.env.USER_POOL_ID;
+const userPoolClientId = process.env.USER_POOL_CLIENT_ID;
+const hostedLoginDomain = process.env.HOSTED_LOGIN_DOMAIN ?? 'no-domain';
 
-const appId = process.env.AWS_APP_ID!;
-const group = process.env.NOTIFY_GROUP!;
-const subdomain = process.env.NOTIFY_SUBDOMAIN!;
-const domainName = process.env.NOTIFY_DOMAIN_NAME!;
+const appId = process.env.AWS_APP_ID;
+const subdomain = process.env.NOTIFY_SUBDOMAIN;
+const domainName = process.env.NOTIFY_DOMAIN_NAME;
 
 export const authConfig: DeepPartialAmplifyGeneratedConfigs<ClientConfig> = {
   auth: {
@@ -28,12 +27,10 @@ export const authConfig: DeepPartialAmplifyGeneratedConfigs<ClientConfig> = {
       'redirect_sign_in_uri': [
         `https://${subdomain}.${appId}.amplifyapp.com/auth/`,
         `https://${subdomain}.${domainName}/auth/`,
-        ...(group === 'nonprod' ? ['http://localhost:3000/auth/']: [])
       ],
       'redirect_sign_out_uri': [
         `https://${subdomain}.${appId}.amplifyapp.com/`,
         `https://${subdomain}.${domainName}/`,
-        ...(group === 'nonprod' ? ['http://localhost:3000/']: [])
       ],
       'response_type': 'code'
     },
diff --git a/app/layout.tsx b/app/layout.tsx
deleted file mode 100644
index 3ef7e61b..00000000
--- a/app/layout.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-'use client';
-
-import React from 'react';
-import { Authenticator } from '@aws-amplify/ui-react';
-import '@aws-amplify/ui-react/styles.css';
-import { Col, Container, Footer, Header, Row } from 'nhsuk-react-components';
-
-import ConfigureAmplifyClientSide from '../components/ConfigureAmplify';
-import LoginStatus from '../components/LoginStatus';
-
-import 'nhsuk-frontend/dist/nhsuk.css';
-import './styles.css';
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <html lang='en'>
-      <body>
-        <Authenticator.Provider>
-          <ConfigureAmplifyClientSide />
-          <Header serviceName='Notify'>
-            <Header.Container>
-              <Header.Logo href='/' />
-              <Header.Content>
-                <LoginStatus />
-              </Header.Content>
-            </Header.Container>
-            <Header.Nav>
-              {/* <Header.NavItem href="/conditions"> */}
-              {/*  Health A-Z */}
-              {/* </Header.NavItem> */}
-              <Header.NavItem home href='/'>
-                Home
-              </Header.NavItem>
-              <Header.NavDropdownMenu />
-            </Header.Nav>
-          </Header>
-          <Container>
-            <main className='nhsuk-main-wrapper' id='maincontent' role='main'>
-              <Row>
-                <Col width='full'>{children}</Col>
-              </Row>
-            </main>
-          </Container>
-          <Footer>
-            <Footer.List>
-              <Footer.ListItem href='https://www.nhs.uk/nhs-sites/'>
-                NHS sites
-              </Footer.ListItem>
-              <Footer.ListItem href='https://www.nhs.uk/about-us/'>
-                About us
-              </Footer.ListItem>
-              <Footer.ListItem href='https://www.nhs.uk/contact-us/'>
-                Contact us
-              </Footer.ListItem>
-              <Footer.ListItem href='https://www.nhs.uk/about-us/sitemap/'>
-                Sitemap
-              </Footer.ListItem>
-              <Footer.ListItem href='https://www.nhs.uk/our-policies/'>
-                Our policies
-              </Footer.ListItem>
-            </Footer.List>
-            <Footer.Copyright>© Crown copyright</Footer.Copyright>
-          </Footer>
-        </Authenticator.Provider>
-      </body>
-    </html>
-  );
-}
diff --git a/app/page.tsx b/app/page.tsx
deleted file mode 100644
index c5c264d5..00000000
--- a/app/page.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-'use client';
-
-import React, { Suspense } from 'react';
-import Login from '../components/Login';
-
-export default function Page() {
-  return (
-    <Suspense>
-      <Login />
-    </Suspense>
-  );
-}
diff --git a/app/styles.css b/app/styles.css
deleted file mode 100644
index e7263db3..00000000
--- a/app/styles.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.nhsuk-header__content {
-  flex-grow: 100;
-  text-align: right;
-}
-
-div.nhsuk-header__content > li.nhsuk-header__navigation-item {
-  list-style: none;
-}
-
-div.nhsuk-header__content > li.nhsuk-header__navigation-item > a {
-  padding: 0;
-  display: inline-block;
-}
diff --git a/components/ConfigureAmplify.tsx b/components/ConfigureAmplify.tsx
deleted file mode 100644
index a5412ecb..00000000
--- a/components/ConfigureAmplify.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-'use client';
-
-import { initAmplify } from '../utils/amplify-init';
-
-initAmplify();
-
-export default function ConfigureAmplifyClientSide() {
-  return null;
-}
diff --git a/components/Logout.tsx b/components/Logout.tsx
deleted file mode 100644
index 458efe66..00000000
--- a/components/Logout.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-'use client';
-
-import { Button } from 'nhsuk-react-components';
-import { signOut } from '@aws-amplify/auth';
-
-export default function Logout() {
-  const handleSignOut = async () => {
-    await signOut();
-    location.href = '/';
-  };
-
-  return <Button onClick={handleSignOut}>Sign out</Button>;
-}
diff --git a/infrastructure/terraform/README b/infrastructure/terraform/README
deleted file mode 100644
index 838d1775..00000000
--- a/infrastructure/terraform/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This is an implementation of https://github.com/tfutils/tfscaffold for NHS Notify
-
-Update the `etc/global.tfvars` file according to your NHS Notify Domain, and follow https://github.com/tfutils/tfscaffold?tab=readme-ov-file#bootstrapping to get your tfstate s3 bucket set up
diff --git a/infrastructure/terraform/components/.gitkeep b/infrastructure/terraform/components/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/infrastructure/terraform/components/acct/README b/infrastructure/terraform/components/acct/README
deleted file mode 100644
index d2148877..00000000
--- a/infrastructure/terraform/components/acct/README
+++ /dev/null
@@ -1,5 +0,0 @@
-README for 'acct' component - Account-level resources
-
-This component is intended to be run to set up things (such as a DNS subdomain) at the account level, and this should be run for each account belonging to the Notify Domain - i.e. there should be a nonprod and prod environment .tfvars
-
-Copy the `env_eu-west-2_example.tfvars` file in the `etc` directory and adjust as needed for nonprod and prod for your NHS Notify Domain.
diff --git a/next-env.d.ts b/next-env.d.ts
deleted file mode 100644
index 4f11a03d..00000000
--- a/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/package-lock.json b/package-lock.json
index e7ed0f54..1a1aef54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10834,6 +10834,66 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@next/swc-darwin-arm64": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz",
+      "integrity": "sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz",
+      "integrity": "sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz",
+      "integrity": "sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz",
+      "integrity": "sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@next/swc-linux-x64-gnu": {
       "version": "14.2.5",
       "cpu": [
@@ -10862,6 +10922,51 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz",
+      "integrity": "sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz",
+      "integrity": "sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-x64-msvc": {
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz",
+      "integrity": "sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "license": "MIT",
@@ -26069,111 +26174,6 @@
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz",
-      "integrity": "sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz",
-      "integrity": "sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz",
-      "integrity": "sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz",
-      "integrity": "sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz",
-      "integrity": "sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz",
-      "integrity": "sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz",
-      "integrity": "sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
     }
   }
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index a78736eb..480f4fd6 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,9 +1,8 @@
 import type { Metadata } from 'next';
 import '@/src/styles/app.scss';
 import content from '@/src/content/content';
-import { NHSNotifyHeader } from '../components/molecules/Header/Header';
-import { NHSNotifyContainer } from '../components/layouts/container/container';
-import { NHSNotifyFooter } from '../components/molecules/Footer/Footer';
+import { ClientLayout } from '../components/molecules/ClientLayout/ClientLayout';
+import 'nhsuk-frontend/dist/nhsuk.css';
 
 export const metadata: Metadata = {
   title: content.global.mainLayout.title,
@@ -15,62 +14,5 @@ export default function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  return (
-    <html lang='en'>
-      <head>
-        <script src={`${process.env.basePath}/lib/nhsuk-8.1.1.min.js`} defer />
-        <title>{content.global.mainLayout.title}</title>
-        <link
-          rel='shortcut icon'
-          href={`${process.env.basePath}/lib/assets/favicons/favicon.ico`}
-          type='image/x-icon'
-        />
-        <link
-          rel='apple-touch-icon'
-          href={`${process.env.basePath}/lib/assets/favicons/apple-touch-icon-180x180.png`}
-        />
-        <link
-          rel='mask-icon'
-          href={`${process.env.basePath}/lib/assets/favicons/favicon.svg`}
-          color='#005eb8'
-        />
-        <link
-          rel='icon'
-          sizes='192x192'
-          href={`${process.env.basePath}/lib/assets/favicons/favicon-192x192.png`}
-        />
-        <meta
-          name='msapplication-TileImage'
-          content={`${process.env.basePath}/lib/assets/favicons/mediumtile-144x144.png`}
-        />
-        <meta name='msapplication-TileColor' content='#005eb8' />
-        <meta
-          name='msapplication-square70x70logo'
-          content={`${process.env.basePath}/lib/assets/favicons/smalltile-70x70.png`}
-        />
-        <meta
-          name='msapplication-square150x150logo'
-          content={`${process.env.basePath}/lib/assets/favicons/mediumtile-150x150.png`}
-        />
-        <meta
-          name='msapplication-wide310x150logo'
-          content={`${process.env.basePath}/lib/assets/favicons/widetile-310x150.png`}
-        />
-        <meta
-          name='msapplication-square310x310logo'
-          content={`${process.env.basePath}/lib/assets/favicons/largetile-310x310.png`}
-        />
-      </head>
-      <body suppressHydrationWarning>
-        <script
-          type='text/javascript'
-          src={`${process.env.basePath}/lib/nhs-frontend-js-check.js`}
-          defer
-        />
-        <NHSNotifyHeader />
-        <NHSNotifyContainer>{children}</NHSNotifyContainer>
-        <NHSNotifyFooter />
-      </body>
-    </html>
-  );
+  return <ClientLayout>{children}</ClientLayout>;
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index b42ef6b2..d594095c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,13 +1,12 @@
 'use client';
 
-export default function HomePage() {
+import React, { Suspense } from 'react';
+import Login from '../components/molecules/Login/Login';
+
+export default function Page() {
   return (
-    <div className='nhsuk-grid-row' data-testid='page-content-wrapper'>
-      <div className='nhsuk-grid-column-two-thirds'>
-        <h1 className='nhsuk-heading-xl' data-testid='page-heading'>
-          Hello World!
-        </h1>
-      </div>
-    </div>
+    <Suspense>
+      <Login />
+    </Suspense>
   );
 }
diff --git a/app/signout/page.tsx b/src/app/signout/page.tsx
similarity index 78%
rename from app/signout/page.tsx
rename to src/app/signout/page.tsx
index a19110ae..32a1802e 100644
--- a/app/signout/page.tsx
+++ b/src/app/signout/page.tsx
@@ -2,17 +2,15 @@
 
 import React, { Suspense, useEffect, useState } from 'react';
 import { signOut } from '@aws-amplify/auth';
-import { Redirect } from './Redirect';
+import { Redirect } from '../../components/molecules/Redirect/Redirect';
 
 export default function Page() {
   const [signedOut, setSignedOut] = useState(false);
 
   useEffect(() => {
-    console.log('sign out use effect');
     if (!signedOut) {
       signOut()
         .then(() => setSignedOut(true))
-        .then(() => console.log('sign out complete'))
         .catch((error) => console.error(error));
     }
   });
diff --git a/src/components/molecules/ClientLayout/ClientLayout.tsx b/src/components/molecules/ClientLayout/ClientLayout.tsx
new file mode 100644
index 00000000..53041733
--- /dev/null
+++ b/src/components/molecules/ClientLayout/ClientLayout.tsx
@@ -0,0 +1,75 @@
+/* eslint-disable @typescript-eslint/no-var-requires,unicorn/prefer-module */
+
+'use client';
+
+import { Amplify } from 'aws-amplify';
+import { Authenticator } from '@aws-amplify/ui-react';
+import '@/src/styles/app.scss';
+import content from '@/src/content/content';
+import Head from 'next/head';
+import { NHSNotifyHeader } from '../Header/Header';
+import { NHSNotifyContainer } from '../../layouts/container/container';
+import { NHSNotifyFooter } from '../Footer/Footer';
+
+Amplify.configure(require('@/amplify_outputs.json'), { ssr: true });
+
+export const ClientLayout = ({ children }: { children: React.ReactNode }) => (
+  <html lang='en'>
+    <Head>
+      <script src={`${process.env.basePath}/lib/nhsuk-8.1.1.min.js`} defer />
+      <title>{content.global.mainLayout.title}</title>
+      <link
+        rel='shortcut icon'
+        href={`${process.env.basePath}/lib/assets/favicons/favicon.ico`}
+        type='image/x-icon'
+      />
+      <link
+        rel='apple-touch-icon'
+        href={`${process.env.basePath}/lib/assets/favicons/apple-touch-icon-180x180.png`}
+      />
+      <link
+        rel='mask-icon'
+        href={`${process.env.basePath}/lib/assets/favicons/favicon.svg`}
+        color='#005eb8'
+      />
+      <link
+        rel='icon'
+        sizes='192x192'
+        href={`${process.env.basePath}/lib/assets/favicons/favicon-192x192.png`}
+      />
+      <meta
+        name='msapplication-TileImage'
+        content={`${process.env.basePath}/lib/assets/favicons/mediumtile-144x144.png`}
+      />
+      <meta name='msapplication-TileColor' content='#005eb8' />
+      <meta
+        name='msapplication-square70x70logo'
+        content={`${process.env.basePath}/lib/assets/favicons/smalltile-70x70.png`}
+      />
+      <meta
+        name='msapplication-square150x150logo'
+        content={`${process.env.basePath}/lib/assets/favicons/mediumtile-150x150.png`}
+      />
+      <meta
+        name='msapplication-wide310x150logo'
+        content={`${process.env.basePath}/lib/assets/favicons/widetile-310x150.png`}
+      />
+      <meta
+        name='msapplication-square310x310logo'
+        content={`${process.env.basePath}/lib/assets/favicons/largetile-310x310.png`}
+      />
+    </Head>
+    <body suppressHydrationWarning>
+      <script
+        type='text/javascript'
+        src={`${process.env.basePath}/lib/nhs-frontend-js-check.js`}
+        defer
+      />
+      <Authenticator.Provider>
+        <NHSNotifyHeader />
+        <NHSNotifyContainer>{children}</NHSNotifyContainer>
+        <NHSNotifyFooter />
+      </Authenticator.Provider>
+    </body>
+  </html>
+);
diff --git a/src/components/molecules/Header/Header.tsx b/src/components/molecules/Header/Header.tsx
index b04764d4..99335069 100644
--- a/src/components/molecules/Header/Header.tsx
+++ b/src/components/molecules/Header/Header.tsx
@@ -3,6 +3,7 @@ import concatClassNames from '@/src/utils/concat-class-names';
 import content from '@/src/content/content';
 import styles from './Header.module.scss';
 import { HeaderType } from './header.types';
+import LoginStatus from '../LoginStatus/LoginStatus';
 
 export function NHSNotifyHeader({ className, dataTestId }: HeaderType) {
   return (
@@ -50,12 +51,7 @@ export function NHSNotifyHeader({ className, dataTestId }: HeaderType) {
           )}
           id='content-header'
         >
-          {/* I am currently testing the link wrapper, this will change later when we implement auth as the link will change based on auth state */}
-          <div className='nhsuk-account__login' data-testid='login-link'>
-            <Link className='nhsuk-account__login--link' href='/'>
-              {content.components.headerComponent.links.logIn}
-            </Link>
-          </div>
+          <LoginStatus />
         </div>
       </div>
     </header>
diff --git a/components/Login.tsx b/src/components/molecules/Login/Login.tsx
similarity index 77%
rename from components/Login.tsx
rename to src/components/molecules/Login/Login.tsx
index b3fe39d7..dd4b2f8d 100644
--- a/components/Login.tsx
+++ b/src/components/molecules/Login/Login.tsx
@@ -14,12 +14,10 @@ function Login({
 }) {
   useEffect(() => {
     if (user && redirectPath) {
-      console.log('redirect', user, redirectPath);
       location.href = redirectPath;
     }
   }, [user, redirectPath]);
   if (redirectPath && user) {
-    console.log('redirecting', user, redirectPath);
     return (
       <h3>
         Redirecting to{' '}
@@ -29,17 +27,11 @@ function Login({
       </h3>
     );
   }
-  console.log('no redirect', user, redirectPath);
   return null;
 }
 
 const LoginWithAuthenticator = () => {
   const searchParams = useSearchParams();
-  console.log(
-    'searchParams',
-    searchParams.get('redirect'),
-    searchParams.entries().next()
-  );
   return withAuthenticator(Login, {
     variation: 'default',
     hideSignUp: true,
diff --git a/components/LoginStatus.tsx b/src/components/molecules/LoginStatus/LoginStatus.tsx
similarity index 100%
rename from components/LoginStatus.tsx
rename to src/components/molecules/LoginStatus/LoginStatus.tsx
diff --git a/app/signout/Redirect.tsx b/src/components/molecules/Redirect/Redirect.tsx
similarity index 74%
rename from app/signout/Redirect.tsx
rename to src/components/molecules/Redirect/Redirect.tsx
index a4b1c0d6..33b7a324 100644
--- a/app/signout/Redirect.tsx
+++ b/src/components/molecules/Redirect/Redirect.tsx
@@ -6,16 +6,9 @@ import { useSearchParams } from 'next/navigation';
 export const Redirect = () => {
   const searchParams = useSearchParams();
 
-  console.log(
-    'signout searchParams',
-    searchParams.get('redirect'),
-    searchParams.entries().next()
-  );
-
   const redirect = searchParams.get('redirect') ?? '/';
 
   useEffect(() => {
-    console.log('signout useeffect', redirect);
     location.href = redirect;
   }, [redirect]);
 
diff --git a/utils/amplify-init.ts b/utils/amplify-init.ts
deleted file mode 100644
index 1b304006..00000000
--- a/utils/amplify-init.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Amplify } from 'aws-amplify';
-import outputs from '../amplify_outputs.json';
-
-export function initAmplify() {
-  Amplify.configure(outputs, { ssr: true });
-}
diff --git a/utils/amplify-utils.ts b/utils/amplify-utils.ts
deleted file mode 100644
index b8dd04ee..00000000
--- a/utils/amplify-utils.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { cookies } from 'next/headers';
-
-import { createServerRunner } from '@aws-amplify/adapter-nextjs';
-import { fetchAuthSession, fetchUserAttributes, getCurrentUser } from 'aws-amplify/auth/server';
-import outputs from '../amplify_outputs.json';
-
-export const { runWithAmplifyServerContext } = createServerRunner({
-  config: outputs,
-});
-
-export async function AuthGetCurrentUserServer() {
-  try {
-    return await runWithAmplifyServerContext({
-      nextServerContext: { cookies },
-      operation: async (contextSpec) => {
-        const currentUser = await getCurrentUser(contextSpec);
-        const session = await fetchAuthSession(contextSpec);
-        const idToken = session.tokens?.idToken?.payload;
-        return { currentUser, idToken };
-      }
-    });
-  } catch (error) {
-    console.error(error);
-  }
-}
