diff --git a/src/App.jsx b/src/App.jsx
index b909a1a3..339a41f9 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -4,14 +4,15 @@ import FileSaver from 'file-saver';
 import JSZip from 'jszip';
 import { debounce, partition } from 'lodash';
 import clsx from 'clsx';
-import { createTheme, makeStyles } from '@material-ui/core/styles';
+import { makeStyles } from '@material-ui/core/styles';
 import { Grid, ThemeProvider } from '@material-ui/core';
 import { expandLink } from './utils/BitlyWorker';
 import TopBar from './components/TopBar';
-import JSONOutput from './components/JSONOutput';
-import FSHOutput from './components/FSHOutput';
-import ConsoleComponent from './components/ConsoleComponent';
+import JSONEditor from './components/JSONEditor';
+import FSHEditor from './components/FSHEditor';
+import Console from './components/Console';
 import FSHControls from './components/FSHControls';
+import theme from './theme';
 
 const useStyles = makeStyles(() => ({
   container: {
@@ -31,7 +32,7 @@ const useStyles = makeStyles(() => ({
     width: '4px',
     cursor: 'col-resize',
     '&:hover': {
-      background: colors.lightBlue
+      background: theme.palette.common.lightBlue
     }
   },
   resizeBlue: {
@@ -61,60 +62,7 @@ const useStyles = makeStyles(() => ({
   }
 }));
 
-const colors = {
-  lighterBlue: '#D8E2EA',
-  lightBlue: '#487AA2',
-  blue: '#30638e',
-  darkerBlue: '#143E61',
-  editorGrey: '#263238',
-  lightestGrey: '#E7ECEE',
-  lightGrey: '#D0D9DD',
-  grey: '#575B5C',
-  darkerGrey: '#3D4345',
-  darkestGrey: '#121D21',
-  red: '#FD6668'
-};
-
-export const theme = createTheme({
-  palette: {
-    success: {
-      main: colors.blue,
-      dark: colors.darkerBlue,
-      light: colors.lightBlue
-    },
-    common: colors
-  },
-  typography: {
-    fontFamily: 'Open Sans'
-  },
-  overrides: {
-    MuiTooltip: {
-      tooltip: {
-        backgroundColor: colors.darkestGrey,
-        fontSize: '13px'
-      },
-      arrow: {
-        color: colors.darkestGrey
-      }
-    },
-    MuiButton: {
-      text: {
-        textTransform: 'none',
-        fontWeight: 600
-      }
-    },
-    MuiIconButton: {
-      root: {
-        '&:hover': {
-          backgroundColor: colors.grey
-        }
-      }
-    }
-  }
-});
-
 const githubURL = 'https://raw.githubusercontent.com/FSHSchool/FSHOnline-Examples/main/';
-const log = console.log; //eslint-disable-line no-unused-vars
 const defaultInfoMessage = 'There are no messages to display in the console.';
 const defaultProblemMessage = 'There are no problems to display in the console.';
 let infoMessages = [defaultInfoMessage];
@@ -140,7 +88,7 @@ console.log = function getMessages(message) {
 };
 
 /* 
-Parses metadata into a seperate object and converts the manifest into a form that can
+Parses metadata into a separate object and converts the manifest into a form that can
 be consumed by the TreeView component
 */
 function convertManifest(childrenArr) {
@@ -207,8 +155,8 @@ export default function App(props) {
   const [inputFSHText, setInputFSHText] = useState('');
   const [inputFHIRText, setInputFHIRText] = useState(['']);
   const [initialText, setInitialText] = useState('');
-  const [isWaitingForFHIROutput, setIsWaitingForFHIROutput] = useState(false);
-  const [isWaitingForFSHOutput, setIsWaitingForFSHOutput] = useState(false);
+  const [isWaitingForFHIR, setIsWaitingForFHIR] = useState(false);
+  const [isWaitingForFSH, setIsWaitingForFSH] = useState(false);
   const [expandConsole, setExpandConsole] = useState(false);
   const [exampleConfig, setExampleConfig] = useState([]);
   const [exampleFilePaths, setExampleFilePaths] = useState({});
@@ -267,13 +215,13 @@ export default function App(props) {
 
   function handleSUSHIControls(showNewText, sushiOutput, isWaiting) {
     setShowNewFHIRText(showNewText);
-    setInputFHIRText(sushiOutput); // JSONOutput component handles resetting initial text, so don't reset here
-    setIsWaitingForFHIROutput(isWaiting);
+    setInputFHIRText(sushiOutput); // JSONEditor component handles resetting initial text, so don't reset here
+    setIsWaitingForFHIR(isWaiting);
   }
 
-  function handleGoFSHControls(fshOutput, isWaiting) {
-    setIsWaitingForFSHOutput(isWaiting);
-    setInitialText(fshOutput === '' ? null : fshOutput); // Reset initial text to null if empty in order to display placeholder text
+  function handleGoFSHControls(fshText, isWaiting) {
+    setIsWaitingForFSH(isWaiting);
+    setInitialText(fshText === '' ? null : fshText); // Reset initial text to null if empty in order to display placeholder text
   }
 
   function updateInputFSHTextValue(text) {
@@ -412,7 +360,7 @@ export default function App(props) {
             resetLogMessages={resetLogMessages}
             exampleConfig={exampleConfig}
             exampleMetadata={exampleFilePaths}
-            isWaiting={isWaitingForFSHOutput || isWaitingForFHIROutput}
+            isWaiting={isWaitingForFSH || isWaitingForFHIR}
             saveAll={saveAll}
             setIsLineWrapped={setLineWrap}
             isLineWrapped={isLineWrapped}
@@ -433,11 +381,11 @@ export default function App(props) {
                 className={clsx(classes.fullHeightGrid, classes.editorPane)}
                 style={{ maxWidth: `calc(${leftWidth}% - 2px)`, flexBasis: `calc(${leftWidth}% - 2px)` }}
               >
-                <FSHOutput
+                <FSHEditor
                   text={inputFSHText}
                   initialText={initialText}
                   updateTextValue={updateInputFSHTextValue}
-                  isWaiting={isWaitingForFSHOutput}
+                  isWaiting={isWaitingForFSH}
                   setInitialText={setInitialText}
                   config={configToShare}
                   isLineWrapped={isLineWrapped}
@@ -459,11 +407,11 @@ export default function App(props) {
                   flexBasis: `calc(${100 - leftWidth}% - 2px)`
                 }}
               >
-                <JSONOutput
+                <JSONEditor
                   text={inputFHIRText}
                   showNewText={showNewFHIRText}
                   setShowNewText={setShowNewFHIRText}
-                  isWaiting={isWaitingForFHIROutput}
+                  isWaiting={isWaitingForFHIR}
                   updateTextValue={updateInputFHIRTextValue}
                   isLineWrapped={isLineWrapped}
                 />
@@ -472,7 +420,7 @@ export default function App(props) {
           </ExpandedConsoleContext.Provider>
         </div>
         <div className={expandConsole ? classes.expandedConsole : classes.collapsedConsole}>
-          <ConsoleComponent
+          <Console
             consoleMessages={infoMessages}
             problemMessages={problemMessages}
             problemCount={problemCount}
diff --git a/src/components/CodeMirrorComponent.jsx b/src/components/CodeEditor.jsx
similarity index 99%
rename from src/components/CodeMirrorComponent.jsx
rename to src/components/CodeEditor.jsx
index aa1ef039..5db10779 100644
--- a/src/components/CodeMirrorComponent.jsx
+++ b/src/components/CodeEditor.jsx
@@ -8,7 +8,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import CodeMirror from 'codemirror';
 import { ExpandedConsoleContext } from '../App';
 import ShareLink from './ShareLink';
-import '../style/CodeMirrorComponent.css';
+import '../style/CodeEditor.css';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/theme/material.css';
 import 'codemirror/addon/fold/foldgutter.css';
@@ -211,7 +211,7 @@ const useStyles = makeStyles((theme) => ({
   }
 }));
 
-export default function CodeMirrorComponent(props) {
+export default function CodeEditor(props) {
   const classes = useStyles();
   const expandedConsoleContext = useContext(ExpandedConsoleContext);
   const [drawerOpen, setDrawerOpen] = useState(true);
diff --git a/src/components/ConsoleComponent.jsx b/src/components/Console.jsx
similarity index 100%
rename from src/components/ConsoleComponent.jsx
rename to src/components/Console.jsx
diff --git a/src/components/FSHControls.jsx b/src/components/FSHControls.jsx
index 6d9be5ed..edceb246 100644
--- a/src/components/FSHControls.jsx
+++ b/src/components/FSHControls.jsx
@@ -31,7 +31,7 @@ import {
 import { runSUSHI, runGoFSH } from '../utils/FSHHelpers';
 import { sliceDependency } from '../utils/helpers';
 import { TreeView, TreeItem } from '@material-ui/lab';
-import CodeMirrorComponent from './CodeMirrorComponent';
+import CodeEditor from './CodeEditor';
 
 const useStyles = makeStyles((theme) => ({
   box: {
@@ -292,6 +292,12 @@ export default function FSHControls(props) {
 
   return (
     <Box className={classes.box}>
+      <div className={classes.leftControls}>
+        <Button name="Examples" className={classes.button} onClick={handleOpenExamples}>
+          <LibraryBooksIcon /> &nbsp; FSH Examples
+        </Button>
+      </div>
+
       <Grid container>
         <Grid item xs={5}>
           <Button className={clsx(classes.button, classes.buttonLeft)} onClick={handleSUSHIClick} testid="Button">
@@ -323,12 +329,6 @@ export default function FSHControls(props) {
         </Grid>
       </Grid>
 
-      <div className={classes.leftControls}>
-        <Button name="Examples" className={classes.button} onClick={handleOpenExamples}>
-          <LibraryBooksIcon /> &nbsp; FSH Examples
-        </Button>
-      </div>
-
       <div className={classes.rightControls}>
         <Button name="SaveAll" className={classes.secondaryButton} onClick={props.saveAll}>
           <SaveAlt /> Save All
@@ -431,7 +431,7 @@ export default function FSHControls(props) {
               </TreeView>
             </Grid>
             <Grid item xs={8}>
-              <CodeMirrorComponent
+              <CodeEditor
                 name={currentExample ? currentExampleName : ''}
                 isExamples={true}
                 value={currentExample}
diff --git a/src/components/FSHOutput.jsx b/src/components/FSHEditor.jsx
similarity index 90%
rename from src/components/FSHOutput.jsx
rename to src/components/FSHEditor.jsx
index 68d8148d..039a505f 100644
--- a/src/components/FSHOutput.jsx
+++ b/src/components/FSHEditor.jsx
@@ -1,9 +1,9 @@
 import React, { useState } from 'react';
 import FileSaver from 'file-saver';
-import CodeMirrorComponent from './CodeMirrorComponent';
+import CodeEditor from './CodeEditor';
 import DeleteConfirmationModal from './DeleteConfirmationModal';
 
-export default function FSHOutput(props) {
+export default function FSHEditor(props) {
   const [openDeleteModal, setOpenDeleteModal] = useState(false);
 
   const handleOpenDeleteModal = () => {
@@ -21,7 +21,7 @@ export default function FSHOutput(props) {
 
   return (
     <>
-      <CodeMirrorComponent
+      <CodeEditor
         name={'FSH'}
         isExamples={false}
         value={props.text}
diff --git a/src/components/JSONOutput.jsx b/src/components/JSONEditor.jsx
similarity index 99%
rename from src/components/JSONOutput.jsx
rename to src/components/JSONEditor.jsx
index 62cbf2f3..d3ddf324 100644
--- a/src/components/JSONOutput.jsx
+++ b/src/components/JSONEditor.jsx
@@ -5,7 +5,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import clsx from 'clsx';
 import { Button, List, ListItem, Tooltip } from '@material-ui/core';
 import { Add, ErrorOutline } from '@material-ui/icons';
-import CodeMirrorComponent from './CodeMirrorComponent';
+import CodeEditor from './CodeEditor';
 import DeleteConfirmationModal from './DeleteConfirmationModal';
 
 const useStyles = makeStyles((theme) => ({
@@ -147,7 +147,7 @@ const getIterablePackage = (defsPackage) => {
   }));
 };
 
-export default function JSONOutput(props) {
+export default function JSONEditor(props) {
   const classes = useStyles();
   const [initialText, setInitialText] = useState('');
   const [fhirDefinitions, setFhirDefinitions] = useState([{ resourceType: null, id: 'Untitled', def: null }]);
@@ -406,7 +406,7 @@ export default function JSONOutput(props) {
 
   return (
     <>
-      <CodeMirrorComponent
+      <CodeEditor
         name={`FHIR JSON: ${name}`}
         value={displayValue}
         initialText={initialText}
diff --git a/src/components/ShareLink.jsx b/src/components/ShareLink.jsx
index 6c2abfb9..341884de 100644
--- a/src/components/ShareLink.jsx
+++ b/src/components/ShareLink.jsx
@@ -17,7 +17,7 @@ import {
   Box
 } from '@material-ui/core';
 import { generateLink } from '../utils/BitlyWorker';
-import { theme } from '../App';
+import theme from '../theme';
 
 const useStyles = makeStyles((theme) => ({
   iconButton: {
diff --git a/src/style/CodeMirrorComponent.css b/src/style/CodeEditor.css
similarity index 100%
rename from src/style/CodeMirrorComponent.css
rename to src/style/CodeEditor.css
diff --git a/src/theme.js b/src/theme.js
new file mode 100644
index 00000000..c6a69470
--- /dev/null
+++ b/src/theme.js
@@ -0,0 +1,55 @@
+import { createTheme } from '@material-ui/core/styles';
+
+const colors = {
+  lighterBlue: '#D8E2EA',
+  lightBlue: '#487AA2',
+  blue: '#30638e',
+  darkerBlue: '#143E61',
+  editorGrey: '#263238',
+  lightestGrey: '#E7ECEE',
+  lightGrey: '#D0D9DD',
+  grey: '#575B5C',
+  darkerGrey: '#3D4345',
+  darkestGrey: '#121D21',
+  red: '#FD6668'
+};
+
+const theme = createTheme({
+  palette: {
+    success: {
+      main: colors.blue,
+      dark: colors.darkerBlue,
+      light: colors.lightBlue
+    },
+    common: colors
+  },
+  typography: {
+    fontFamily: 'Open Sans'
+  },
+  overrides: {
+    MuiTooltip: {
+      tooltip: {
+        backgroundColor: colors.darkestGrey,
+        fontSize: '13px'
+      },
+      arrow: {
+        color: colors.darkestGrey
+      }
+    },
+    MuiButton: {
+      text: {
+        textTransform: 'none',
+        fontWeight: 600
+      }
+    },
+    MuiIconButton: {
+      root: {
+        '&:hover': {
+          backgroundColor: colors.grey
+        }
+      }
+    }
+  }
+});
+
+export default theme;
diff --git a/src/tests/App.test.jsx b/tests/App.test.jsx
similarity index 94%
rename from src/tests/App.test.jsx
rename to tests/App.test.jsx
index fd14dd70..f2693533 100644
--- a/src/tests/App.test.jsx
+++ b/tests/App.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { waitFor, render, fireEvent } from '@testing-library/react';
-import App, { decodeFSH } from '../App';
-import * as bitlyWorker from '../utils/BitlyWorker';
+import App, { decodeFSH } from '../src/App';
+import * as bitlyWorker from '../src/utils/BitlyWorker';
 
 it('basic app renders', () => {
   const { getByText } = render(<App match={{}} />);
diff --git a/src/tests/AppRouter.test.jsx b/tests/AppRouter.test.jsx
similarity index 89%
rename from src/tests/AppRouter.test.jsx
rename to tests/AppRouter.test.jsx
index 0bc26310..b5399433 100644
--- a/src/tests/AppRouter.test.jsx
+++ b/tests/AppRouter.test.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
-import AppRouter from '../AppRouter';
+import AppRouter from '../src/AppRouter';
 
-vi.mock('../App.jsx', () => ({ default: () => <div>Mock FSH Online</div> }));
+vi.mock('../src/App.jsx', () => ({ default: () => <div>Mock FSH Online</div> }));
 
 test('Renders FSH Online App when visiting /FSHOnline', () => {
   const { getByText } = render(
diff --git a/src/tests/components/CodeMirrorComponent.test.jsx b/tests/components/CodeEditor.test.jsx
similarity index 79%
rename from src/tests/components/CodeMirrorComponent.test.jsx
rename to tests/components/CodeEditor.test.jsx
index 30550faa..bff4531e 100644
--- a/src/tests/components/CodeMirrorComponent.test.jsx
+++ b/tests/components/CodeEditor.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
-import CodeMirrorComponent from '../../components/CodeMirrorComponent';
+import CodeEditor from '../../src/components/CodeEditor';
 
 let container = null;
 beforeEach(() => {
@@ -16,7 +16,7 @@ afterEach(() => {
 });
 
 it('Renders initial text in the editor', () => {
-  const { getByText } = render(<CodeMirrorComponent initialText="Edit FSH here!" />, container);
+  const { getByText } = render(<CodeEditor initialText="Edit FSH here!" />, container);
   const textElement = getByText(/Edit FSH here!/i);
 
   expect(textElement).toBeInTheDocument();
@@ -25,7 +25,7 @@ it('Renders initial text in the editor', () => {
 it('Renders a drawer when one is provided in props', () => {
   const renderDrawer = () => <div>Simple drawer contents</div>;
   const { getByText, getByRole } = render(
-    <CodeMirrorComponent initialText="Some text" renderDrawer={renderDrawer} />,
+    <CodeEditor initialText="Some text" renderDrawer={renderDrawer} />,
     container
   );
   const drawerText = getByText(/simple drawer contents/i);
@@ -37,7 +37,7 @@ it('Renders a drawer when one is provided in props', () => {
 it('Drawer can be collapsed and expanded', async () => {
   const renderDrawer = () => <div>Simple drawer contents</div>;
   const { getByRole, queryByRole, getByTestId } = render(
-    <CodeMirrorComponent initialText="Some text" renderDrawer={renderDrawer} />,
+    <CodeEditor initialText="Some text" renderDrawer={renderDrawer} />,
     container
   );
   let drawer = getByTestId('editor-drawer');
@@ -64,16 +64,13 @@ it('Drawer can be collapsed and expanded', async () => {
 });
 
 it('Editor wraps when text wrapping is true', async () => {
-  const { container: renderContainer } = render(
-    <CodeMirrorComponent initialText="Some text" isLineWrapped={true} />,
-    container
-  );
+  const { container: renderContainer } = render(<CodeEditor initialText="Some text" isLineWrapped={true} />, container);
   expect(renderContainer.querySelector('.CodeMirror-wrap')).toBeInTheDocument();
 });
 
 it('Editor does not wrap when text wrapping is false', async () => {
   const { container: renderContainer } = render(
-    <CodeMirrorComponent initialText="Some text" isLineWrapped={false} />,
+    <CodeEditor initialText="Some text" isLineWrapped={false} />,
     container
   );
   expect(renderContainer.querySelector('.CodeMirror-wrap')).not.toBeInTheDocument();
@@ -81,7 +78,7 @@ it('Editor does not wrap when text wrapping is false', async () => {
 
 it('Does not renders a drawer or expand button when one is not provided in props', () => {
   // No renderDrawer prop passed in
-  const { queryByRole } = render(<CodeMirrorComponent initialText="Some text" />, container);
+  const { queryByRole } = render(<CodeEditor initialText="Some text" />, container);
   const expandButton = queryByRole('button', { name: /expand/i });
   const collapseButton = queryByRole('button', { name: /collapse/i });
   expect(expandButton).not.toBeInTheDocument();
@@ -93,7 +90,7 @@ it('Renders action buttons for specified actions', () => {
   const saveMock = vi.fn();
   const deleteMock = vi.fn();
   const { getByRole } = render(
-    <CodeMirrorComponent initialText="Edit FSH here!" copy={copyMock} save={saveMock} delete={deleteMock} />,
+    <CodeEditor initialText="Edit FSH here!" copy={copyMock} save={saveMock} delete={deleteMock} />,
     container
   );
 
@@ -108,7 +105,7 @@ it('Renders action buttons for specified actions', () => {
 
 it('Does not render action buttons for unspecified actions', () => {
   const deleteMock = vi.fn();
-  const { queryByRole } = render(<CodeMirrorComponent initialText="Edit FSH here!" delete={deleteMock} />, container);
+  const { queryByRole } = render(<CodeEditor initialText="Edit FSH here!" delete={deleteMock} />, container);
 
   const copyButton = queryByRole('button', { name: /copy/i });
   const saveButton = queryByRole('button', { name: /save/i });
@@ -122,7 +119,7 @@ it('Does not render action buttons for unspecified actions', () => {
 
 it('Renders Share option for fsh mode', () => {
   // set mode to fsh
-  const { getByRole } = render(<CodeMirrorComponent initialText="Edit FSH here!" mode={'fsh'} />, container);
+  const { getByRole } = render(<CodeEditor initialText="Edit FSH here!" mode={'fsh'} />, container);
 
   const shareButton = getByRole('button', { name: /share fsh/i });
   expect(shareButton).toBeInTheDocument();
@@ -130,10 +127,7 @@ it('Renders Share option for fsh mode', () => {
 
 it('Does not render Share option for non-fsh mode', () => {
   // mode is anything but fsh
-  const { queryByRole } = render(
-    <CodeMirrorComponent initialText="Edit FSH here!" mode={'application/json'} />,
-    container
-  );
+  const { queryByRole } = render(<CodeEditor initialText="Edit FSH here!" mode={'application/json'} />, container);
 
   const shareButton = queryByRole('button', { name: /share fsh/i });
   expect(shareButton).not.toBeInTheDocument();
diff --git a/src/tests/components/ConsoleComponent.test.jsx b/tests/components/Console.test.jsx
similarity index 77%
rename from src/tests/components/ConsoleComponent.test.jsx
rename to tests/components/Console.test.jsx
index 8e858f2b..ba92e1c3 100644
--- a/src/tests/components/ConsoleComponent.test.jsx
+++ b/tests/components/Console.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
-import ConsoleComponent from '../../components/ConsoleComponent';
+import Console from '../../src/components/Console';
 
 let container = null;
 beforeEach(() => {
@@ -16,7 +16,7 @@ afterEach(() => {
 });
 
 it('Renders with the appropriate label', () => {
-  const { getByText } = render(<ConsoleComponent consoleMessages={[]} problemMessages={[]} />, container);
+  const { getByText } = render(<Console consoleMessages={[]} problemMessages={[]} />, container);
   const textElement = getByText('Console');
 
   expect(textElement).toBeInTheDocument();
@@ -25,10 +25,7 @@ it('Renders with the appropriate label', () => {
 it('Renders with proper messages in the console', () => {
   const infoMessages = ['Hello', 'Goodbye', 'How are you?'];
 
-  const { getByText, queryByText } = render(
-    <ConsoleComponent consoleMessages={infoMessages} problemMessages={[]} />,
-    container
-  );
+  const { getByText, queryByText } = render(<Console consoleMessages={infoMessages} problemMessages={[]} />, container);
   const textElement1 = getByText(/Hello/i);
   const textElement2 = getByText(/Goodbye/i);
   const textElement3 = getByText(/How are you\?/i);
@@ -45,7 +42,7 @@ it('Renders error and warning labels when passed in as messages', () => {
   const problemMessages = ['error foo', 'error bar', 'warning foo', 'warning bar'];
 
   const { queryByText } = render(
-    <ConsoleComponent consoleMessages={infoMessages} problemMessages={problemMessages} />,
+    <Console consoleMessages={infoMessages} problemMessages={problemMessages} />,
     container
   );
   const successLabel = queryByText(/Success!/i);
diff --git a/src/tests/components/FSHControls.test.jsx b/tests/components/FSHControls.test.jsx
similarity index 99%
rename from src/tests/components/FSHControls.test.jsx
rename to tests/components/FSHControls.test.jsx
index d6b54197..9a6ce1ba 100644
--- a/src/tests/components/FSHControls.test.jsx
+++ b/tests/components/FSHControls.test.jsx
@@ -3,8 +3,8 @@ import 'fake-indexeddb/auto';
 import { unmountComponentAtNode } from 'react-dom';
 import { act } from 'react-dom/test-utils';
 import { render, waitFor, fireEvent } from '@testing-library/react';
-import FSHControls from '../../components/FSHControls';
-import * as fshHelpers from '../../utils/FSHHelpers';
+import FSHControls from '../../src/components/FSHControls';
+import * as fshHelpers from '../../src/utils/FSHHelpers';
 
 const badSUSHIPackage = { a: '1', b: '2' };
 const emptySUSHIPackage = {
diff --git a/src/tests/components/FSHOutput.test.jsx b/tests/components/FSHEditor.test.jsx
similarity index 96%
rename from src/tests/components/FSHOutput.test.jsx
rename to tests/components/FSHEditor.test.jsx
index 297235cc..2c127f2d 100644
--- a/src/tests/components/FSHOutput.test.jsx
+++ b/tests/components/FSHEditor.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
 import FileSaver from 'file-saver';
-import FSHOutput from '../../components/FSHOutput';
+import FSHEditor from '../../src/components/FSHEditor';
 
 let container = null;
 beforeEach(() => {
@@ -21,7 +21,7 @@ it('should render a delete button in editor header that opens a confirmation and
   const fshText = 'Profile: MyImportantProfile';
 
   const { getByRole, queryByText } = render(
-    <FSHOutput
+    <FSHEditor
       text={fshText}
       initialText={fshText}
       updateTextValue={vi.fn()}
@@ -56,7 +56,7 @@ it('should render a save button in the editor header that saves the FSH', () =>
   const fshText = 'Profile: MyImportantProfile';
 
   const { getByRole } = render(
-    <FSHOutput
+    <FSHEditor
       text={fshText}
       initialText={fshText}
       updateTextValue={vi.fn()}
diff --git a/src/tests/components/JSONOutput.test.jsx b/tests/components/JSONEditor.test.jsx
similarity index 97%
rename from src/tests/components/JSONOutput.test.jsx
rename to tests/components/JSONEditor.test.jsx
index 881a7d2d..ec426647 100644
--- a/src/tests/components/JSONOutput.test.jsx
+++ b/tests/components/JSONEditor.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
 import FileSaver from 'file-saver';
-import JSONOutput from '../../components/JSONOutput';
+import JSONEditor from '../../src/components/JSONEditor';
 
 let container = null;
 beforeEach(() => {
@@ -18,7 +18,7 @@ afterEach(() => {
 
 it('Renders with the placeholder text if showNewText is false and no text', () => {
   // Initial case, nothing from SUSHI is displayed
-  const { getByText } = render(<JSONOutput showNewText={false} text={''} />, container);
+  const { getByText } = render(<JSONEditor showNewText={false} text={''} />, container);
 
   const placeholderText = getByText(/Paste or edit single FHIR JSON artifact here.../i);
 
@@ -26,17 +26,17 @@ it('Renders with the placeholder text if showNewText is false and no text', () =
 });
 
 it('Renders with the proper text and updates with proper text when loading', () => {
-  const { getByText } = render(<JSONOutput showNewText={false} text={''} isWaiting={true} />, container);
+  const { getByText } = render(<JSONEditor showNewText={false} text={''} isWaiting={true} />, container);
 
   const loadingPlaceholderText = getByText('Loading...');
 
   expect(loadingPlaceholderText).toBeInTheDocument();
 });
 
-// TODO: CodeMirrorComponent doesn't get the package text properly - not sure why
+// TODO: CodeEditor doesn't get the package text properly - not sure why
 it.skip('Renders with the first profile when text is an object (SUSHI Package)', async () => {
   const { getByText } = render(
-    <JSONOutput
+    <JSONEditor
       showNewText={true}
       text={JSON.stringify(
         {
@@ -100,7 +100,7 @@ it('renders a delete button in editor header that opens a confirmation and then
   ];
 
   const { getByRole, getByText, queryByText } = render(
-    <JSONOutput
+    <JSONEditor
       showNewText={true}
       setShowNewText={() => {}}
       isWaiting={false}
@@ -162,7 +162,7 @@ it('renders a save button in editor header that saves the definition', () => {
     codeSystems: []
   };
   const { getByRole, getByText } = render(
-    <JSONOutput
+    <JSONEditor
       showNewText={true}
       setShowNewText={() => {}}
       isWaiting={false}
@@ -203,7 +203,7 @@ it('Renders an Add Definition button that adds a blank definition', () => {
     codeSystems: []
   };
   const { getByText, queryByText } = render(
-    <JSONOutput
+    <JSONEditor
       showNewText={true}
       setShowNewText={() => {}}
       isWaiting={false}
@@ -299,7 +299,7 @@ describe('file tree display', () => {
 
   it('renders a list of JSON definitions in a file tree', () => {
     const { getAllByTestId } = render(
-      <JSONOutput
+      <JSONEditor
         showNewText={true}
         setShowNewText={() => {}}
         isWaiting={false}
@@ -344,7 +344,7 @@ describe('file tree display', () => {
 
   it('resets currentDef and initialText of editor when a new definition is clicked', () => {
     const { getByText } = render(
-      <JSONOutput
+      <JSONEditor
         showNewText={true}
         setShowNewText={() => {}}
         isWaiting={false}
@@ -384,7 +384,7 @@ describe('file tree display', () => {
       codeSystems: []
     };
     const { getByText } = render(
-      <JSONOutput
+      <JSONEditor
         showNewText={true}
         setShowNewText={() => {}}
         isWaiting={false}
@@ -418,7 +418,7 @@ describe('file tree display', () => {
       codeSystems: []
     };
     const { getAllByTestId } = render(
-      <JSONOutput
+      <JSONEditor
         showNewText={true}
         setShowNewText={() => {}}
         isWaiting={false}
diff --git a/src/tests/components/ShareLink.test.jsx b/tests/components/ShareLink.test.jsx
similarity index 96%
rename from src/tests/components/ShareLink.test.jsx
rename to tests/components/ShareLink.test.jsx
index 4e3cef7b..abc8e8fc 100644
--- a/src/tests/components/ShareLink.test.jsx
+++ b/tests/components/ShareLink.test.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { render, waitFor, fireEvent } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
 import { act } from 'react-dom/test-utils';
-import ShareLink from '../../components/ShareLink';
-import * as bitlyWorker from '../../utils/BitlyWorker';
+import ShareLink from '../../src/components/ShareLink';
+import * as bitlyWorker from '../../src/utils/BitlyWorker';
 
 // Mock copy to clipboard since we don't need to test the component itself
 vi.mock('copy-to-clipboard', () => ({
diff --git a/src/tests/components/TopBar.test.jsx b/tests/components/TopBar.test.jsx
similarity index 91%
rename from src/tests/components/TopBar.test.jsx
rename to tests/components/TopBar.test.jsx
index e81c0ba3..fe6d0806 100644
--- a/src/tests/components/TopBar.test.jsx
+++ b/tests/components/TopBar.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { unmountComponentAtNode } from 'react-dom';
-import TopBar from '../../components/TopBar';
+import TopBar from '../../src/components/TopBar';
 
 let container = null;
 beforeEach(() => {
diff --git a/src/setupTests.js b/tests/setupTests.js
similarity index 100%
rename from src/setupTests.js
rename to tests/setupTests.js
diff --git a/src/tests/utils/FSHHelpers.test.js b/tests/utils/FSHHelpers.test.js
similarity index 99%
rename from src/tests/utils/FSHHelpers.test.js
rename to tests/utils/FSHHelpers.test.js
index eefa9f2a..761927b2 100644
--- a/src/tests/utils/FSHHelpers.test.js
+++ b/tests/utils/FSHHelpers.test.js
@@ -1,5 +1,5 @@
-import { runSUSHI, runGoFSH, getCoreFHIRPackageIdentifier } from '../../utils/FSHHelpers';
-import * as processing from '../../utils/Processing';
+import { runSUSHI, runGoFSH, getCoreFHIRPackageIdentifier } from '../../src/utils/FSHHelpers';
+import * as processing from '../../src/utils/Processing';
 import Patient from './fixtures/StructureDefinition-Patient.json';
 import StructureDefinition from './fixtures/StructureDefinition-StructureDefinition.json';
 import Quantity from './fixtures/StructureDefinition-Quantity.json';
diff --git a/src/tests/utils/Load.test.js b/tests/utils/Load.test.js
similarity index 97%
rename from src/tests/utils/Load.test.js
rename to tests/utils/Load.test.js
index 1fce6f5b..fa7fd403 100644
--- a/src/tests/utils/Load.test.js
+++ b/tests/utils/Load.test.js
@@ -1,4 +1,9 @@
-import { unzipDependencies, loadDependenciesInStorage, loadAsFHIRDefs, getLatestVersionNumber } from '../../utils/Load';
+import {
+  unzipDependencies,
+  loadDependenciesInStorage,
+  loadAsFHIRDefs,
+  getLatestVersionNumber
+} from '../../src/utils/Load';
 import { fhirdefs } from 'fsh-sushi';
 import path from 'path';
 import nock from 'nock';
diff --git a/src/tests/utils/Processing.test.js b/tests/utils/Processing.test.js
similarity index 99%
rename from src/tests/utils/Processing.test.js
rename to tests/utils/Processing.test.js
index 5b283a36..ce278a90 100644
--- a/src/tests/utils/Processing.test.js
+++ b/tests/utils/Processing.test.js
@@ -5,9 +5,9 @@ import {
   fillTank,
   loadExternalDependencies,
   resolveDependencies
-} from '../../utils/Processing';
+} from '../../src/utils/Processing';
 import { fhirdefs, sushiImport } from 'fsh-sushi';
-import * as loadModule from '../../utils/Load';
+import * as loadModule from '../../src/utils/Load';
 import 'fake-indexeddb/auto';
 
 const FHIRDefinitions = fhirdefs.FHIRDefinitions;
diff --git a/src/tests/utils/fixtures/StructureDefinition-Patient.json b/tests/utils/fixtures/StructureDefinition-Patient.json
similarity index 100%
rename from src/tests/utils/fixtures/StructureDefinition-Patient.json
rename to tests/utils/fixtures/StructureDefinition-Patient.json
diff --git a/src/tests/utils/fixtures/StructureDefinition-Quantity.json b/tests/utils/fixtures/StructureDefinition-Quantity.json
similarity index 100%
rename from src/tests/utils/fixtures/StructureDefinition-Quantity.json
rename to tests/utils/fixtures/StructureDefinition-Quantity.json
diff --git a/src/tests/utils/fixtures/StructureDefinition-StructureDefinition.json b/tests/utils/fixtures/StructureDefinition-StructureDefinition.json
similarity index 100%
rename from src/tests/utils/fixtures/StructureDefinition-StructureDefinition.json
rename to tests/utils/fixtures/StructureDefinition-StructureDefinition.json
diff --git a/src/tests/utils/fixtures/hl7.fhir.r4.fake-4.0.1.tgz b/tests/utils/fixtures/hl7.fhir.r4.fake-4.0.1.tgz
similarity index 100%
rename from src/tests/utils/fixtures/hl7.fhir.r4.fake-4.0.1.tgz
rename to tests/utils/fixtures/hl7.fhir.r4.fake-4.0.1.tgz
diff --git a/src/tests/utils/helpers.test.js b/tests/utils/helpers.test.js
similarity index 90%
rename from src/tests/utils/helpers.test.js
rename to tests/utils/helpers.test.js
index 0f13e7ad..52902416 100644
--- a/src/tests/utils/helpers.test.js
+++ b/tests/utils/helpers.test.js
@@ -1,4 +1,4 @@
-import { sliceDependency } from '../../utils/helpers';
+import { sliceDependency } from '../../src/utils/helpers';
 
 describe('#sliceDependency()', () => {
   it('should correctly parse a given array of dependencies', () => {
diff --git a/vite.config.mjs b/vite.config.mjs
index 502ae757..b18848f1 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -59,6 +59,6 @@ export default defineConfig({
   test: {
     environment: 'jsdom',
     globals: true,
-    setupFiles: 'src/setupTests.js'
+    setupFiles: 'tests/setupTests.js'
   }
 });