diff --git a/src/app/Routes.js b/src/app/Routes.js
index 501af1fd..aa3898c2 100644
--- a/src/app/Routes.js
+++ b/src/app/Routes.js
@@ -5,8 +5,8 @@ import App                                  from 'app/App';
 import DemoPage                             from 'app/demo/components-demo-page';
 
 import MainLayout                           from 'app/main/main-layout';
-import MainHomePage                         from 'app/main/main-home-page';
-import MainSignUpPage                       from 'app/main/main-signup-page';
+import MainHomePage                         from 'app/main/main-home/main-home-page';
+import MainSignUpPage                       from 'app/main/main-signup/main-signup-page';
 
 
 export default (
diff --git a/src/app/main/main-home-page-login-widget.js b/src/app/main/main-home/main-home-page-login-widget.js
similarity index 84%
rename from src/app/main/main-home-page-login-widget.js
rename to src/app/main/main-home/main-home-page-login-widget.js
index fb9c729b..6dc37715 100644
--- a/src/app/main/main-home-page-login-widget.js
+++ b/src/app/main/main-home/main-home-page-login-widget.js
@@ -11,11 +11,8 @@ var MainHomePageLoginWidget = React.createClass({
             <Widget className="main-home-page--widget">
                 <h3>Login</h3>
                 <Form>
-                    <div>
-                        <Input placeholder="email" name="email" />
-                    </div>
-                    <Input placeholder="password" name="password" />
-
+                    <Input placeholder="email" name="email" className="login-widget--input"/>
+                    <Input placeholder="password" name="password" className="login-widget--input"/>
                     <Button type="primary">LOG IN</Button>
                 </Form>
             </Widget>
diff --git a/src/app/main/main-home/main-home-page-login-widget.scss b/src/app/main/main-home/main-home-page-login-widget.scss
new file mode 100644
index 00000000..89cef42d
--- /dev/null
+++ b/src/app/main/main-home/main-home-page-login-widget.scss
@@ -0,0 +1,5 @@
+.login-widget {
+  &--input {
+    color: red;
+  }
+}
\ No newline at end of file
diff --git a/src/app/main/main-home-page.js b/src/app/main/main-home/main-home-page.js
similarity index 78%
rename from src/app/main/main-home-page.js
rename to src/app/main/main-home/main-home-page.js
index 6deb8715..6a16a442 100644
--- a/src/app/main/main-home-page.js
+++ b/src/app/main/main-home/main-home-page.js
@@ -2,7 +2,7 @@ import React              from 'react/addons';
 import {ListenerMixin}    from 'reflux';
 import {RouteHandler}     from 'react-router';
 
-import MainHomePageLoginWidget  from 'app/main/main-home-page-login-widget';
+import MainHomePageLoginWidget  from 'app/main/main-home/main-home-page-login-widget';
 
 var MainHomePage = React.createClass({
 
diff --git a/src/app/main/main-home-page.scss b/src/app/main/main-home/main-home-page.scss
similarity index 100%
rename from src/app/main/main-home-page.scss
rename to src/app/main/main-home/main-home-page.scss
diff --git a/src/app/main/main-signup-page.js b/src/app/main/main-signup/main-signup-page.js
similarity index 100%
rename from src/app/main/main-signup-page.js
rename to src/app/main/main-signup/main-signup-page.js