diff --git a/packages/web/components/templates/EmailForgotPassword.tsx b/packages/web/components/templates/auth/EmailForgotPassword.tsx
similarity index 83%
rename from packages/web/components/templates/EmailForgotPassword.tsx
rename to packages/web/components/templates/auth/EmailForgotPassword.tsx
index b82ba9674..b572ec2d4 100644
--- a/packages/web/components/templates/EmailForgotPassword.tsx
+++ b/packages/web/components/templates/auth/EmailForgotPassword.tsx
@@ -1,14 +1,14 @@
-import { SpanBox, VStack } from '../elements/LayoutPrimitives'
-import { Button } from '../elements/Button'
-import { StyledText } from '../elements/StyledText'
+import { SpanBox, VStack } from '../../elements/LayoutPrimitives'
+import { Button } from '../../elements/Button'
+import { StyledText } from '../../elements/StyledText'
 import { useEffect, useState } from 'react'
-import { FormInput } from '../elements/FormElements'
-import { fetchEndpoint } from '../../lib/appConfig'
-import { logoutMutation } from '../../lib/networking/mutations/logoutMutation'
+import { FormInput } from '../../elements/FormElements'
+import { fetchEndpoint } from '../../../lib/appConfig'
+import { logoutMutation } from '../../../lib/networking/mutations/logoutMutation'
 import { styled } from '@stitches/react'
 import { useRouter } from 'next/router'
