diff --git a/src/App.js b/src/App.js
index e99d339..61d8780 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,23 +2,23 @@ import React, { useContext } from 'react';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 import { NotificationStateContext } from './contexts/NotificationContext';
 
-import Login from './pages/Login';
-import CreatePassword from './pages/setup/CreatePassword';
-import ConfigureAccount from './pages/setup/ConfigureAccount';
-import CreateApplication from './pages/setup/CreateApplication';
-import ConfigureSipTrunk from './pages/setup/ConfigureSipTrunk';
-import SetupComplete from './pages/setup/SetupComplete';
-import AccountsList from './pages/internal/AccountsList';
-import ApplicationsList from './pages/internal/ApplicationsList';
-import SipTrunksList from './pages/internal/SipTrunksList';
-import PhoneNumbersList from './pages/internal/PhoneNumbersList';
-import AccountsAddEdit from './pages/internal/AccountsAddEdit';
-import ApplicationsAddEdit from './pages/internal/ApplicationsAddEdit';
-import SipTrunksAddEdit from './pages/internal/SipTrunksAddEdit';
-import PhoneNumbersAddEdit from './pages/internal/PhoneNumbersAddEdit';
+import Login from './components/pages/Login';
+import CreatePassword from './components/pages/setup/CreatePassword';
+import ConfigureAccount from './components/pages/setup/ConfigureAccount';
+import CreateApplication from './components/pages/setup/CreateApplication';
+import ConfigureSipTrunk from './components/pages/setup/ConfigureSipTrunk';
+import SetupComplete from './components/pages/setup/SetupComplete';
+import AccountsList from './components/pages/internal/AccountsList';
+import ApplicationsList from './components/pages/internal/ApplicationsList';
+import SipTrunksList from './components/pages/internal/SipTrunksList';
+import PhoneNumbersList from './components/pages/internal/PhoneNumbersList';
+import AccountsAddEdit from './components/pages/internal/AccountsAddEdit';
+import ApplicationsAddEdit from './components/pages/internal/ApplicationsAddEdit';
+import SipTrunksAddEdit from './components/pages/internal/SipTrunksAddEdit';
+import PhoneNumbersAddEdit from './components/pages/internal/PhoneNumbersAddEdit';
 
-import Notification from './blocks/Notification';
-import Nav from './blocks/Nav';
+import Notification from './components/blocks/Notification';
+import Nav from './components/blocks/Nav';
 
 function App() {
   const notifications = useContext(NotificationStateContext);
diff --git a/src/blocks/Breadcrumbs.js b/src/components/blocks/Breadcrumbs.js
similarity index 90%
rename from src/blocks/Breadcrumbs.js
rename to src/components/blocks/Breadcrumbs.js
index d204498..14515a5 100644
--- a/src/blocks/Breadcrumbs.js
+++ b/src/components/blocks/Breadcrumbs.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components/macro';
-import { ReactComponent as Chevron } from '../images/Chevron.svg';
+import { ReactComponent as Chevron } from '../../images/Chevron.svg';
 import Link from '../elements/Link';
 
 const BreadcrumbsContainer = styled.div`
diff --git a/src/blocks/FormError.js b/src/components/blocks/FormError.js
similarity index 92%
rename from src/blocks/FormError.js
rename to src/components/blocks/FormError.js
index fc9759a..bd50ee7 100644
--- a/src/blocks/FormError.js
+++ b/src/components/blocks/FormError.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import styled from 'styled-components/macro';
-import { ReactComponent as ErrorIcon } from '../images/ErrorIcon.svg';
+import { ReactComponent as ErrorIcon } from '../../images/ErrorIcon.svg';
 
 const FormErrorContainer = styled.div`
   display: flex;
diff --git a/src/blocks/Loader.js b/src/components/blocks/Loader.js
similarity index 100%
rename from src/blocks/Loader.js
rename to src/components/blocks/Loader.js
diff --git a/src/blocks/Modal.js b/src/components/blocks/Modal.js
similarity index 96%
rename from src/blocks/Modal.js
rename to src/components/blocks/Modal.js
index 0ae3cec..775c914 100644
--- a/src/blocks/Modal.js
+++ b/src/components/blocks/Modal.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useContext } from 'react';
-import { ModalDispatchContext } from '../contexts/ModalContext';
+import { ModalDispatchContext } from '../../contexts/ModalContext';
 import styled from 'styled-components/macro';
 import Button from '../elements/Button';
 
