diff --git a/index.html b/index.html
index fdce7ad6..33df283f 100644
--- a/index.html
+++ b/index.html
@@ -17,13 +17,13 @@
         <a href="#/login">Grset</a>
     </div>
 
-    <script type="text/javascript" src="js/jquery-1.10.1.min.js"></script>
-    <script type="text/javascript" src="js/mustache.js"></script>
-    <script type="text/javascript" src="js/sammy.js"></script>
-    <script type="text/javascript" src="js/sammy.mustache.js"></script>
-    <script type="text/javascript" src="js/sammy.json.js"></script>
-    <script type="text/javascript" src="js/sammy.storage.js"></script>
-    <script type="text/javascript" src="js/sammy.flash.js"></script>
+    <script type="text/javascript" src="js/vendor/jquery-1.10.1.min.js"></script>
+    <script type="text/javascript" src="js/vendor/mustache.js"></script>
+    <script type="text/javascript" src="js/vendor/sammy.js"></script>
+    <script type="text/javascript" src="js/vendor/sammy.mustache.js"></script>
+    <script type="text/javascript" src="js/vendor/sammy.json.js"></script>
+    <script type="text/javascript" src="js/vendor/sammy.storage.js"></script>
+    <script type="text/javascript" src="js/vendor/sammy.flash.js"></script>
     <script type="text/javascript" src="js/app.js"></script>
 
 </body>
