diff --git a/src/containers/RoomChat.js b/src/components/RoomChat.js
similarity index 92%
rename from src/containers/RoomChat.js
rename to src/components/RoomChat.js
index bcd0140..106ca49 100644
--- a/src/containers/RoomChat.js
+++ b/src/components/RoomChat.js
@@ -1,9 +1,9 @@
 import React, { PropTypes } from "react";
 import ImmutablePropTypes from "react-immutable-proptypes";
 
-import RoomChatForm from "../components/RoomChatForm";
-import RoomChatHeader from "../components/RoomChatHeader";
-import RoomChatMessageList from "../components/RoomChatMessageList";
+import RoomChatForm from "./RoomChatForm";
+import RoomChatHeader from "./RoomChatHeader";
+import RoomChatMessageList from "./RoomChatMessageList";
 
 const ID = "room-chat";
 
diff --git a/src/containers/RoomsPane.js b/src/containers/RoomsPane.js
index eff6ce8..ff30485 100644
--- a/src/containers/RoomsPane.js
+++ b/src/containers/RoomsPane.js
@@ -3,12 +3,9 @@ import { connect } from "react-redux";
 import { bindActionCreators } from "redux";
 import ImmutablePropTypes from "react-immutable-proptypes";
 
+import RoomChat from "../components/RoomChat";
 import RoomList from "../components/RoomList";
 
-import RoomChat from "../containers/RoomChat";
-
-import ControlRequest from "../utils/ControlRequest";
-
 class RoomsPane extends React.Component {
     constructor(props) {
         super(props);