diff --git a/packages/odyssey-react-mui/src/Icon.tsx b/packages/odyssey-react-mui/src/Icon.tsx
index 0f09501825..8d13a68024 100644
--- a/packages/odyssey-react-mui/src/Icon.tsx
+++ b/packages/odyssey-react-mui/src/Icon.tsx
@@ -11,7 +11,7 @@
  */
 
 import { forwardRef } from "react";
-import type { SvgIconNoChildrenProps } from "./types";
+import type { SvgIconNoChildrenProps } from "./iconDictionary/types";
 import { iconDictionary } from "./iconDictionary";
 
 export interface IconProps extends SvgIconNoChildrenProps {
diff --git a/packages/odyssey-react-mui/src/PasswordInput.test.tsx b/packages/odyssey-react-mui/src/PasswordInput.test.tsx
index a9a1e6c35f..5d4170452a 100644
--- a/packages/odyssey-react-mui/src/PasswordInput.test.tsx
+++ b/packages/odyssey-react-mui/src/PasswordInput.test.tsx
@@ -11,8 +11,9 @@
  */
 
 import { render, screen } from "@testing-library/react";
-import { a11yCheck } from "../../../test";
-import { PasswordInput } from ".";
+
+import { a11yCheck } from "./a11yCheck";
+import { PasswordInput } from "./PasswordInput";
 
 const label = "Password";
 const tooltipOnLabel = "Show password";
diff --git a/packages/odyssey-react-mui/src/PasswordInput.tsx b/packages/odyssey-react-mui/src/PasswordInput.tsx
index 3ce05510ab..08ae1d8f2e 100644
--- a/packages/odyssey-react-mui/src/PasswordInput.tsx
+++ b/packages/odyssey-react-mui/src/PasswordInput.tsx
@@ -22,7 +22,7 @@ import {
   InputAdornment,
 } from "@mui/material";
 import { Visibility, VisibilityOff } from "@mui/icons-material";
-import { useUniqueId } from "../../utils";
+import { useUniqueId } from "./useUniqueId";
 
 interface State {
   password: string;
diff --git a/packages/odyssey-react-mui/src/ThemeProvider.tsx b/packages/odyssey-react-mui/src/ThemeProvider.tsx
index 5ffd801ab8..e6b167b659 100644
--- a/packages/odyssey-react-mui/src/ThemeProvider.tsx
+++ b/packages/odyssey-react-mui/src/ThemeProvider.tsx
@@ -13,7 +13,7 @@
 import { ThemeProvider as MuiThemeProvider } from "@mui/material/styles";
 import { ReactElement } from "react";
 
-import { odysseyTheme } from "../../themes";
+import { odysseyTheme } from "./theme";
 
 export const ThemeProvider = ({ children }: { children: ReactElement }) => (
   <MuiThemeProvider theme={odysseyTheme}>{children}</MuiThemeProvider>
diff --git a/packages/odyssey-react-mui/test/a11yCheck.ts b/packages/odyssey-react-mui/src/a11yCheck.ts
similarity index 100%
rename from packages/odyssey-react-mui/test/a11yCheck.ts
rename to packages/odyssey-react-mui/src/a11yCheck.ts
diff --git a/packages/odyssey-react-mui/src/iconDictionary/index.tsx b/packages/odyssey-react-mui/src/iconDictionary/index.ts
similarity index 99%
rename from packages/odyssey-react-mui/src/iconDictionary/index.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/index.ts
index 2077d9c6a8..6ae01268cb 100644
--- a/packages/odyssey-react-mui/src/iconDictionary/index.tsx
+++ b/packages/odyssey-react-mui/src/iconDictionary/index.ts
@@ -12,8 +12,6 @@
 
 // Code automatically generated by svgr; DO NOT EDIT.
 
-export * from "./Icon";
-
 import { AddCircleIcon } from "./AddCircle";
 export * from "./AddCircle";
 
diff --git a/packages/odyssey-react-mui/src/theme/components.tsx b/packages/odyssey-react-mui/src/theme/components.tsx
index 9acb18a505..43f4f84fa8 100644
--- a/packages/odyssey-react-mui/src/theme/components.tsx
+++ b/packages/odyssey-react-mui/src/theme/components.tsx
@@ -25,7 +25,7 @@ import {
   ArrowDownIcon,
   CheckCircleFilledIcon,
   InformationCircleFilledIcon,
-} from "../../components/Icon";
+} from "../iconDictionary";
 
 export const components: ThemeOptions["components"] = {
   MuiAlert: {
diff --git a/packages/odyssey-react-mui/test/index.ts b/packages/odyssey-react-mui/test/index.ts
deleted file mode 100644
index fa93880981..0000000000
--- a/packages/odyssey-react-mui/test/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (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.
- */
-
-export * from "./a11yCheck";