diff --git a/src/components/App/Footer.js b/src/components/App/Footer.js
index 4975fe2..c8c61dd 100644
--- a/src/components/App/Footer.js
+++ b/src/components/App/Footer.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import FilterLink from '../../containers/FilterLink'
+import FilterLink from '../../containers/App/FilterLink'
 const Footer = () => (
   <div>
     <span>Show: </span>
diff --git a/src/components/App/index.js b/src/components/App/index.js
index 730b822..0363e73 100644
--- a/src/components/App/index.js
+++ b/src/components/App/index.js
@@ -1,6 +1,6 @@
 import React from 'react'
-import AddTodo from '../../containers/AddTodo'
-import VisibleTodoList from '../../containers/VisibleTodoList'
+import AddTodo from '../../containers/App/AddTodo'
+import VisibleTodoList from '../../containers/App/VisibleTodoList'
 import Footer from './Footer'
 
 class App extends React.Component {
diff --git a/src/containers/AddTodo.js b/src/containers/App/AddTodo.js
similarity index 67%
rename from src/containers/AddTodo.js
rename to src/containers/App/AddTodo.js
index ddf99cf..4c38cb2 100644
--- a/src/containers/AddTodo.js
+++ b/src/containers/App/AddTodo.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
-import { addTodo } from '../actions';
-import AddTodo from '../components/App/AddTodo';
+import { addTodo } from '../../actions';
+import AddTodo from '../../components/App/AddTodo';
 
 
 const mapDispatchToProps = dispatch => ({
diff --git a/src/containers/FilterLink.js b/src/containers/App/FilterLink.js
similarity index 77%
rename from src/containers/FilterLink.js
rename to src/containers/App/FilterLink.js
index 363d6b6..acae84c 100644
--- a/src/containers/FilterLink.js
+++ b/src/containers/App/FilterLink.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
-import { setVisibilityFilter } from '../actions'
-import Link from '../components/App/Link'
+import { setVisibilityFilter } from '../../actions'
+import Link from '../../components/App/Link'
 
 const mapStateToProps = (state, ownProps) => ({
   active: ownProps.filter === state.visibilityFilter
diff --git a/src/containers/VisibleTodoList.js b/src/containers/App/VisibleTodoList.js
similarity index 86%
rename from src/containers/VisibleTodoList.js
rename to src/containers/App/VisibleTodoList.js
index d7454ff..61163e2 100644
--- a/src/containers/VisibleTodoList.js
+++ b/src/containers/App/VisibleTodoList.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
-import { toggleTodo } from '../actions'
-import TodoList from '../components/App/TodoList'
+import { toggleTodo } from '../../actions'
+import TodoList from '../../components/App/TodoList'
 
 const getVisibleTodos = (todos, filter) => {
   switch (filter) {