diff --git a/js/app.js b/js/app.js
index 54ae8370..2d4ed9d3 100644
--- a/js/app.js
+++ b/js/app.js
@@ -4,47 +4,52 @@ app = Sammy('#main', function (sam) {
 
     var store = new Sammy.Store({name: 'storage', type: 'session'});
 
-    var flash = function (level, message) {
-        flashs = store.get('flash');
-        if (!flashs) { flashs = {'info': [], 'fail': [], 'success': [] } }
-        flashs[level].push(message);
-        store.set('flash', flashs);
+    sam.helpers({
+        flash: function (level, message) {
+            flashs = store.get('flash');
+            if (!flashs) { flashs = {'info': [], 'fail': [], 'success': [] } }
+            flashs[level].push(message);
+            store.set('flash', flashs);
 
-        html = '';
-        for(lvl in flashs) {
-            flashs[lvl].forEach( function(msg) {
-                html += '<div class="'+ lvl +'">'+ msg +'</div>';
-            });
-        }
-        $('#flash').html(html);
-    }
-
-    var api = function (uri, callback, method, data) {
-        method = typeof method !== 'undefined' ? method : 'GET';
-        data   = typeof data   !== 'undefined' ? data   : {};
-        auth   = "Basic "+ btoa(store.get('user') +':'+ atob(store.get('password')));
-        jQuery.ajax({
-            url: store.get('url') + uri,
-            type: method,
-            crossdomain: true,
-            data: data,
-            dataType: 'json',
-            beforeSend: function(req) {
-                req.setRequestHeader('Authorization', auth);
+            html = '';
+            for(lvl in flashs) {
+                flashs[lvl].forEach( function(msg) {
+                    html += '<div class="'+ lvl +'">'+ msg +'</div>';
+                });
             }
-        })
-        .done(function(data) {
-            console.log(data);
-            result = data;
-        })
-        .fail(function() {
-            alert('fail');
-            result = false;
-        })
-        .always(function() {
-            callback(result);
-        });
-    }
+            $('#flash').html(html);
+        },
+        api: function (uri, callback, method, data) {
+            method = typeof method !== 'undefined' ? method : 'GET';
+            data   = typeof data   !== 'undefined' ? data   : {};
+            auth   = "Basic "+ btoa(store.get('user') +':'+ atob(store.get('password')));
+            jQuery.ajax({
+                url: store.get('url') + uri,
+                type: method,
+                crossdomain: true,
+                data: data,
+                dataType: 'json',
+                beforeSend: function(req) {
+                    req.setRequestHeader('Authorization', auth);
+                }
+            })
+            .done(function(data) {
+                console.log(data);
+                result = data;
+            })
+            .fail(function() {
+                alert('fail');
+                result = false;
+            })
+            .always(function() {
+                callback(result);
+            });
+        },
+        view: function (view, data) {
+            //data = typeof data !== 'undefined' ? data : {};
+            this.render('views/'+ view +'.ms', data).swap();
+        }
+    });
 
     sam.after(function () {
         store.set('flash', {'info': [], 'fail': [], 'success': [] });
@@ -59,29 +64,29 @@ app = Sammy('#main', function (sam) {
     });
 
     sam.get('#/', function (c) {
-        c.render('home.ms').swap();
+        c.view('home');
     });
 
     sam.get('#/users/:user', function (c) {
         c.swap('');
-        api('/users/'+ c.params['user'], function(data) {
-            c.render('user_info.ms', data).swap();
+        c.api('/users/'+ c.params['user'], function(data) {
+            c.view('user_info', data);
         });
     });
 
     sam.get('#/login', function (c) {
-        c.render('login.ms').swap();
+        c.view('login');
     });
 
     sam.post('#/login', function (c) {
         store.set('url', c.params['url']);
         store.set('user', c.params['user']);
         store.set('password', btoa(c.params['password']));
-        api('/users', function(data) {
+        c.api('/users', function(data) {
             if (data.error) {
-                flash('fail', 'Error: '+ data.error);
+                c.flash('fail', 'Error: '+ data.error);
             } else {
-                flash('success', 'Connected :)');
+                c.flash('success', 'Connected :)');
             }
             if (store.get('path')) {
                 c.redirect(store.get('path'));
diff --git a/js/sammy.flash.js b/js/sammy.flash.js
deleted file mode 100644
index 76842687..00000000
--- a/js/sammy.flash.js
+++ /dev/null
@@ -1,106 +0,0 @@
-(function (factory) {
-  if (typeof define === 'function' && define.amd) {
-    define(['jquery', 'sammy'], factory);
-  } else {
-    (window.Sammy = window.Sammy || {}).Flash = factory(window.jQuery, window.Sammy);
-  }
-}(function ($, Sammy) {
-
-  Sammy.FlashHash = function() {
-    this.now = {};
-  };
-
-  $.extend(Sammy.FlashHash.prototype , {
-    // @return [String] this Flash, rendered as an <ul>.
-    toHTML: function() {
-      var result = this._renderUL();
-      this.clear();
-      return result;
-    },
-
-    clear: function() {
-      this._clearHash(this);
-      this._clearHash(this.now);
-    },
-
-    // Callback on redirect.
-    // @api private
-    _onRedirect: function() {
-      this._clearHash(this.now);
-    },
-
-    // clear out all flash keys
-    // @api private
-    _clearHash: function(hash) {
-      var key;
-      for (key in hash) {
-        if (key !== 'now' && hash.hasOwnProperty(key)) {
-          delete hash[key];
-        }
-      }
-    },
-
-    _renderUL: function() {
-      return '<ul class="flash">' +
-             this._renderLIs(this) +
-             this._renderLIs(this.now) +
-             '</ul>';
-    },
-
-    _renderLIs: function(hash) {
-      var result = '',
-          key;
-      for (key in hash) {
-        if (hash[key] && key !== 'now' && hash.hasOwnProperty(key)) {
-          result = result + '<li class="' + key + '">' + hash[key] + '</li>';
-        }
-      }
-      Sammy.log('rendered flash: ' + result);
-      return result;
-    }
-  });
-
-  // Sammy.Flash is a plugin for storing and sending status messages to the client. It's API and use
-  // is similar to Ruby on Rails' `flash` explained here:
-  // [http://apidock.com/rails/ActionController/Flash](http://apidock.com/rails/ActionController/Flash)
-  Sammy.Flash = function(app) {
-    app.flash = new Sammy.FlashHash();
-
-    // *Helper* flash(key, value) get or set a flash message that will
-    // be erased on the next render (but not on redirect).
-    //
-    // @param [String] key, the Flash key
-    // @param [String] value, the new value; optional
-    // @return [Sammy.FlashHash, String, null] if a key was given, the value for that key; else, the Flash
-    app.helper('flash', function(key, value) {
-      if (arguments.length === 0) {
-        return this.app.flash;
-      } else if (arguments.length === 2) {
-        this.app.flash[key] = value;
-      }
-      return this.app.flash[key];
-    });
-
-    // *Helper* flashNow(key, value) get or set a flash message that
-    // will be erased on the next render or redirect.
-    //
-    // @param [String] key, the Flash key
-    // @param [String] value, the new value; optional
-    // @return [String, null] the value for the given key
-    app.helper('flashNow', function(key, value) {
-      if (arguments.length === 0) {
-        return this.app.flash.now;
-      }else if (arguments.length === 2) {
-        this.app.flash.now[key] = value;
-      }
-      return this.app.flash.now[key];
-    });
-
-    app.bind('redirect', function() {
-      this.app.flash._onRedirect();
-    });
-  };
-
-  return Sammy.Flash;
-
-}));
diff --git a/js/jquery-1.10.1.min.js b/js/vendor/jquery-1.10.1.min.js
similarity index 100%
rename from js/jquery-1.10.1.min.js
rename to js/vendor/jquery-1.10.1.min.js
diff --git a/js/mustache.js b/js/vendor/mustache.js
similarity index 100%
rename from js/mustache.js
rename to js/vendor/mustache.js
diff --git a/js/sammy-latest.min.js b/js/vendor/sammy-latest.min.js
similarity index 100%
rename from js/sammy-latest.min.js
rename to js/vendor/sammy-latest.min.js
diff --git a/js/sammy.js b/js/vendor/sammy.js
similarity index 100%
rename from js/sammy.js
rename to js/vendor/sammy.js
diff --git a/js/sammy.json.js b/js/vendor/sammy.json.js
similarity index 100%
rename from js/sammy.json.js
rename to js/vendor/sammy.json.js
diff --git a/js/sammy.mustache.js b/js/vendor/sammy.mustache.js
similarity index 100%
rename from js/sammy.mustache.js
rename to js/vendor/sammy.mustache.js
diff --git a/js/sammy.storage.js b/js/vendor/sammy.storage.js
similarity index 100%
rename from js/sammy.storage.js
rename to js/vendor/sammy.storage.js
diff --git a/home.ms b/views/home.ms
similarity index 100%
rename from home.ms
rename to views/home.ms
diff --git a/login.ms b/views/login.ms
similarity index 100%
rename from login.ms
rename to views/login.ms
diff --git a/user_info.ms b/views/user_info.ms
similarity index 100%
rename from user_info.ms
rename to views/user_info.ms