diff --git a/src/blocks/Nav.js b/src/components/blocks/Nav.js
similarity index 94%
rename from src/blocks/Nav.js
rename to src/components/blocks/Nav.js
index a53064b..18cf20d 100644
--- a/src/blocks/Nav.js
+++ b/src/components/blocks/Nav.js
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import styled from 'styled-components/macro';
-import { NotificationDispatchContext } from '../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../contexts/NotificationContext';
 import Button from '../elements/Button';
 
 const StyledNav = styled.nav`
diff --git a/src/blocks/Notification.js b/src/components/blocks/Notification.js
similarity index 91%
rename from src/blocks/Notification.js
rename to src/components/blocks/Notification.js
index 5266bbb..b85f85f 100644
--- a/src/blocks/Notification.js
+++ b/src/components/blocks/Notification.js
@@ -1,8 +1,8 @@
 import React, { useContext } from 'react';
 import styled from 'styled-components/macro';
-import { NotificationDispatchContext } from '../contexts/NotificationContext';
-import { ReactComponent as CheckGreen } from '../images/CheckGreen.svg';
-import { ReactComponent as ErrorIcon } from '../images/ErrorIcon.svg';
+import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { ReactComponent as CheckGreen } from '../../images/CheckGreen.svg';
+import { ReactComponent as ErrorIcon } from '../../images/ErrorIcon.svg';
 
 const NotificationContainer = styled.div`
   position: fixed;
diff --git a/src/blocks/ProgressVisualization.js b/src/components/blocks/ProgressVisualization.js
similarity index 100%
rename from src/blocks/ProgressVisualization.js
rename to src/components/blocks/ProgressVisualization.js
diff --git a/src/blocks/TableContent.js b/src/components/blocks/TableContent.js
similarity index 98%
rename from src/blocks/TableContent.js
rename to src/components/blocks/TableContent.js
index 911a7c9..af5d5ed 100644
--- a/src/blocks/TableContent.js
+++ b/src/components/blocks/TableContent.js
@@ -1,8 +1,8 @@
 import React, { useState, useEffect, useContext } from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
-import { ModalStateContext } from '../contexts/ModalContext';
-import { NotificationDispatchContext } from '../contexts/NotificationContext';
+import { ModalStateContext } from '../../contexts/ModalContext';
+import { NotificationDispatchContext } from '../../contexts/NotificationContext';
 import Table from '../elements/Table.js';
 import Button from '../elements/Button.js';
 import TableMenu from '../blocks/TableMenu.js';
diff --git a/src/blocks/TableMenu.js b/src/components/blocks/TableMenu.js
similarity index 97%
rename from src/blocks/TableMenu.js
rename to src/components/blocks/TableMenu.js
index b644426..68cf4e6 100644
--- a/src/blocks/TableMenu.js
+++ b/src/components/blocks/TableMenu.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import styled, { css } from 'styled-components/macro';
-import { ReactComponent as MenuDots } from '../images/MenuDots.svg';
+import { ReactComponent as MenuDots } from '../../images/MenuDots.svg';
 
 const Button = styled.button`
   background: none;
diff --git a/src/elements/AddButton.js b/src/components/elements/AddButton.js
similarity index 96%
rename from src/elements/AddButton.js
rename to src/components/elements/AddButton.js
index 96f1fe1..228d2ef 100644
--- a/src/elements/AddButton.js
+++ b/src/components/elements/AddButton.js
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components/macro';
-import { ModalStateContext } from '../contexts/ModalContext';
+import { ModalStateContext } from '../../contexts/ModalContext';
 
 const FilteredLink = ({ addButtonText, ...props }) => (
   <Link {...props}>{props.children}</Link>
diff --git a/src/elements/Button.js b/src/components/elements/Button.js
similarity index 97%
rename from src/elements/Button.js
rename to src/components/elements/Button.js
index d879ac1..abb5e6b 100644
--- a/src/elements/Button.js
+++ b/src/components/elements/Button.js
@@ -1,5 +1,5 @@
 import React, { useContext, useRef, forwardRef, useImperativeHandle } from 'react';
-import { ModalStateContext } from '../contexts/ModalContext';
+import { ModalStateContext } from '../../contexts/ModalContext';
 import styled from 'styled-components/macro';
 
 const StyledButton = styled.button`
