diff --git a/index.html b/index.html
index d82ed1a..5f5cf64 100644
--- a/index.html
+++ b/index.html
@@ -7,33 +7,58 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <script type="text/javascript">
-      function removeUrlParameters(full_url){
-        var url_base = full_url.split('#').shift();
-        return url_base;
-      }
-      function addBaseUrl(filename){
-        var base = window.location.href;
-        if(base.match(/file:/) || filename.match(/http:/)){
-          base = '';
-        }else{
-          base = removeUrlParameters(base) + '/';
+      /**
+      * The Url created with module pattern
+      *
+      * @todo Moves the module to another single js file
+      */
+      var Url = (function(){
+
+        return {
+
+          initBase: function(){
+            var base = window.location.href;
+            var host = window.location.host;
+            var regex = new RegExp(".*" + host + '/', "g");
+
+            if(host){
+              base = base.replace(regex,'');
+            }else{
+              base = base.replace('index.html','');
+            }
+            return base
+          },
+          removeUrlParameters: function(full_url){
+            var url_base = full_url.split('#').shift();
+            return url_base;
+          },
+           addBaseUrl: function(filename){
+            var base = window.location.href;
+            if(base.match(/file:/) || filename.match(/http:/)){
+              base = '';
+            }else{
+              base = this.removeUrlParameters(base) + '/';
+            }
+            return base + filename;
+          }
         }
-        return base + filename;
-      }
+
+      })();
+
       function makeCSSLink(filename){
         var fileref=document.createElement('link');
         fileref.setAttribute('rel', 'stylesheet');
         fileref.setAttribute('type', 'text/css');
-        fileref.setAttribute('href',  addBaseUrl(filename));
+        fileref.setAttribute('href',  Url.addBaseUrl(filename));
         return fileref;
       }
       function loadCSSFiles(){
         var css_files = [
-          'css/bootstrap.min.css', 
-          'css/hover.custom.css', 
-          'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', 
-          'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700', 
-          'http://fonts.googleapis.com/css?family=Asap:400,700', 
+          'css/bootstrap.min.css',
+          'css/hover.custom.css',
+          'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
+          'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
+          'http://fonts.googleapis.com/css?family=Asap:400,700',
           'style.css'
         ];
         head = document.getElementsByTagName('head')[0]
@@ -42,8 +67,8 @@
         }
       }
       function makeJSURL(filename){
-        var url = addBaseUrl(filename);
-       
+        var url = Url.addBaseUrl(filename);
+
         return url;
       }
 
@@ -66,17 +91,17 @@
 
     <div id="proposal-result"></div>
     <div class="clearfix"></div>
- 
+
     <script id="proposal-template" type="text/x-handlebars-template">
       <header>
         <h1><a href="#">{{article.title}}</a></h1>
         <a id="display-contrast" href="#">Alto Contraste</a>
       </header>
-  
+
       <div id="content">
         {{{article.body}}}
       </div>
-  
+
       <nav role="tabpanel">
         <ul role="tablist">
           <li id="nav-proposal-categories" role="presentation">
@@ -112,7 +137,7 @@
         </div>
       </div>
 
-      <div id="proposal-group" class="hide">        
+      <div id="proposal-group" class="hide">
         <label for="search-input">Selecione um programa para fazer propostas e contar sua experiência.</label>
         <div id="search-input-container">
           <input placeholder="palavra chave" id="search-input" type="text" name="search" />
@@ -160,7 +185,7 @@
                   <span class="fa fa-reply"></span>
                   Agora contribua para a melhoria desse programa
                 </a>
-              </div>              
+              </div>
             </div>
 
             <div class="make-proposal-container">
@@ -303,7 +328,7 @@
     </script>
 
     <script type='text/javascript'	>
-loadRequireJS();
+      loadRequireJS();
     </script>
 
 
