diff --git a/pagure/static/vendor/cal-heatmap/cal-heatmap.css b/pagure/static/vendor/cal-heatmap/cal-heatmap.css
new file mode 120000
index 0000000..02c2c1f
--- /dev/null
+++ b/pagure/static/vendor/cal-heatmap/cal-heatmap.css
@@ -0,0 +1 @@
+cal-heatmap.3.3.10.css
\ No newline at end of file
diff --git a/pagure/static/vendor/cal-heatmap/cal-heatmap.js b/pagure/static/vendor/cal-heatmap/cal-heatmap.js
new file mode 120000
index 0000000..0d6679d
--- /dev/null
+++ b/pagure/static/vendor/cal-heatmap/cal-heatmap.js
@@ -0,0 +1 @@
+cal-heatmap.3.3.10.js
\ No newline at end of file
diff --git a/pagure/static/vendor/cal-heatmap/cal-heatmap.min.js b/pagure/static/vendor/cal-heatmap/cal-heatmap.min.js
new file mode 120000
index 0000000..a722d4c
--- /dev/null
+++ b/pagure/static/vendor/cal-heatmap/cal-heatmap.min.js
@@ -0,0 +1 @@
+cal-heatmap.3.3.10.min.js
\ No newline at end of file
diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index aa0e600..e726fba 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -268,13 +268,13 @@
 
 {% macro render_activity_graph(username) %}
 <script type="text/javascript"src="{{
-  url_for('static', filename='jquery.min.js') }}"></script>
+  url_for('static', filename='vendor/jquery/jquery.min.js') }}"></script>
 <script type="text/javascript" src="{{
-  url_for('static', filename='d3/d3.v3.min.js') }}"></script>
+  url_for('static', filename='vendor/d3/d3.v3.min.js') }}"></script>
 <script type="text/javascript" src="{{
-  url_for('static', filename='cal-heatmap/cal-heatmap.3.3.10.min.js') }}"></script>
+  url_for('static', filename='vendor/cal-heatmap/cal-heatmap.min.js') }}"></script>
 <link rel="stylesheet" href="{{
-  url_for('static', filename='cal-heatmap/cal-heatmap.3.3.10.css') }}" />
+  url_for('static', filename='vendor/cal-heatmap/cal-heatmap.css') }}" />
 
 
 <div class="card" id="user_graph">