diff --git a/src/elements/Checkbox.js b/src/components/elements/Checkbox.js
similarity index 100%
rename from src/elements/Checkbox.js
rename to src/components/elements/Checkbox.js
diff --git a/src/elements/Form.js b/src/components/elements/Form.js
similarity index 100%
rename from src/elements/Form.js
rename to src/components/elements/Form.js
diff --git a/src/elements/H1.js b/src/components/elements/H1.js
similarity index 100%
rename from src/elements/H1.js
rename to src/components/elements/H1.js
diff --git a/src/elements/Input.js b/src/components/elements/Input.js
similarity index 93%
rename from src/elements/Input.js
rename to src/components/elements/Input.js
index 702cc77..b2cf8ec 100644
--- a/src/elements/Input.js
+++ b/src/components/elements/Input.js
@@ -1,7 +1,7 @@
 import React, { useRef, forwardRef, useImperativeHandle } from 'react';
 import styled from 'styled-components/macro';
-import { ReactComponent as ViewPassword } from '../images/ViewPassword.svg';
-import { ReactComponent as HidePassword } from '../images/HidePassword.svg';
+import { ReactComponent as ViewPassword } from '../../images/ViewPassword.svg';
+import { ReactComponent as HidePassword } from '../../images/HidePassword.svg';
 
 const Container = styled.div`
   position: relative;
diff --git a/src/elements/InputGroup.js b/src/components/elements/InputGroup.js
similarity index 100%
rename from src/elements/InputGroup.js
rename to src/components/elements/InputGroup.js
diff --git a/src/elements/Label.js b/src/components/elements/Label.js
similarity index 100%
rename from src/elements/Label.js
rename to src/components/elements/Label.js
diff --git a/src/elements/Link.js b/src/components/elements/Link.js
similarity index 95%
rename from src/elements/Link.js
rename to src/components/elements/Link.js
index 6167bf1..88c8449 100644
--- a/src/elements/Link.js
+++ b/src/components/elements/Link.js
@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
 import { Link as ReactRouterLink } from 'react-router-dom';
 import styled from 'styled-components/macro';
-import { ModalStateContext } from '../contexts/ModalContext';
+import { ModalStateContext } from '../../contexts/ModalContext';
 
 const FilteredLink = ({ formLink, right, inModal, ...props }) => (
   <ReactRouterLink {...props}>{props.children}</ReactRouterLink>
diff --git a/src/elements/PasswordInput.js b/src/components/elements/PasswordInput.js
similarity index 100%
rename from src/elements/PasswordInput.js
rename to src/components/elements/PasswordInput.js
diff --git a/src/elements/Select.js b/src/components/elements/Select.js
similarity index 100%
rename from src/elements/Select.js
rename to src/components/elements/Select.js
diff --git a/src/elements/Table.js b/src/components/elements/Table.js
similarity index 100%
rename from src/elements/Table.js
rename to src/components/elements/Table.js
diff --git a/src/elements/TrashButton.js b/src/components/elements/TrashButton.js
similarity index 93%
rename from src/elements/TrashButton.js
rename to src/components/elements/TrashButton.js
index 64e7529..6a04925 100644
--- a/src/elements/TrashButton.js
+++ b/src/components/elements/TrashButton.js
@@ -1,6 +1,6 @@
 import React, { useRef, forwardRef, useImperativeHandle } from 'react';
 import styled from 'styled-components/macro';
-import { ReactComponent as TrashIcon } from '../images/TrashIcon.svg';
+import { ReactComponent as TrashIcon } from '../../images/TrashIcon.svg';
 
 const StyledButton = styled.button`
   display: flex;
