diff --git a/client/coral-admin/src/components/AdminLogin.js b/client/coral-admin/src/components/AdminLogin.js
index 0dc0f2bd6..99bd61696 100644
--- a/client/coral-admin/src/components/AdminLogin.js
+++ b/client/coral-admin/src/components/AdminLogin.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Layout from 'coral-admin/src/components/ui/Layout';
+import Layout from 'coral-admin/src/components/Layout';
 import styles from './NotFound.css';
 import { Button, TextField, Alert, Success } from 'coral-ui';
 import Recaptcha from 'react-recaptcha';
diff --git a/client/coral-admin/src/components/ui/Header.css b/client/coral-admin/src/components/Header.css
similarity index 100%
rename from client/coral-admin/src/components/ui/Header.css
rename to client/coral-admin/src/components/Header.css
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/Header.js
similarity index 100%
rename from client/coral-admin/src/components/ui/Header.js
rename to client/coral-admin/src/components/Header.js
diff --git a/client/coral-admin/src/components/ui/Indicator.css b/client/coral-admin/src/components/Indicator.css
similarity index 100%
rename from client/coral-admin/src/components/ui/Indicator.css
rename to client/coral-admin/src/components/Indicator.css
diff --git a/client/coral-admin/src/components/ui/Indicator.js b/client/coral-admin/src/components/Indicator.js
similarity index 100%
rename from client/coral-admin/src/components/ui/Indicator.js
rename to client/coral-admin/src/components/Indicator.js
diff --git a/client/coral-admin/src/components/ui/Layout.css b/client/coral-admin/src/components/Layout.css
similarity index 100%
rename from client/coral-admin/src/components/ui/Layout.css
rename to client/coral-admin/src/components/Layout.css
diff --git a/client/coral-admin/src/components/ui/Layout.js b/client/coral-admin/src/components/Layout.js
similarity index 91%
rename from client/coral-admin/src/components/ui/Layout.js
rename to client/coral-admin/src/components/Layout.js
index 2542e4533..900858dee 100644
--- a/client/coral-admin/src/components/ui/Layout.js
+++ b/client/coral-admin/src/components/Layout.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Layout as LayoutMDL } from 'react-mdl';
-import Header from '../../containers/Header';
-import Drawer from '../Drawer';
+import Header from '../containers/Header';
+import Drawer from './Drawer';
 import styles from './Layout.css';
 
 const Layout = ({
diff --git a/client/coral-admin/src/components/ui/Logo.css b/client/coral-admin/src/components/Logo.css
similarity index 100%
rename from client/coral-admin/src/components/ui/Logo.css
rename to client/coral-admin/src/components/Logo.css
diff --git a/client/coral-admin/src/components/ui/Logo.js b/client/coral-admin/src/components/Logo.js
similarity index 100%
rename from client/coral-admin/src/components/ui/Logo.js
rename to client/coral-admin/src/components/Logo.js
diff --git a/client/coral-admin/src/containers/Header.js b/client/coral-admin/src/containers/Header.js
index 86fdfc796..49e2cab05 100644
--- a/client/coral-admin/src/containers/Header.js
+++ b/client/coral-admin/src/containers/Header.js
@@ -1,6 +1,6 @@
 import { gql } from 'react-apollo';
 import withQuery from 'coral-framework/hocs/withQuery';
-import Header from '../components/ui/Header';
+import Header from '../components/Header';
 
 export default withQuery(
   gql`
diff --git a/client/coral-admin/src/containers/Layout.js b/client/coral-admin/src/containers/Layout.js
index 4ca3133b8..c06e0739b 100644
--- a/client/coral-admin/src/containers/Layout.js
+++ b/client/coral-admin/src/containers/Layout.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import Layout from '../components/ui/Layout';
+import Layout from '../components/Layout';
 import { fetchConfig } from '../actions/config';
 import AdminLogin from '../components/AdminLogin';
 import { FullLoading } from '../components/FullLoading';
diff --git a/client/coral-admin/src/routes/Install/components/Install.js b/client/coral-admin/src/routes/Install/components/Install.js
index 5c654c81e..14afc12f5 100644
--- a/client/coral-admin/src/routes/Install/components/Install.js
+++ b/client/coral-admin/src/routes/Install/components/Install.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import styles from './Install.css';
 import { Wizard, WizardNav } from 'coral-ui';
-import Layout from 'coral-admin/src/components/ui/Layout';
+import Layout from 'coral-admin/src/components/Layout';
 
 import InitialStep from './Steps/InitialStep';
 import AddOrganizationName from './Steps/AddOrganizationName';