-import { formatMessage } from '../../locales/en/messages'
-import { parseErrorCodes } from '../../lib/queryParamParser'
+import { formatMessage } from '../../../locales/en/messages'
+import { parseErrorCodes } from '../../../lib/queryParamParser'
 
 const BorderedFormInput = styled(FormInput, {
   height: '40px',
diff --git a/packages/web/components/templates/EmailLogin.tsx b/packages/web/components/templates/auth/EmailLogin.tsx
similarity index 87%
rename from packages/web/components/templates/EmailLogin.tsx
rename to packages/web/components/templates/auth/EmailLogin.tsx
index 4c2f0248f..cca01788c 100644
--- a/packages/web/components/templates/EmailLogin.tsx
+++ b/packages/web/components/templates/auth/EmailLogin.tsx
@@ -1,15 +1,15 @@
-import { HStack, SpanBox, VStack } from '../elements/LayoutPrimitives'
-import { Button } from '../elements/Button'
-import { StyledText } from '../elements/StyledText'
+import { HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives'
+import { Button } from '../../elements/Button'
+import { StyledText } from '../../elements/StyledText'
 import { useEffect, useState } from 'react'
-import { FormInput } from '../elements/FormElements'
-import { TermAndConditionsFooter } from './LoginForm'
-import { fetchEndpoint } from '../../lib/appConfig'
-import { logoutMutation } from '../../lib/networking/mutations/logoutMutation'
+import { FormInput } from '../../elements/FormElements'
+import { TermAndConditionsFooter } from '../LoginForm'
+import { fetchEndpoint } from '../../../lib/appConfig'
+import { logoutMutation } from '../../../lib/networking/mutations/logoutMutation'
 import { styled } from '@stitches/react'
 import { useRouter } from 'next/router'
-import { parseErrorCodes } from '../../lib/queryParamParser'
-import { formatMessage } from '../../locales/en/messages'
+import { parseErrorCodes } from '../../../lib/queryParamParser'
+import { formatMessage } from '../../../locales/en/messages'
 import Link from 'next/link'
 
 const StyledTextSpan = styled('span', StyledText)
diff --git a/packages/web/components/templates/EmailResetPassword.tsx b/packages/web/components/templates/auth/EmailResetPassword.tsx
similarity index 78%
rename from packages/web/components/templates/EmailResetPassword.tsx
rename to packages/web/components/templates/auth/EmailResetPassword.tsx
index af9a69431..43b8e65d8 100644
--- a/packages/web/components/templates/EmailResetPassword.tsx
+++ b/packages/web/components/templates/auth/EmailResetPassword.tsx
@@ -1,16 +1,16 @@
-import { SpanBox, VStack } from '../elements/LayoutPrimitives'
-import { Button } from '../elements/Button'
-import { StyledText } from '../elements/StyledText'
+import { SpanBox, VStack } from '../../elements/LayoutPrimitives'
+import { Button } from '../../elements/Button'
+import { StyledText } from '../../elements/StyledText'
 import { useEffect, useState } from 'react'
-import { FormInput } from '../elements/FormElements'
-import { TermAndConditionsFooter } from './LoginForm'
-import { fetchEndpoint } from '../../lib/appConfig'
-import { logoutMutation } from '../../lib/networking/mutations/logoutMutation'
+import { FormInput } from '../../elements/FormElements'
+import { TermAndConditionsFooter } from '../LoginForm'
+import { fetchEndpoint } from '../../../lib/appConfig'
+import { logoutMutation } from '../../../lib/networking/mutations/logoutMutation'
 import { styled } from '@stitches/react'
 import { useRouter } from 'next/router'
-import { formatMessage } from '../../locales/en/messages'
-import { parseErrorCodes } from '../../lib/queryParamParser'
-import { LoadingView } from '../patterns/LoadingView'
+import { formatMessage } from '../../../locales/en/messages'
+import { parseErrorCodes } from '../../../lib/queryParamParser'
+import { LoadingView } from '../../patterns/LoadingView'
 
 const BorderedFormInput = styled(FormInput, {
   height: '40px',
diff --git a/packages/web/components/templates/EmailSignup.tsx b/packages/web/components/templates/auth/EmailSignup.tsx
similarity index 89%
rename from packages/web/components/templates/EmailSignup.tsx
rename to packages/web/components/templates/auth/EmailSignup.tsx
index 113e16f05..dc4948100 100644
--- a/packages/web/components/templates/EmailSignup.tsx
+++ b/packages/web/components/templates/auth/EmailSignup.tsx
@@ -1,16 +1,16 @@
-import { HStack, SpanBox, VStack } from '../elements/LayoutPrimitives'
-import { Button } from '../elements/Button'
-import { StyledText } from '../elements/StyledText'
+import { HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives'
+import { Button } from '../../elements/Button'
+import { StyledText } from '../../elements/StyledText'
 import { useCallback, useEffect, useMemo, useState } from 'react'
-import { FormInput } from '../elements/FormElements'
-import { TermAndConditionsFooter } from './LoginForm'
-import { fetchEndpoint } from '../../lib/appConfig'
-import { useValidateUsernameQuery } from '../../lib/networking/queries/useValidateUsernameQuery'
-import { logoutMutation } from '../../lib/networking/mutations/logoutMutation'
+import { FormInput } from '../../elements/FormElements'
+import { TermAndConditionsFooter } from '../LoginForm'
+import { fetchEndpoint } from '../../../lib/appConfig'
+import { useValidateUsernameQuery } from '../../../lib/networking/queries/useValidateUsernameQuery'
+import { logoutMutation } from '../../../lib/networking/mutations/logoutMutation'
 import { styled } from '@stitches/react'
 import { useRouter } from 'next/router'
-import { formatMessage } from '../../locales/en/messages'
-import { parseErrorCodes } from '../../lib/queryParamParser'
+import { formatMessage } from '../../../locales/en/messages'
+import { parseErrorCodes } from '../../../lib/queryParamParser'
 import Link from 'next/link'
 
 const StyledTextSpan = styled('span', StyledText)
diff --git a/packages/web/components/templates/ResetSent.tsx b/packages/web/components/templates/auth/ResetSent.tsx
similarity index 86%
rename from packages/web/components/templates/ResetSent.tsx
rename to packages/web/components/templates/auth/ResetSent.tsx
index 5fd4741ae..6c64dc3af 100644
--- a/packages/web/components/templates/ResetSent.tsx
+++ b/packages/web/components/templates/auth/ResetSent.tsx
@@ -1,5 +1,5 @@
-import { Box, HStack } from '../elements/LayoutPrimitives'
-import type { LoginFormProps } from './LoginForm'
+import { Box, HStack } from '../../elements/LayoutPrimitives'
+import type { LoginFormProps } from '../LoginForm'
 
 export function ResetSent(props: LoginFormProps): JSX.Element {
   return (
diff --git a/packages/web/components/templates/VerifyEmail.tsx b/packages/web/components/templates/auth/VerifyEmail.tsx
similarity index 78%
rename from packages/web/components/templates/VerifyEmail.tsx
rename to packages/web/components/templates/auth/VerifyEmail.tsx
index f57a8f7d0..b7f0279f5 100644
--- a/packages/web/components/templates/VerifyEmail.tsx
+++ b/packages/web/components/templates/auth/VerifyEmail.tsx
@@ -1,7 +1,7 @@
-import { Box, HStack, MediumBreakpointBox, SpanBox, VStack } from '../elements/LayoutPrimitives'
-import type { LoginFormProps } from './LoginForm'
-import { OmnivoreNameLogo } from '../elements/images/OmnivoreNameLogo'
-import { theme } from '../tokens/stitches.config'
+import { Box, HStack, MediumBreakpointBox, SpanBox, VStack } from '../../elements/LayoutPrimitives'
+import type { LoginFormProps } from '../LoginForm'
+import { OmnivoreNameLogo } from '../../elements/images/OmnivoreNameLogo'
+import { theme } from '../../tokens/stitches.config'
 
 export function VerifyEmail(props: LoginFormProps): JSX.Element {
   return (
diff --git a/packages/web/pages/auth/email-login.tsx b/packages/web/pages/auth/email-login.tsx
index aadf9913f..ae36ba62b 100644
--- a/packages/web/pages/auth/email-login.tsx
+++ b/packages/web/pages/auth/email-login.tsx
@@ -1,6 +1,6 @@
 import { PageMetaData } from '../../components/patterns/PageMetaData'
 import { ProfileLayout } from '../../components/templates/ProfileLayout'
-import { EmailLogin } from '../../components/templates/EmailLogin'
+import { EmailLogin } from '../../components/templates/auth/EmailLogin'
 
 export default function EmailLoginPage(): JSX.Element {
   return (
diff --git a/packages/web/pages/auth/email-signup.tsx b/packages/web/pages/auth/email-signup.tsx
index 819fe0b16..7c2d24d8d 100644
--- a/packages/web/pages/auth/email-signup.tsx
+++ b/packages/web/pages/auth/email-signup.tsx
@@ -1,6 +1,6 @@
 import { PageMetaData } from '../../components/patterns/PageMetaData'
 import { ProfileLayout } from '../../components/templates/ProfileLayout'
-import { EmailSignup } from '../../components/templates/EmailSignup'
+import { EmailSignup } from '../../components/templates/auth/EmailSignup'
 
 export default function EmailRegistrationPage(): JSX.Element {
   return (
diff --git a/packages/web/pages/auth/forgot-password.tsx b/packages/web/pages/auth/forgot-password.tsx
index 4257a80f7..05e0c26da 100644
--- a/packages/web/pages/auth/forgot-password.tsx
+++ b/packages/web/pages/auth/forgot-password.tsx
@@ -1,6 +1,6 @@
 import { PageMetaData } from '../../components/patterns/PageMetaData'
 import { ProfileLayout } from '../../components/templates/ProfileLayout'
-import { EmailForgotPassword } from '../../components/templates/EmailForgotPassword'
+import { EmailForgotPassword } from '../../components/templates/auth/EmailForgotPassword'
 import { useEffect } from 'react'
 import { useRouter } from 'next/router'
 import toast, { Toaster } from 'react-hot-toast'
diff --git a/packages/web/pages/auth/reset-password/[token].tsx b/packages/web/pages/auth/reset-password/[token].tsx
index df307ee1e..f43e772e6 100644
--- a/packages/web/pages/auth/reset-password/[token].tsx
+++ b/packages/web/pages/auth/reset-password/[token].tsx
@@ -1,6 +1,6 @@
 import { PageMetaData } from '../../../components/patterns/PageMetaData'
 import { ProfileLayout } from '../../../components/templates/ProfileLayout'
-import { EmailResetPassword } from '../../../components/templates/EmailResetPassword'
+import { EmailResetPassword } from '../../../components/templates/auth/EmailResetPassword'
 
 export default function EmailRegistrationPage(): JSX.Element {
   return (
diff --git a/packages/web/pages/auth/reset-sent.tsx b/packages/web/pages/auth/reset-sent.tsx
index 47c054d55..3800fc357 100644
--- a/packages/web/pages/auth/reset-sent.tsx
+++ b/packages/web/pages/auth/reset-sent.tsx
@@ -1,6 +1,6 @@
 import { PageMetaData } from '../../components/patterns/PageMetaData'
 import { ProfileLayout } from '../../components/templates/ProfileLayout'
-import { ResetSent } from '../../components/templates/ResetSent'
+import { ResetSent } from '../../components/templates/auth/ResetSent'
 
 export default function EmailResetSent(): JSX.Element {
   return (
diff --git a/packages/web/pages/auth/verify-email.tsx b/packages/web/pages/auth/verify-email.tsx
index 0606e88df..461f62bba 100644
--- a/packages/web/pages/auth/verify-email.tsx
+++ b/packages/web/pages/auth/verify-email.tsx
@@ -1,5 +1,5 @@
 import { PageMetaData } from '../../components/patterns/PageMetaData'
-import { VerifyEmail } from '../../components/templates/VerifyEmail'
+import { VerifyEmail } from '../../components/templates/auth/VerifyEmail'
 
 export default function VerifyEmailPage(): JSX.Element {
   return (