diff --git a/pages/article/[article].jsx b/pages/article/[article].jsx
index 5ef4cae6..5d82caf8 100644
--- a/pages/article/[article].jsx
+++ b/pages/article/[article].jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../../src/components/App'
+import { App } from '../../src/components/App'
 import Article from '../../src/components/Article'
 import Html from '../../src/components/Html'
 import menuModel from '../../src/models/menu'
diff --git a/pages/articles/[page].jsx b/pages/articles/[page].jsx
index c322042c..32429704 100644
--- a/pages/articles/[page].jsx
+++ b/pages/articles/[page].jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../../src/components/App'
+import { App } from '../../src/components/App'
 import ArticleCardList from '../../src/components/ArticleCardList'
 import menuModel from '../../src/models/menu'
 import { buildMenu } from '../../src/lib/menu'
diff --git a/pages/collective.jsx b/pages/collective.jsx
index 5c13c381..ff9f9ffa 100644
--- a/pages/collective.jsx
+++ b/pages/collective.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 import { Meta } from '../src/components/Meta'
 import { CollectiveImage } from '../src/components/CollectiveImage'
 import PersonCard from '../src/components/PersonCard'
diff --git a/pages/document/[document].jsx b/pages/document/[document].jsx
index 1e888385..5030f910 100644
--- a/pages/document/[document].jsx
+++ b/pages/document/[document].jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../../src/components/App'
+import { App } from '../../src/components/App'
 import Document from '../../src/components/Document'
 import Share from '../../src/components/Share'
 import menuModel from '../../src/models/menu'
diff --git a/pages/documents.jsx b/pages/documents.jsx
index 07167f72..419eceff 100644
--- a/pages/documents.jsx
+++ b/pages/documents.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 import { Meta } from '../src/components/Meta'
 import menuModel from '../src/models/menu'
 import { buildMenu } from '../src/lib/menu'
diff --git a/pages/gallery.jsx b/pages/gallery.jsx
index 45c7c154..27974838 100644
--- a/pages/gallery.jsx
+++ b/pages/gallery.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 // import Album from '../src/components/Album'
 import Article from '../src/components/Article'
 import { Meta } from '../src/components/Meta'
diff --git a/pages/index.jsx b/pages/index.jsx
index 6e0c44d3..8042caf0 100644
--- a/pages/index.jsx
+++ b/pages/index.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 import { Meta } from '../src/components/Meta'
 import ArticleCardList from '../src/components/ArticleCardList'
 import HudozkaTitle from '../src/components/HudozkaTitle'
diff --git a/pages/next.jsx b/pages/next.jsx
index 84e43274..98aa6179 100644
--- a/pages/next.jsx
+++ b/pages/next.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 import Page from '../src/components/Page'
 import menuModel from '../src/models/menu'
 import { buildMenu } from '../src/lib/menu'
diff --git a/pages/schedule.jsx b/pages/schedule.jsx
index 953eba33..62f661cb 100644
--- a/pages/schedule.jsx
+++ b/pages/schedule.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../src/components/App'
+import { App } from '../src/components/App'
 import Schedule from '../src/components/Schedule'
 import Share from '../src/components/Share'
 import menuModel from '../src/models/menu'
diff --git a/pages/teacher/[person].jsx b/pages/teacher/[person].jsx
index 8a9a2c54..26317bb5 100644
--- a/pages/teacher/[person].jsx
+++ b/pages/teacher/[person].jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import axios from 'axios'
 import Head from 'next/head'
-import App from '../../src/components/App'
+import { App } from '../../src/components/App'
 import Page from '../../src/components/Page'
 import { Meta } from '../../src/components/Meta'
 import menuModel from '../../src/models/menu'
diff --git a/src/components/App.js b/src/components/App.js
index 2d669ae8..f95f9c31 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1,11 +1,11 @@
-const React = require('react')
-const Menu = require('./Menu')
-const Footer = require('./Footer')
-const Comments = require('./Comments')
+import React from 'react'
+import Menu from './Menu'
+import Footer from './Footer'
+import Comments from './Comments'
 
 import '../style/style.scss'
 
-const App = ({children, menu, showAuthor, menuPadding}) => (
+export const App = ({children, menu, showAuthor, menuPadding}) => (
 	<div className="body-wrapper theme-default">
 		<header>
 			<div className="navigation">
@@ -30,5 +30,3 @@ const App = ({children, menu, showAuthor, menuPadding}) => (
 		/>
 	</div>
 )
-
-module.exports = App