diff --git a/src/components/footer/index.js b/src/components/footer/index.js
deleted file mode 100644
index 97faaaf..0000000
--- a/src/components/footer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export Footer from './Footer';
diff --git a/src/components/header/index.js b/src/components/header/index.js
deleted file mode 100644
index d8cde81..0000000
--- a/src/components/header/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export Header from './Header';
diff --git a/src/components/index.js b/src/components/index.js
index bdcccc3..34c5e1c 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,7 +1,5 @@
 import Html from './Html';
-import Userbar from './userbar/Userbar';
 
 export {
-    Html,
-    Userbar
+    Html
 };
diff --git a/src/components/footer/Footer.jsx b/src/components/layout/footer/Footer.jsx
similarity index 100%
rename from src/components/footer/Footer.jsx
rename to src/components/layout/footer/Footer.jsx
diff --git a/src/components/footer/messages.intl.json b/src/components/layout/footer/messages.intl.json
similarity index 100%
rename from src/components/footer/messages.intl.json
rename to src/components/layout/footer/messages.intl.json
diff --git a/src/components/footer/styles.js b/src/components/layout/footer/styles.js
similarity index 100%
rename from src/components/footer/styles.js
rename to src/components/layout/footer/styles.js
diff --git a/src/components/header/Header.jsx b/src/components/layout/header/Header.jsx
similarity index 100%
rename from src/components/header/Header.jsx
rename to src/components/layout/header/Header.jsx
diff --git a/src/components/header/background.jpg b/src/components/layout/header/background.jpg
similarity index 100%
rename from src/components/header/background.jpg
rename to src/components/layout/header/background.jpg
diff --git a/src/components/header/messages.intl.json b/src/components/layout/header/messages.intl.json
similarity index 100%
rename from src/components/header/messages.intl.json
rename to src/components/layout/header/messages.intl.json
diff --git a/src/components/header/styles.js b/src/components/layout/header/styles.js
similarity index 100%
rename from src/components/header/styles.js
rename to src/components/layout/header/styles.js
diff --git a/src/components/layout/index.js b/src/components/layout/index.js
new file mode 100644
index 0000000..a74c02e
--- /dev/null
+++ b/src/components/layout/index.js
@@ -0,0 +1,9 @@
+import Userbar from './userbar/Userbar';
+import Header from './header/Header';
+import Footer from './footer/Footer';
+
+export {
+    Userbar,
+    Header,
+    Footer
+};
diff --git a/src/components/userbar/Userbar.jsx b/src/components/layout/userbar/Userbar.jsx
similarity index 100%
rename from src/components/userbar/Userbar.jsx
rename to src/components/layout/userbar/Userbar.jsx
diff --git a/src/components/userbar/logo.png b/src/components/layout/userbar/logo.png
similarity index 100%
rename from src/components/userbar/logo.png
rename to src/components/layout/userbar/logo.png
diff --git a/src/components/userbar/styles.js b/src/components/layout/userbar/styles.js
similarity index 100%
rename from src/components/userbar/styles.js
rename to src/components/layout/userbar/styles.js
diff --git a/src/components/userbar/index.js b/src/components/userbar/index.js
deleted file mode 100644
index ea34f2a..0000000
--- a/src/components/userbar/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export Userbar from './Userbar';
diff --git a/src/emails/register/Register.jsx b/src/emails/register/Register.jsx
index 863a178..9b8e21d 100644
--- a/src/emails/register/Register.jsx
+++ b/src/emails/register/Register.jsx
@@ -2,10 +2,8 @@ import { PropTypes } from 'react';
 
 import { FormattedMessage as Message } from 'react-intl';
 
-import { Userbar } from 'components/userbar';
+import { Userbar, Header, Footer } from 'components/layout';
 import { Table } from 'components/table';
-import { Header } from 'components/header';
-import { Footer } from 'components/footer';
 import { Button } from 'components/button';
 import { Input } from 'components/input';
 import { BitmapText } from 'components/text';