diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index e6efa6c..44f3e12 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -8,10 +8,10 @@ import Route from 'react-router-dom/Route';
 
 import NavBar, { Navbar } from './components/layout/NavBar';
 
-import home from './Home.js';
-import register from './Register.js';
-import login from './Login.js';
-import user from './pages/user';
+import home from './pages/Home';
+import register from './pages/Register';
+import login from './pages/Login';
+import user from './pages/User';
 import writeMicroblog from './Writing_Microblogs.js';
 import userLine from './Userline.js';
 
diff --git a/twistter-frontend/src/components/topic/ChipsArray.js b/twistter-frontend/src/components/topic/ChipsArray.js
index a99afd1..2bb2013 100644
--- a/twistter-frontend/src/components/topic/ChipsArray.js
+++ b/twistter-frontend/src/components/topic/ChipsArray.js
@@ -3,7 +3,9 @@ import { makeStyles } from '@material-ui/core/styles';
 import Chip from '@material-ui/core/Chip';
 import Paper from '@material-ui/core/Paper';
 
-const useStyles = makeStyles(theme => ({
+
+// TODO: fix the style
+const styles = makeStyles(theme => ({
   root: {
     display: 'flex',
     justifyContent: 'center',
diff --git a/twistter-frontend/src/Home.js b/twistter-frontend/src/pages/Home.js
similarity index 100%
rename from twistter-frontend/src/Home.js
rename to twistter-frontend/src/pages/Home.js
diff --git a/twistter-frontend/src/Login.js b/twistter-frontend/src/pages/Login.js
similarity index 90%
rename from twistter-frontend/src/Login.js
rename to twistter-frontend/src/pages/Login.js
index 550ed54..76531d2 100644
--- a/twistter-frontend/src/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -1,8 +1,8 @@
 /* eslint-disable */
 import React, { Component } from 'react';
-import './App.css';
+import '../App.css';
 
-import logo from './images/twistter-logo.png';
+import logo from '../images/twistter-logo.png';
 import TextField from '@material-ui/core/TextField';
 
 class Login extends Component {
diff --git a/twistter-frontend/src/Register.js b/twistter-frontend/src/pages/Register.js
similarity index 100%
rename from twistter-frontend/src/Register.js
rename to twistter-frontend/src/pages/Register.js