diff --git a/js/main.js b/js/main.js
index dfb6246..a90c739 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,4 +1,4 @@
-define(['handlebars','handlebars_helpers','jquery'], function(Handlebars){
+define(['handlebars','handlebars_helpers'], function(Handlebars){
 
 
   /* global Handlebars, $ */
@@ -227,7 +227,7 @@ define(['handlebars','handlebars_helpers','jquery'], function(Handlebars){
               $body.off('click', '.vote-actions .like');
               $body.on('click', '.vote-actions .like', function(e) {
                 //Helps to prevent more than one vote per proposal
-                if(contextMain.hasProposalbeenVoted(article.id)){
+                if(ProposalApp.hasProposalbeenVoted(article.id)){
                   console.log("Proposta " + article.id + " já havia sido votada");
                   contextMain.loadRandomProposal(topic_id, private_token);
                   e.preventDefault();
@@ -241,7 +241,7 @@ define(['handlebars','handlebars_helpers','jquery'], function(Handlebars){
                     private_token: private_token
                   }
                 }).done(function( /*data*/ ) {
-                  contextMain.addVotedProposal(article.id);
+                  ProposalApp.addVotedProposal(article.id);
                   contextMain.loadRandomProposal(topic_id, private_token);
                 });
                 e.preventDefault();
@@ -516,28 +516,7 @@ define(['handlebars','handlebars_helpers','jquery'], function(Handlebars){
             }else{
               this.display_proposal_by_category('proposal-item-' + categoryId);
             }
-          },
-          addVotedProposal: function(id) {
-           var votedProposals;
-           if (typeof($.cookie("votedProposals")) == "undefined"){
-             votedProposals = [];
-           }
-           else{
-             votedProposals = JSON.parse($.cookie("votedProposals"));
-           }
-           if (votedProposals.indexOf(id)==-1){
-             votedProposals.push(id);
-           }
-           $.cookie("votedProposals", JSON.stringify(votedProposals), {expires : 999 }) ;
-           return votedProposals;
-         },
-         hasProposalbeenVoted: function(id) {
-           if (typeof($.cookie("votedProposals")) == "undefined") {
-             return false;
-           }
-           votedProposals = JSON.parse($.cookie("votedProposals"));
-           return votedProposals.indexOf(id)!=-1;
-         }
+          }
       }
     })();
 
diff --git a/js/proposal-app.js b/js/proposal-app.js
new file mode 100644
index 0000000..75b81a7
--- /dev/null
+++ b/js/proposal-app.js
@@ -0,0 +1,34 @@
+define(['jquery','jquery_cookie'],function($){
+
+
+  ProposalApp = (function (){
+
+    return {
+      addVotedProposal: function(id) {
+       var votedProposals;
+       if (typeof($.cookie("votedProposals")) == "undefined"){
+         votedProposals = [];
+       }
+       else{
+         votedProposals = JSON.parse($.cookie("votedProposals"));
+       }
+       if (votedProposals.indexOf(id)==-1){
+         votedProposals.push(id);
+       }
+       $.cookie("votedProposals", JSON.stringify(votedProposals), {expires : 999 }) ;
+       return votedProposals;
+      },
+
+      hasProposalbeenVoted: function(id) {
+       if (typeof($.cookie("votedProposals")) == "undefined") {
+         return false;
+       }
+       votedProposals = JSON.parse($.cookie("votedProposals"));
+       return votedProposals.indexOf(id)!=-1;
+      }
+    };
+
+  })();
+
+  return ProposalApp;
+});
diff --git a/js/requirejs-config.js b/js/requirejs-config.js
index 827522f..9c7433b 100644
--- a/js/requirejs-config.js
+++ b/js/requirejs-config.js
@@ -1,26 +1,23 @@
-var base = window.location.href;
-var host = window.location.host;
-var regex = new RegExp(".*" + host + '/', "g");
-
-if(host){
-  base = base.replace(regex,'');
+if(window.Url){
+  var base = Url.initBase();
+  base = Url.removeUrlParameters(base) + '/js/';
 }else{
-  base = base.replace('index.html','');
+  base = '../js'
 }
-base = removeUrlParameters(base);
 
 requirejs.config({
-    baseUrl: ( base + '/js/'),
+    baseUrl: base,
     waitSeconds: 0,
     paths: {
         jquery: 'jquery-2.1.3.min',
-        jquery_ui: 'jquery-ui-1.11.4.custom/jquery-ui.min', 
-        jquery_cookie: 'jquery.cookie', 
+        jquery_ui: 'jquery-ui-1.11.4.custom/jquery-ui.min',
+        jquery_cookie: 'jquery.cookie',
         handlebars: 'handlebars-v3.0.1',
         handlebars_helpers: 'handlebars-helpers',
         jquery_maxlength: 'jquery.maxlength.min',
         layout: 'layout',
-        main: 'main'    
+        main: 'main',
+        proposal_app: 'proposal-app'
     },
     shim: {
       'handlebars':{
@@ -38,9 +35,13 @@ requirejs.config({
       },
       'handlebars_helpers':{
         deps: ['handlebars']
+      },
+      'proposal_app' :{
+        deps: ['jquery'],
+        exports: 'ProposalApp'
       }
     }
 });
 
-requirejs(['jquery', 'jquery_ui', 'jquery_cookie', 'handlebars', 'handlebars_helpers']);
-requirejs(['jquery_maxlength', 'layout', 'main']);
+requirejs(['jquery', 'proposal_app', 'jquery_ui','handlebars_helpers']);
+requirejs(['jquery_maxlength', 'layout','main']);
--
libgit2 0.21.2