diff --git a/pagure/templates/add_deploykey.html b/pagure/templates/add_deploykey.html
index 6ff6dde..2ae2027 100644
--- a/pagure/templates/add_deploykey.html
+++ b/pagure/templates/add_deploykey.html
@@ -5,7 +5,7 @@
 {% set tag = "home" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
diff --git a/pagure/templates/add_group_project.html b/pagure/templates/add_group_project.html
index 42ef076..af8de2b 100644
--- a/pagure/templates/add_group_project.html
+++ b/pagure/templates/add_group_project.html
@@ -4,7 +4,7 @@
 {% set tag = "groups" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -75,7 +75,7 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript"
-        src="{{ url_for('static', filename='selectize.min.js') }}"></script>
+        src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}"></script>
 <script type="text/javascript">
 $( document ).ready(function() {
   var group_to_update = "{{ group_to_update }}";
diff --git a/pagure/templates/add_user.html b/pagure/templates/add_user.html
index d57c7ec..aacb1e5 100644
--- a/pagure/templates/add_user.html
+++ b/pagure/templates/add_user.html
@@ -4,7 +4,7 @@
 {% set tag = "home" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -73,7 +73,7 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript"
-        src="{{ url_for('static', filename='selectize.min.js') }}"></script>
+        src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}"></script>
 <script type="text/javascript">
 $( document ).ready(function() {
   var user_to_update = "{{ user_to_update }}";
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index e83d0fa..3f83895 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -5,8 +5,8 @@
     repo.namespace + '/' if repo.namespace }}{{ repo.name }}{% endblock %}
 {% set tag = "home" %}
 {% block header %}
-<script src="{{ url_for('static', filename='codemirror/codemirror.js') }}"></script>
-<link rel="stylesheet" href="{{ url_for('static', filename='codemirror/codemirror.css') }}">
+<script src="{{ url_for('static', filename='vendor/codemirror/codemirror.js') }}"></script>
+<link rel="stylesheet" href="{{ url_for('static', filename='vendor/codemirror/codemirror.css') }}">
 {% endblock%}
 
 {% block repo %}
diff --git a/pagure/templates/group_info.html b/pagure/templates/group_info.html
index efb102e..27c1c13 100644
--- a/pagure/templates/group_info.html
+++ b/pagure/templates/group_info.html
@@ -6,7 +6,7 @@
 {% from "_browseheader.html" import browse_header %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -115,7 +115,7 @@
 
 {% block jscripts %}
   {{ super() }}
-  <script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
+  <script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
   <script type="text/javascript">
   $(document).ready(function() {
     $('#headerSearch').on('keypress keydown keyup', function(e) {
diff --git a/pagure/templates/group_list.html b/pagure/templates/group_list.html
index a2b6905..77313fe 100644
--- a/pagure/templates/group_list.html
+++ b/pagure/templates/group_list.html
@@ -6,7 +6,7 @@
 {% from "_browseheader.html" import browse_header %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -80,7 +80,7 @@
 
 {% block jscripts %}
     {{ super() }}
-<script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
 <script type="text/javascript">
 $(document).ready(function() {
   $('#headerSearch').on('keypress keydown keyup', function(e) {
diff --git a/pagure/templates/index.html b/pagure/templates/index.html
index befe15b..dfbcbc2 100644
--- a/pagure/templates/index.html
+++ b/pagure/templates/index.html
@@ -8,7 +8,7 @@
 
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -28,9 +28,9 @@
 
 {% block jscripts %}
     {{ super() }}
-<script src="{{ url_for('static', filename='jdenticon.min.js') }}" type="text/javascript"></script>
-<script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
-<script src="{{ url_for('static', filename='jquery.dotdotdot.min.js') }}" type="text/javascript"></script>
+<script src="{{ url_for('static', filename='vendor/jdenticon/jdenticon.min.js') }}" type="text/javascript"></script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
+<script src="{{ url_for('static', filename='vendor/jquery.dotdotdot/jquery.dotdotdot.min.js') }}" type="text/javascript"></script>
 <script type="text/javascript">
 $(document).ready(function() {
   $('#headerSearch').on('keypress keydown keyup', function(e) {
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 892a985..83e078b 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -7,11 +7,11 @@
 {% set tag = "home"%}
 
 {% block header %}
-<link href="{{ url_for('static', filename='emoji/emojione.sprites.css') }}"
+<link href="{{ url_for('static', filename='vendor/emojione/emojione.sprites.css') }}"
   rel="stylesheet" />
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
-<link href="{{ url_for('static', filename='atwho/jquery.atwho.css') }}"
+<link href="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -432,10 +432,10 @@
   var UPLOAD_URL = "{{ url_for('upload_issue', repo=repo.name, username=username, namespace=repo.namespace, issueid=issue.id) }}";
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/jquery.textcomplete.min.js') }}">
+    src="{{ url_for('static', filename='vendor/jquery.textcomplete/jquery.textcomplete.min.js') }}">
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/emojione.min.js') }}">
+    src="{{ url_for('static', filename='vendor/emojione/emojione.min.js') }}">
 </script>
 <script type="text/javascript"
     src="{{ url_for('static', filename='emoji/emojicomplete.js') }}">
@@ -444,9 +444,9 @@
   src="{{ url_for('static', filename='upload.js') }}">
 </script>
 
-<script type="text/javascript" src="{{ url_for('static', filename='selectize.min.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='atwho/jquery.caret.min.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='atwho/jquery.atwho.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='vendor/jquery.caret/jquery.caret.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}"></script>
 
 <script type="text/javascript">
 
@@ -777,14 +777,14 @@ $( document ).ready(function() {
 
   var emojiStrategy;
   $.getJSON(
-    '{{ url_for("static", filename="emoji/emoji_strategy.json") }}',
+    '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}',
     function( data ) {
       emojiStrategy =  data;
     }
   );
 
   var folder = '{{url_for("static", filename="emoji/png/") }}';
-  var json_url = '{{ url_for("static", filename="emoji/emoji_strategy.json") }}';
+  var json_url = '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}';
   emoji_complete(json_url, folder);
 
   $(".comment_body").each(function(ind, obj) {
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index ed34bc1..a06b4c1 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -352,7 +352,7 @@
 {{ super() }}
 
 <script type="text/javascript"
-  src="{{ url_for('static', filename='stupidtable.min.js') }}">
+  src="{{ url_for('static', filename='vendor/stupidtable/stupidtable.min.js') }}">
 </script>
 <script>
 $.ready(function() {
diff --git a/pagure/templates/master.html b/pagure/templates/master.html
index 333a736..5064055 100644
--- a/pagure/templates/master.html
+++ b/pagure/templates/master.html
@@ -9,11 +9,11 @@
         type="text/css" rel="stylesheet" />
     <link href="{{ url_for('static', filename='pagure.css') }}"
         type="text/css" rel="stylesheet" />
-    <link href="{{ url_for('static', filename='open-iconic/css/open-iconic.min.css') }}"
+    <link href="{{ url_for('static', filename='vendor/open-iconic/css/open-iconic.min.css') }}"
         type="text/css" rel="stylesheet" />
     <link href="{{ url_for('static', filename='fonts/fonts.css') }}"
         rel="stylesheet" type="text/css" />
-    <link href="{{ url_for('static', filename='hack_fonts/css/hack-extended.min.css') }}"
+    <link href="{{ url_for('static', filename='vendor/hack_fonts/css/hack-extended.min.css') }}"
         type="text/css" rel="stylesheet" />
     {% block header %}{% endblock %}
   </head>
@@ -169,11 +169,11 @@
     {% block jscripts %}
     <script type="text/javascript"
         src="{{ url_for('static',
-            filename='jquery.min.js') }}">
+            filename='vendor/jquery/jquery.min.js') }}">
     </script>
     <script type="text/javascript"
         src="{{ url_for('static',
-            filename='jquery-ui.min.js') }}">
+            filename='vendor/jquery-ui/jquery-ui.min.js') }}">
     </script>
     <script type="text/javascript"
         src="{{ config['BOOTSTRAP_URLS_JS'] }}">
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index 8c8daec..e03f36f 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -8,9 +8,9 @@
 {% set tag = "home" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='emoji/emojione.sprites.css') }}"
+<link href="{{ url_for('static', filename='vendor/emojione/emojione.sprites.css') }}"
   rel="stylesheet" />
-<link href="{{ url_for('static', filename='atwho/jquery.atwho.css') }}"
+<link href="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -131,19 +131,19 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/jquery.textcomplete.min.js') }}">
+    src="{{ url_for('static', filename='vendor/jquery.textcomplete/jquery.textcomplete.min.js') }}">
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/emojione.min.js') }}">
+    src="{{ url_for('static', filename='vendor/emojione/emojione.min.js') }}">
 </script>
 <script type="text/javascript"
     src="{{ url_for('static', filename='emoji/emojicomplete.js') }}">
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='atwho/jquery.caret.min.js') }}">
+    src="{{ url_for('static', filename='vendor/jquery.caret/jquery.caret.min.js') }}">
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='atwho/jquery.atwho.min.js') }}">
+    src="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}">
 </script>
 
 <script type="text/javascript">
@@ -181,14 +181,14 @@ $(document).ready(function() {
 
   var emojiStrategy;
   $.getJSON(
-    '{{ url_for("static", filename="emoji/emoji_strategy.json") }}',
+    '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}',
     function( data ) {
       emojiStrategy =  data;
     }
   );
 
   var folder = '{{url_for("static", filename="emoji/png/") }}';
-  var json_url = '{{ url_for("static", filename="emoji/emoji_strategy.json") }}';
+  var json_url = '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}';
   emoji_complete(json_url, folder);
 
   $("#type").on("change", function() {
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 3b21acb..25771e4 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -17,11 +17,11 @@
 {% set tag = "home" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='emoji/emojione.sprites.css') }}"
+<link href="{{ url_for('static', filename='vendor/emojione/emojione.sprites.css') }}"
   rel="stylesheet" />
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
-<link href="{{ url_for('static', filename='atwho/jquery.atwho.css') }}"
+<link href="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -834,17 +834,17 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/jquery.textcomplete.min.js') }}">
+    src="{{ url_for('static', filename='vendor/jquery.textcomplete/jquery.textcomplete.min.js') }}">
 </script>
 <script type="text/javascript"
-    src="{{ url_for('static', filename='emoji/emojione.min.js') }}">
+    src="{{ url_for('static', filename='vendor/emojione/emojione.min.js') }}">
 </script>
 <script type="text/javascript"
     src="{{ url_for('static', filename='emoji/emojicomplete.js') }}">
 </script>
-<script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
-<script type="text/javascript" src="{{ url_for('static', filename='atwho/jquery.caret.min.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='atwho/jquery.atwho.min.js') }}"></script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
+<script type="text/javascript" src="{{ url_for('static', filename='vendor/jquery.caret/jquery.caret.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}"></script>
 
 <script type="text/javascript">
 function cancel_edit_btn() {
@@ -984,7 +984,7 @@ $(document).ready(function() {
   });
 
   var folder = '{{url_for("static", filename="emoji/png/") }}';
-  var json_url = '{{ url_for("static", filename="emoji/emoji_strategy.json") }}';
+  var json_url = '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}';
 
 
   var branchselect = $('#branch_select').selectize({
diff --git a/pagure/templates/pull_request_title.html b/pagure/templates/pull_request_title.html
index 91cb6bd..b9f2b52 100644
--- a/pagure/templates/pull_request_title.html
+++ b/pagure/templates/pull_request_title.html
@@ -6,9 +6,9 @@
 {% set tag = "home" %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='emoji/emojione.sprites.css') }}"
+<link href="{{ url_for('static', filename='vendor/emojione/emojione.sprites.css') }}"
   rel="stylesheet" />
-  <link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+  <link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 6b7f072..98995aa 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -281,7 +281,7 @@
 {{ super() }}
 
 <script type="text/javascript"
-  src="{{ url_for('static', filename='stupidtable.min.js') }}">
+  src="{{ url_for('static', filename='vendor/stupidtable/stupidtable.min.js') }}">
 </script>
 <script>
 $.ready(function() {
diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html
index 51968dd..4e97e7a 100644
--- a/pagure/templates/user_info.html
+++ b/pagure/templates/user_info.html
@@ -6,7 +6,7 @@
 
 
 {% block header %}
-  <link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+  <link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -70,7 +70,7 @@
         });
       });
     </script>
-<script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
 <script type="text/javascript">
 $(document).ready(function() {
   $('#headerSearch').on('keypress keydown keyup', function(e) {
diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html
index 0160fc8..1e4214d 100644
--- a/pagure/templates/user_list.html
+++ b/pagure/templates/user_list.html
@@ -4,7 +4,7 @@
 {% from "_browseheader.html" import browse_header %}
 
 {% block header %}
-<link href="{{ url_for('static', filename='selectize.bootstrap3.css') }}"
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
   rel="stylesheet" />
 {% endblock %}
 
@@ -108,7 +108,7 @@
 
 {% block jscripts %}
     {{ super() }}
-<script src="{{ url_for('static', filename='selectize.min.js') }}" type="text/javascript"> </script>
+<script src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}" type="text/javascript"> </script>
 <script type="text/javascript">
 $(document).ready(function() {
   $('#headerSearch').on('keypress keydown keyup', function(e) {