diff --git a/media/html/my.css b/css/style.css
similarity index 100%
rename from media/html/my.css
rename to css/style.css
diff --git a/media/html/images/.DS_Store b/img/.DS_Store
similarity index 100%
rename from media/html/images/.DS_Store
rename to img/.DS_Store
diff --git a/media/html/images/monkey.png b/img/monkey.png
similarity index 100%
rename from media/html/images/monkey.png
rename to img/monkey.png
diff --git a/media/html/images/monkey_sm.png b/img/monkey_sm.png
similarity index 100%
rename from media/html/images/monkey_sm.png
rename to img/monkey_sm.png
diff --git a/media/html/my.js b/js/main.js
similarity index 100%
rename from media/html/my.js
rename to js/main.js
diff --git a/media/html/app.html b/views/app.tpl
similarity index 100%
rename from media/html/app.html
rename to views/app.tpl
diff --git a/media/html/index.html b/views/home.tpl
similarity index 83%
rename from media/html/index.html
rename to views/home.tpl
index 5f1d3f3..5d114b1 100644
--- a/media/html/index.html
+++ b/views/home.tpl
@@ -2,11 +2,11 @@
 <html>
     <head>
         <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <meta name=cd "viewport" content="width=device-width, initial-scale=1" />
         <title>
         </title>
         <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.1.1/jquery.mobile-1.1.1.min.css" />
-        <link rel="stylesheet" href="my.css" />
+        <link rel="stylesheet" href="/css/style.css" />
         <style>
             /* App custom styles */
         </style>
@@ -14,7 +14,7 @@
         </script>
         <script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.1.1/jquery.mobile-1.1.1.min.js">
         </script>
-        <script src="my.js">
+        <script src="/js/main.js">
         </script>
     </head>
     <body>
@@ -22,7 +22,7 @@
         <div data-role="page" id="page1">
             <div data-role="content">
                 <div style="width: 100%; height: 173px; position: relative; text-align: center;">
-                    <img src="images/monkey.png" alt="image" />
+                    <img src="/img/monkey.png" alt="image" />
                 </div>
                 <div style="float:right">
                     <a href="/login">Login</a>
@@ -33,7 +33,7 @@ <h1>
                 <form action="/login">
                     <div id="checkboxes3" data-role="fieldcontain">
                         <p>Vocably will access your Google Mail account. We do not save any of your information.</p>
-                        <fieldset data-role="controlgroup" data-type="vertical">
+                           <fieldset data-role="controlgroup" data-type="vertical">
                             <input id="checkbox4" name="" type="checkbox" />
                             <label for="checkbox4">
                                 I agree to the terms.
@@ -48,4 +48,4 @@ <h1>
             //App custom javascript
         </script>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/views/index.tpl b/views/index.tpl
new file mode 100644
index 0000000..a6d587f
--- /dev/null
+++ b/views/index.tpl
@@ -0,0 +1,2 @@
+<script type="text/javascript" src="js/app.js'" charset="utf-8"></script>
+<p>loaded</p>
diff --git a/vocably.py b/vocably.py
index 6fa97c9..da0df66 100644
--- a/vocably.py
+++ b/vocably.py
@@ -1,19 +1,17 @@
-from bottle import route, run, template, redirect, request
+from bottle import route, run, debug, template, request, static_file
 
 from oauth2client.client import flow_from_clientsecrets
 from oauth2client.file import Storage
 
 import httplib2
 
+# Landing Page    
 @route('/')
 def home():
-    return template('media/html/index.html')
-
-@route('/login')
-def login():
-    print "Logging in a user: redirecting to Google"
-    redirect(flow.step1_get_authorize_url())
+    output = template('home')
+    return output
 
+# OAuth
 @route('/oauth2callback')
 def login_callback():
     print "Login callback from Google"
@@ -34,4 +32,19 @@ def login_callback():
                                redirect_uri='http://localhost:8080/oauth2callback')
 storage = Storage('config/credentials')
 
+# Static Files
+@route('/css/:path#.+#', name='css')
+def css(path):
+    return static_file(path, root='css')
+
+@route('/img/:path#.+#', name='img')
+def img(path):
+    return static_file(path, root='img')
+
+@route('/js/:path#.+#', name='js')
+def js(path):
+    return static_file(path, root='js')
+
+    
+
 run(host='0.0.0.0', port=8080, debug=True, reloader=True)
