diff --git a/packages/keychain/src/components/connect/Authenticate/FaceID.tsx b/packages/keychain/src/components/connect/authenticate/FaceID.tsx
similarity index 100%
rename from packages/keychain/src/components/connect/Authenticate/FaceID.tsx
rename to packages/keychain/src/components/connect/authenticate/FaceID.tsx
diff --git a/packages/keychain/src/components/connect/Authenticate/Unsupported.tsx b/packages/keychain/src/components/connect/authenticate/Unsupported.tsx
similarity index 100%
rename from packages/keychain/src/components/connect/Authenticate/Unsupported.tsx
rename to packages/keychain/src/components/connect/authenticate/Unsupported.tsx
diff --git a/packages/keychain/src/components/connect/Authenticate/index.stories.tsx b/packages/keychain/src/components/connect/authenticate/index.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/connect/Authenticate/index.stories.tsx
rename to packages/keychain/src/components/connect/authenticate/index.stories.tsx
diff --git a/packages/keychain/src/components/connect/Authenticate/index.tsx b/packages/keychain/src/components/connect/authenticate/index.tsx
similarity index 100%
rename from packages/keychain/src/components/connect/Authenticate/index.tsx
rename to packages/keychain/src/components/connect/authenticate/index.tsx
diff --git a/packages/keychain/src/components/Funding/AmountSelection.stories.tsx b/packages/keychain/src/components/funding/AmountSelection.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/AmountSelection.stories.tsx
rename to packages/keychain/src/components/funding/AmountSelection.stories.tsx
diff --git a/packages/keychain/src/components/Funding/AmountSelection.tsx b/packages/keychain/src/components/funding/AmountSelection.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/AmountSelection.tsx
rename to packages/keychain/src/components/funding/AmountSelection.tsx
diff --git a/packages/keychain/src/components/Funding/Balance.tsx b/packages/keychain/src/components/funding/Balance.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/Balance.tsx
rename to packages/keychain/src/components/funding/Balance.tsx
diff --git a/packages/keychain/src/components/Funding/DepositEth.stories.tsx b/packages/keychain/src/components/funding/DepositEth.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/DepositEth.stories.tsx
rename to packages/keychain/src/components/funding/DepositEth.stories.tsx
diff --git a/packages/keychain/src/components/Funding/DepositEth.tsx b/packages/keychain/src/components/funding/DepositEth.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/DepositEth.tsx
rename to packages/keychain/src/components/funding/DepositEth.tsx
diff --git a/packages/keychain/src/components/Funding/PurchaseCredits.stories.tsx b/packages/keychain/src/components/funding/PurchaseCredits.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/PurchaseCredits.stories.tsx
rename to packages/keychain/src/components/funding/PurchaseCredits.stories.tsx
diff --git a/packages/keychain/src/components/Funding/PurchaseCredits.tsx b/packages/keychain/src/components/funding/PurchaseCredits.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/PurchaseCredits.tsx
rename to packages/keychain/src/components/funding/PurchaseCredits.tsx
diff --git a/packages/keychain/src/components/Funding/StripeCheckout.tsx b/packages/keychain/src/components/funding/StripeCheckout.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/StripeCheckout.tsx
rename to packages/keychain/src/components/funding/StripeCheckout.tsx
diff --git a/packages/keychain/src/components/Funding/index.stories.tsx b/packages/keychain/src/components/funding/index.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/index.stories.tsx
rename to packages/keychain/src/components/funding/index.stories.tsx
diff --git a/packages/keychain/src/components/Funding/index.tsx b/packages/keychain/src/components/funding/index.tsx
similarity index 100%
rename from packages/keychain/src/components/Funding/index.tsx
rename to packages/keychain/src/components/funding/index.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/BackButton.tsx b/packages/keychain/src/components/layout/container/header/BackButton.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/BackButton.tsx
rename to packages/keychain/src/components/layout/container/header/BackButton.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/Banner.stories.tsx b/packages/keychain/src/components/layout/container/header/Banner.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/Banner.stories.tsx
rename to packages/keychain/src/components/layout/container/header/Banner.stories.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/Banner.tsx b/packages/keychain/src/components/layout/container/header/Banner.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/Banner.tsx
rename to packages/keychain/src/components/layout/container/header/Banner.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/CloseButton.tsx b/packages/keychain/src/components/layout/container/header/CloseButton.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/CloseButton.tsx
rename to packages/keychain/src/components/layout/container/header/CloseButton.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx b/packages/keychain/src/components/layout/container/header/SettingsButton.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/SettingsButton.tsx
rename to packages/keychain/src/components/layout/container/header/SettingsButton.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/TopBar.tsx b/packages/keychain/src/components/layout/container/header/TopBar.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/TopBar.tsx
rename to packages/keychain/src/components/layout/container/header/TopBar.tsx
diff --git a/packages/keychain/src/components/layout/Container/Header/index.tsx b/packages/keychain/src/components/layout/container/header/index.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/Header/index.tsx
rename to packages/keychain/src/components/layout/container/header/index.tsx
diff --git a/packages/keychain/src/components/layout/Container/index.tsx b/packages/keychain/src/components/layout/container/index.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Container/index.tsx
rename to packages/keychain/src/components/layout/container/index.tsx
diff --git a/packages/keychain/src/components/layout/Footer/index.tsx b/packages/keychain/src/components/layout/footer/index.tsx
similarity index 100%
rename from packages/keychain/src/components/layout/Footer/index.tsx
rename to packages/keychain/src/components/layout/footer/index.tsx
diff --git a/packages/keychain/src/components/Provider/connection.tsx b/packages/keychain/src/components/provider/connection.tsx
similarity index 100%
rename from packages/keychain/src/components/Provider/connection.tsx
rename to packages/keychain/src/components/provider/connection.tsx
diff --git a/packages/keychain/src/components/Provider/index.tsx b/packages/keychain/src/components/provider/index.tsx
similarity index 100%
rename from packages/keychain/src/components/Provider/index.tsx
rename to packages/keychain/src/components/provider/index.tsx
diff --git a/packages/keychain/src/components/Provider/theme.tsx b/packages/keychain/src/components/provider/theme.tsx
similarity index 100%
rename from packages/keychain/src/components/Provider/theme.tsx
rename to packages/keychain/src/components/provider/theme.tsx
diff --git a/packages/keychain/src/components/Settings/Delegate.stories.tsx b/packages/keychain/src/components/settings/Delegate.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/Delegate.stories.tsx
rename to packages/keychain/src/components/settings/Delegate.stories.tsx
diff --git a/packages/keychain/src/components/Settings/Delegate.tsx b/packages/keychain/src/components/settings/Delegate.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/Delegate.tsx
rename to packages/keychain/src/components/settings/Delegate.tsx
diff --git a/packages/keychain/src/components/Settings/Recovery.stories.tsx b/packages/keychain/src/components/settings/Recovery.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/Recovery.stories.tsx
rename to packages/keychain/src/components/settings/Recovery.stories.tsx
diff --git a/packages/keychain/src/components/Settings/Recovery.tsx b/packages/keychain/src/components/settings/Recovery.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/Recovery.tsx
rename to packages/keychain/src/components/settings/Recovery.tsx
diff --git a/packages/keychain/src/components/Settings/index.stories.tsx b/packages/keychain/src/components/settings/index.stories.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/index.stories.tsx
rename to packages/keychain/src/components/settings/index.stories.tsx
diff --git a/packages/keychain/src/components/Settings/index.tsx b/packages/keychain/src/components/settings/index.tsx
similarity index 100%
rename from packages/keychain/src/components/Settings/index.tsx
rename to packages/keychain/src/components/settings/index.tsx