diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 21a938ae1b..77c9e39b91 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -5,10 +5,10 @@ import * as client from '../utils/client.jsx';
 import * as AsyncClient from '../utils/async_client.jsx';
 import SearchStore from '../stores/search_store.jsx';
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import SuggestionBox from '../components/suggestion_box.jsx';
-import SearchChannelProvider from '../components/search_channel_provider.jsx';
-import SearchSuggestionList from '../components/search_suggestion_list.jsx';
-import SearchUserProvider from '../components/search_user_provider.jsx';
+import SuggestionBox from './suggestion/suggestion_box.jsx';
+import SearchChannelProvider from './suggestion/search_channel_provider.jsx';
+import SearchSuggestionList from './suggestion/search_suggestion_list.jsx';
+import SearchUserProvider from './suggestion/search_user_provider.jsx';
 import * as utils from '../utils/utils.jsx';
 import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
diff --git a/web/react/components/at_mention_provider.jsx b/web/react/components/suggestion/at_mention_provider.jsx
similarity index 94%
rename from web/react/components/at_mention_provider.jsx
rename to web/react/components/suggestion/at_mention_provider.jsx
index 2feaad3798..8c28934481 100644
--- a/web/react/components/at_mention_provider.jsx
+++ b/web/react/components/suggestion/at_mention_provider.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import SuggestionStore from '../stores/suggestion_store.jsx';
-import UserStore from '../stores/user_store.jsx';
-import * as Utils from '../utils/utils.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
+import UserStore from '../../stores/user_store.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 class AtMentionSuggestion extends React.Component {
     render() {
diff --git a/web/react/components/command_provider.jsx b/web/react/components/suggestion/command_provider.jsx
similarity index 88%
rename from web/react/components/command_provider.jsx
rename to web/react/components/suggestion/command_provider.jsx
index 98a89cba01..34de3bfd14 100644
--- a/web/react/components/command_provider.jsx
+++ b/web/react/components/suggestion/command_provider.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import * as Client from '../utils/client.jsx';
-import Constants from '../utils/constants.jsx';
-import SuggestionStore from '../stores/suggestion_store.jsx';
+import AppDispatcher from '../../dispatcher/app_dispatcher.jsx';
+import * as Client from '../../utils/client.jsx';
+import Constants from '../../utils/constants.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
 
 class CommandSuggestion extends React.Component {
     render() {
diff --git a/web/react/components/search_channel_provider.jsx b/web/react/components/suggestion/search_channel_provider.jsx
similarity index 92%
rename from web/react/components/search_channel_provider.jsx
rename to web/react/components/suggestion/search_channel_provider.jsx
index 6b2fa2d627..7547a9341e 100644
--- a/web/react/components/search_channel_provider.jsx
+++ b/web/react/components/suggestion/search_channel_provider.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import ChannelStore from '../stores/channel_store.jsx';
-import Constants from '../utils/constants.jsx';
-import SuggestionStore from '../stores/suggestion_store.jsx';
+import ChannelStore from '../../stores/channel_store.jsx';
+import Constants from '../../utils/constants.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
 
 class SearchChannelSuggestion extends React.Component {
     render() {
diff --git a/web/react/components/search_suggestion_list.jsx b/web/react/components/suggestion/search_suggestion_list.jsx
similarity index 96%
rename from web/react/components/search_suggestion_list.jsx
rename to web/react/components/suggestion/search_suggestion_list.jsx
index 1549e90d58..542d28ddd9 100644
--- a/web/react/components/search_suggestion_list.jsx
+++ b/web/react/components/suggestion/search_suggestion_list.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Constants from '../utils/constants.jsx';
+import Constants from '../../utils/constants.jsx';
 import SuggestionList from './suggestion_list.jsx';
-import * as Utils from '../utils/utils.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class SearchSuggestionList extends SuggestionList {
     componentDidUpdate(prevProps, prevState) {
diff --git a/web/react/components/search_user_provider.jsx b/web/react/components/suggestion/search_user_provider.jsx
similarity index 93%
rename from web/react/components/search_user_provider.jsx
rename to web/react/components/suggestion/search_user_provider.jsx
index 7c1711d362..cf29539379 100644
--- a/web/react/components/search_user_provider.jsx
+++ b/web/react/components/suggestion/search_user_provider.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import SuggestionStore from '../stores/suggestion_store.jsx';
-import UserStore from '../stores/user_store.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
+import UserStore from '../../stores/user_store.jsx';
 
 class SearchUserSuggestion extends React.Component {
     render() {
diff --git a/web/react/components/suggestion_box.jsx b/web/react/components/suggestion/suggestion_box.jsx
similarity index 96%
rename from web/react/components/suggestion_box.jsx
rename to web/react/components/suggestion/suggestion_box.jsx
index 3fff5b7546..22dbf14973 100644
--- a/web/react/components/suggestion_box.jsx
+++ b/web/react/components/suggestion/suggestion_box.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import Constants from '../utils/constants.jsx';
-import SuggestionStore from '../stores/suggestion_store.jsx';
-import * as Utils from '../utils/utils.jsx';
+import AppDispatcher from '../../dispatcher/app_dispatcher.jsx';
+import Constants from '../../utils/constants.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 const ActionTypes = Constants.ActionTypes;
 const KeyCodes = Constants.KeyCodes;
diff --git a/web/react/components/suggestion_list.jsx b/web/react/components/suggestion/suggestion_list.jsx
similarity index 96%
rename from web/react/components/suggestion_list.jsx
rename to web/react/components/suggestion/suggestion_list.jsx
index 3b7c4dd7d1..cd75f36c56 100644
--- a/web/react/components/suggestion_list.jsx
+++ b/web/react/components/suggestion/suggestion_list.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
-import Constants from '../utils/constants.jsx';
-import SuggestionStore from '../stores/suggestion_store.jsx';
+import AppDispatcher from '../../dispatcher/app_dispatcher.jsx';
+import Constants from '../../utils/constants.jsx';
+import SuggestionStore from '../../stores/suggestion_store.jsx';
 
 export default class SuggestionList extends React.Component {
     constructor(props) {
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index b50575fc19..bee5113c95 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import AtMentionProvider from './at_mention_provider.jsx';
-import CommandProvider from './command_provider.jsx';
-import SuggestionList from './suggestion_list.jsx';
-import SuggestionBox from './suggestion_box.jsx';
+import AtMentionProvider from './suggestion/at_mention_provider.jsx';
+import CommandProvider from './suggestion/command_provider.jsx';
+import SuggestionList from './suggestion/suggestion_list.jsx';
+import SuggestionBox from './suggestion/suggestion_box.jsx';
 import ErrorStore from '../stores/error_store.jsx';
 
 import * as TextFormatting from '../utils/text_formatting.jsx';