diff --git a/src/blocks/forms/AccountForm.js b/src/components/forms/AccountForm.js
similarity index 96%
rename from src/blocks/forms/AccountForm.js
rename to src/components/forms/AccountForm.js
index ee24fa8..e60f897 100644
--- a/src/blocks/forms/AccountForm.js
+++ b/src/components/forms/AccountForm.js
@@ -2,16 +2,16 @@ import React, { useState, useEffect, useContext, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import axios from 'axios';
 import { NotificationDispatchContext } from '../../contexts/NotificationContext';
-import Form from '../../elements/Form';
-import Input from '../../elements/Input';
-import Label from '../../elements/Label';
-import Select from '../../elements/Select';
-import InputGroup from '../../elements/InputGroup';
-import PasswordInput from '../../elements/PasswordInput';
-import FormError from '../../blocks/FormError';
-import Loader from '../../blocks/Loader';
-import Button from '../../elements/Button';
-import Link from '../../elements/Link';
+import Form from '../elements/Form';
+import Input from '../elements/Input';
+import Label from '../elements/Label';
+import Select from '../elements/Select';
+import InputGroup from '../elements/InputGroup';
+import PasswordInput from '../elements/PasswordInput';
+import FormError from '../blocks/FormError';
+import Loader from '../blocks/Loader';
+import Button from '../elements/Button';
+import Link from '../elements/Link';
 
 const AccountForm = props => {
   let history = useHistory();
diff --git a/src/blocks/forms/ApplicationForm.js b/src/components/forms/ApplicationForm.js
similarity index 98%
rename from src/blocks/forms/ApplicationForm.js
rename to src/components/forms/ApplicationForm.js
index fb5b364..eeb9a28 100644
--- a/src/blocks/forms/ApplicationForm.js
+++ b/src/components/forms/ApplicationForm.js
@@ -2,18 +2,18 @@ import React, { useState, useEffect, useContext, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import axios from 'axios';
 import { NotificationDispatchContext } from '../../contexts/NotificationContext';
-import Form from '../../elements/Form';
-import Input from '../../elements/Input';
-import Label from '../../elements/Label';
-import Select from '../../elements/Select';
-import InputGroup from '../../elements/InputGroup';
-import PasswordInput from '../../elements/PasswordInput';
-import FormError from '../../blocks/FormError';
-import Button from '../../elements/Button';
+import Form from '../elements/Form';
+import Input from '../elements/Input';
+import Label from '../elements/Label';
+import Select from '../elements/Select';
+import InputGroup from '../elements/InputGroup';
+import PasswordInput from '../elements/PasswordInput';
+import FormError from '../blocks/FormError';
+import Button from '../elements/Button';
 import SpeechSynthesisLanguageGoogle from '../../data/SpeechSynthesisLanguageGoogle';
 import SpeechSynthesisLanguageAws from '../../data/SpeechSynthesisLanguageAws';
 import SpeechRecognizerLanguageGoogle from '../../data/SpeechRecognizerLanguageGoogle';
-import Loader from '../../blocks/Loader';
+import Loader from '../blocks/Loader';
 
 const ApplicationForm = props => {
   let history = useHistory();
diff --git a/src/blocks/forms/PhoneNumberForm.js b/src/components/forms/PhoneNumberForm.js
similarity index 96%
rename from src/blocks/forms/PhoneNumberForm.js
rename to src/components/forms/PhoneNumberForm.js
index e514b7e..50b77a4 100644
--- a/src/blocks/forms/PhoneNumberForm.js
+++ b/src/components/forms/PhoneNumberForm.js
@@ -2,14 +2,14 @@ import React, { useState, useEffect, useContext, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import axios from 'axios';
 import { NotificationDispatchContext } from '../../contexts/NotificationContext';
-import Form from '../../elements/Form';
-import Input from '../../elements/Input';
-import Label from '../../elements/Label';
-import Select from '../../elements/Select';
-import InputGroup from '../../elements/InputGroup';
-import FormError from '../../blocks/FormError';
-import Loader from '../../blocks/Loader';
-import Button from '../../elements/Button';
+import Form from '../elements/Form';
+import Input from '../elements/Input';
+import Label from '../elements/Label';
+import Select from '../elements/Select';
+import InputGroup from '../elements/InputGroup';
+import FormError from '../blocks/FormError';
+import Loader from '../blocks/Loader';
+import Button from '../elements/Button';
 
 const PhoneNumberForm = props => {
 
diff --git a/src/blocks/forms/SipTrunkForm.js b/src/components/forms/SipTrunkForm.js
similarity index 98%
rename from src/blocks/forms/SipTrunkForm.js
rename to src/components/forms/SipTrunkForm.js
index f9db5c8..605ca0b 100644
--- a/src/blocks/forms/SipTrunkForm.js
+++ b/src/components/forms/SipTrunkForm.js
@@ -2,15 +2,15 @@ import React, { useState, useEffect, useContext, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import axios from 'axios';
 import { NotificationDispatchContext } from '../../contexts/NotificationContext';
-import Form from '../../elements/Form';
-import Input from '../../elements/Input';
-import Label from '../../elements/Label';
-import Checkbox from '../../elements/Checkbox';
-import InputGroup from '../../elements/InputGroup';
-import FormError from '../../blocks/FormError';
-import Button from '../../elements/Button';
-import TrashButton from '../../elements/TrashButton';
-import Loader from '../../blocks/Loader';
+import Form from '../elements/Form';
+import Input from '../elements/Input';
+import Label from '../elements/Label';
+import Checkbox from '../elements/Checkbox';
+import InputGroup from '../elements/InputGroup';
+import FormError from '../blocks/FormError';
+import Button from '../elements/Button';
+import TrashButton from '../elements/TrashButton';
+import Loader from '../blocks/Loader';
 
 const SipTrunkForm = props => {
   const history = useHistory();
diff --git a/src/pages/Login.js b/src/components/pages/Login.js
similarity index 100%
rename from src/pages/Login.js
rename to src/components/pages/Login.js
diff --git a/src/pages/internal/AccountsAddEdit.js b/src/components/pages/internal/AccountsAddEdit.js
similarity index 91%
rename from src/pages/internal/AccountsAddEdit.js
rename to src/components/pages/internal/AccountsAddEdit.js
index faf745e..99b55e3 100644
--- a/src/pages/internal/AccountsAddEdit.js
+++ b/src/components/pages/internal/AccountsAddEdit.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import InternalTemplate from '../../templates/InternalTemplate';
-import AccountForm from '../../blocks/forms/AccountForm';
+import AccountForm from '../../forms/AccountForm';
 
 const AccountsAddEdit = () => {
   let { account_sid } = useParams();
diff --git a/src/pages/internal/AccountsList.js b/src/components/pages/internal/AccountsList.js
similarity index 98%
rename from src/pages/internal/AccountsList.js
rename to src/components/pages/internal/AccountsList.js
index e63059b..6320983 100644
--- a/src/pages/internal/AccountsList.js
+++ b/src/components/pages/internal/AccountsList.js
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import axios from 'axios';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import InternalTemplate from '../../templates/InternalTemplate';
 import TableContent from '../../blocks/TableContent.js';
 
diff --git a/src/pages/internal/ApplicationsAddEdit.js b/src/components/pages/internal/ApplicationsAddEdit.js
similarity index 91%
rename from src/pages/internal/ApplicationsAddEdit.js
rename to src/components/pages/internal/ApplicationsAddEdit.js
index ca4f5f6..bf53ab9 100644
--- a/src/pages/internal/ApplicationsAddEdit.js
+++ b/src/components/pages/internal/ApplicationsAddEdit.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import InternalTemplate from '../../templates/InternalTemplate';
-import ApplicationForm from '../../blocks/forms/ApplicationForm';
+import ApplicationForm from '../../forms/ApplicationForm';
 
 const ApplicationsAddEdit = () => {
   let { application_sid } = useParams();
diff --git a/src/pages/internal/ApplicationsList.js b/src/components/pages/internal/ApplicationsList.js
similarity index 97%
rename from src/pages/internal/ApplicationsList.js
rename to src/components/pages/internal/ApplicationsList.js
index 3a18dad..7ef36cc 100644
--- a/src/pages/internal/ApplicationsList.js
+++ b/src/components/pages/internal/ApplicationsList.js
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import axios from 'axios';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import InternalTemplate from '../../templates/InternalTemplate';
 import TableContent from '../../blocks/TableContent.js';
 
diff --git a/src/pages/internal/PhoneNumbersAddEdit.js b/src/components/pages/internal/PhoneNumbersAddEdit.js
similarity index 91%
rename from src/pages/internal/PhoneNumbersAddEdit.js
rename to src/components/pages/internal/PhoneNumbersAddEdit.js
index 8356f9b..51f4af2 100644
--- a/src/pages/internal/PhoneNumbersAddEdit.js
+++ b/src/components/pages/internal/PhoneNumbersAddEdit.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import InternalTemplate from '../../templates/InternalTemplate';
-import PhoneNumberForm from '../../blocks/forms/PhoneNumberForm';
+import PhoneNumberForm from '../../forms/PhoneNumberForm';
 
 const PhoneNumbersAddEdit = () => {
   let { phone_number_sid } = useParams();
diff --git a/src/pages/internal/PhoneNumbersList.js b/src/components/pages/internal/PhoneNumbersList.js
similarity index 98%
rename from src/pages/internal/PhoneNumbersList.js
rename to src/components/pages/internal/PhoneNumbersList.js
index a45996b..5f22c66 100644
--- a/src/pages/internal/PhoneNumbersList.js
+++ b/src/components/pages/internal/PhoneNumbersList.js
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import axios from 'axios';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import InternalTemplate from '../../templates/InternalTemplate';
 import TableContent from '../../blocks/TableContent.js';
 
diff --git a/src/pages/internal/SipTrunksAddEdit.js b/src/components/pages/internal/SipTrunksAddEdit.js
similarity index 91%
rename from src/pages/internal/SipTrunksAddEdit.js
rename to src/components/pages/internal/SipTrunksAddEdit.js
index 5d62189..9b7574b 100644
--- a/src/pages/internal/SipTrunksAddEdit.js
+++ b/src/components/pages/internal/SipTrunksAddEdit.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
 import InternalTemplate from '../../templates/InternalTemplate';
-import SipTrunkForm from '../../blocks/forms/SipTrunkForm';
+import SipTrunkForm from '../../forms/SipTrunkForm';
 
 const SipTrunksAddEdit = () => {
   let { voip_carrier_sid } = useParams();
diff --git a/src/pages/internal/SipTrunksList.js b/src/components/pages/internal/SipTrunksList.js
similarity index 98%
rename from src/pages/internal/SipTrunksList.js
rename to src/components/pages/internal/SipTrunksList.js
index 3fb0a83..bd570db 100644
--- a/src/pages/internal/SipTrunksList.js
+++ b/src/components/pages/internal/SipTrunksList.js
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import axios from 'axios';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import InternalTemplate from '../../templates/InternalTemplate';
 import TableContent from '../../blocks/TableContent.js';
 
diff --git a/src/pages/setup/ConfigureAccount.js b/src/components/pages/setup/ConfigureAccount.js
similarity index 85%
rename from src/pages/setup/ConfigureAccount.js
rename to src/components/pages/setup/ConfigureAccount.js
index b018b69..93e34f2 100644
--- a/src/pages/setup/ConfigureAccount.js
+++ b/src/components/pages/setup/ConfigureAccount.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import SetupTemplate from '../../templates/SetupTemplate';
-import AccountForm from '../../blocks/forms/AccountForm';
+import AccountForm from '../../forms/AccountForm';
 
 const ConfigureAccount = () => {
   return (
diff --git a/src/pages/setup/ConfigureSipTrunk.js b/src/components/pages/setup/ConfigureSipTrunk.js
similarity index 84%
rename from src/pages/setup/ConfigureSipTrunk.js
rename to src/components/pages/setup/ConfigureSipTrunk.js
index cd67096..4c3c82d 100644
--- a/src/pages/setup/ConfigureSipTrunk.js
+++ b/src/components/pages/setup/ConfigureSipTrunk.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import SetupTemplate from '../../templates/SetupTemplate';
-import SipTrunkForm from '../../blocks/forms/SipTrunkForm';
+import SipTrunkForm from '../../forms/SipTrunkForm';
 
 const ConfigureSipTrunk = () => {
   return (
diff --git a/src/pages/setup/CreateApplication.js b/src/components/pages/setup/CreateApplication.js
similarity index 83%
rename from src/pages/setup/CreateApplication.js
rename to src/components/pages/setup/CreateApplication.js
index 721a645..0ba0c91 100644
--- a/src/pages/setup/CreateApplication.js
+++ b/src/components/pages/setup/CreateApplication.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import SetupTemplate from '../../templates/SetupTemplate';
-import ApplicationForm from '../../blocks/forms/ApplicationForm';
+import ApplicationForm from '../../forms/ApplicationForm';
 
 const CreateApplication = () => {
   return (
diff --git a/src/pages/setup/CreatePassword.js b/src/components/pages/setup/CreatePassword.js
similarity index 98%
rename from src/pages/setup/CreatePassword.js
rename to src/components/pages/setup/CreatePassword.js
index f560dd9..2055e49 100644
--- a/src/pages/setup/CreatePassword.js
+++ b/src/components/pages/setup/CreatePassword.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useContext, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import axios from 'axios';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import SetupTemplate from '../../templates/SetupTemplate';
 import Form from '../../elements/Form';
 import Button from '../../elements/Button';
diff --git a/src/pages/setup/SetupComplete.js b/src/components/pages/setup/SetupComplete.js
similarity index 91%
rename from src/pages/setup/SetupComplete.js
rename to src/components/pages/setup/SetupComplete.js
index 94f7ca0..92c3ca7 100644
--- a/src/pages/setup/SetupComplete.js
+++ b/src/components/pages/setup/SetupComplete.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useContext } from 'react';
 import { useHistory } from 'react-router-dom';
-import { NotificationDispatchContext } from '../../contexts/NotificationContext';
+import { NotificationDispatchContext } from '../../../contexts/NotificationContext';
 import SetupTemplate from '../../templates/SetupTemplate';
 import Button from '../../elements/Button';
 
diff --git a/src/templates/InternalTemplate.js b/src/components/templates/InternalTemplate.js
similarity index 88%
rename from src/templates/InternalTemplate.js
rename to src/components/templates/InternalTemplate.js
index c260adb..77bd536 100644
--- a/src/templates/InternalTemplate.js
+++ b/src/components/templates/InternalTemplate.js
@@ -1,13 +1,13 @@
 import React, { useEffect, useContext } from 'react';
 import { NavLink, useHistory } from 'react-router-dom';
-import { ModalStateContext } from '../contexts/ModalContext';
-import { NotificationDispatchContext } from '../contexts/NotificationContext';
+import { ModalStateContext } from '../../contexts/ModalContext';
+import { NotificationDispatchContext } from '../../contexts/NotificationContext';
 import styled from 'styled-components/macro';
 import H1 from '../elements/H1';
-import { ReactComponent as AccountsIcon } from '../images/AccountsIcon.svg';
-import { ReactComponent as ApplicationsIcon } from '../images/ApplicationsIcon.svg';
-import { ReactComponent as SipTrunksIcon } from '../images/SipTrunksIcon.svg';
-import { ReactComponent as PhoneNumbersIcon } from '../images/PhoneNumbersIcon.svg';
+import { ReactComponent as AccountsIcon } from '../../images/AccountsIcon.svg';
+import { ReactComponent as ApplicationsIcon } from '../../images/ApplicationsIcon.svg';
+import { ReactComponent as SipTrunksIcon } from '../../images/SipTrunksIcon.svg';
+import { ReactComponent as PhoneNumbersIcon } from '../../images/PhoneNumbersIcon.svg';
 import AddButton from '../elements/AddButton';
 import Breadcrumbs from '../blocks/Breadcrumbs';
 
diff --git a/src/templates/SetupTemplate.js b/src/components/templates/SetupTemplate.js
similarity index 100%
rename from src/templates/SetupTemplate.js
rename to src/components/templates/SetupTemplate.js