diff --git a/web/pgadmin/browser/templates/browser/body.html b/web/pgadmin/browser/templates/browser/body.html
index 1fb95fc2f..42c774e2b 100644
--- a/web/pgadmin/browser/templates/browser/body.html
+++ b/web/pgadmin/browser/templates/browser/body.html
@@ -1,7 +1,7 @@
 <link rel="stylesheet" href="{{ url_for('.static', filename='css/browser.css') }}" />
 <link rel="stylesheet" href="{{ url_for('static', filename='css/codemirror/codemirror.css') }}" />
-<script src="{{ url_for('static', filename='js/vendor/codemirror/codemirror.js') }}"></script>
-<script src="{{ url_for('static', filename='js/vendor/codemirror/mode/sql.js') }}"></script>
+<script src="{{ url_for('static', filename='js/codemirror/codemirror.js') }}"></script>
+<script src="{{ url_for('static', filename='js/codemirror/mode/sql.js') }}"></script>
 <link rel="stylesheet" href="{{ url_for('.static', filename='css/aciTree/css/aciTree.css') }}" />
 <script src="{{ url_for('.static', filename='js/aciTree/jquery.aciPlugin.min.js') }}"></script>
 <script src="{{ url_for('.static', filename='js/aciTree/jquery.aciTree.min.js') }}"></script>
diff --git a/web/pgadmin/static/js/vendor/alertifyjs/alertify.js b/web/pgadmin/static/js/alertifyjs/alertify.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/alertifyjs/alertify.js
rename to web/pgadmin/static/js/alertifyjs/alertify.js
diff --git a/web/pgadmin/static/js/vendor/alertifyjs/alertify.min.js b/web/pgadmin/static/js/alertifyjs/alertify.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/alertifyjs/alertify.min.js
rename to web/pgadmin/static/js/alertifyjs/alertify.min.js
diff --git a/web/pgadmin/static/js/vendor/bootstrap.js b/web/pgadmin/static/js/bootstrap.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/bootstrap.js
rename to web/pgadmin/static/js/bootstrap.js
diff --git a/web/pgadmin/static/js/vendor/bootstrap.min.js b/web/pgadmin/static/js/bootstrap.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/bootstrap.min.js
rename to web/pgadmin/static/js/bootstrap.min.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/comment/comment.js b/web/pgadmin/static/js/codemirror/addon/comment/comment.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/comment/comment.js
rename to web/pgadmin/static/js/codemirror/addon/comment/comment.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/comment/continuecomment.js b/web/pgadmin/static/js/codemirror/addon/comment/continuecomment.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/comment/continuecomment.js
rename to web/pgadmin/static/js/codemirror/addon/comment/continuecomment.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/dialog/dialog.css b/web/pgadmin/static/js/codemirror/addon/dialog/dialog.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/dialog/dialog.css
rename to web/pgadmin/static/js/codemirror/addon/dialog/dialog.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/dialog/dialog.js b/web/pgadmin/static/js/codemirror/addon/dialog/dialog.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/dialog/dialog.js
rename to web/pgadmin/static/js/codemirror/addon/dialog/dialog.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/display/fullscreen.css b/web/pgadmin/static/js/codemirror/addon/display/fullscreen.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/display/fullscreen.css
rename to web/pgadmin/static/js/codemirror/addon/display/fullscreen.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/display/fullscreen.js b/web/pgadmin/static/js/codemirror/addon/display/fullscreen.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/display/fullscreen.js
rename to web/pgadmin/static/js/codemirror/addon/display/fullscreen.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/display/panel.js b/web/pgadmin/static/js/codemirror/addon/display/panel.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/display/panel.js
rename to web/pgadmin/static/js/codemirror/addon/display/panel.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/display/placeholder.js b/web/pgadmin/static/js/codemirror/addon/display/placeholder.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/display/placeholder.js
rename to web/pgadmin/static/js/codemirror/addon/display/placeholder.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/display/rulers.js b/web/pgadmin/static/js/codemirror/addon/display/rulers.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/display/rulers.js
rename to web/pgadmin/static/js/codemirror/addon/display/rulers.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/closebrackets.js b/web/pgadmin/static/js/codemirror/addon/edit/closebrackets.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/closebrackets.js
rename to web/pgadmin/static/js/codemirror/addon/edit/closebrackets.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/closetag.js b/web/pgadmin/static/js/codemirror/addon/edit/closetag.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/closetag.js
rename to web/pgadmin/static/js/codemirror/addon/edit/closetag.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/continuelist.js b/web/pgadmin/static/js/codemirror/addon/edit/continuelist.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/continuelist.js
rename to web/pgadmin/static/js/codemirror/addon/edit/continuelist.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/matchbrackets.js b/web/pgadmin/static/js/codemirror/addon/edit/matchbrackets.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/matchbrackets.js
rename to web/pgadmin/static/js/codemirror/addon/edit/matchbrackets.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/matchtags.js b/web/pgadmin/static/js/codemirror/addon/edit/matchtags.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/matchtags.js
rename to web/pgadmin/static/js/codemirror/addon/edit/matchtags.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/edit/trailingspace.js b/web/pgadmin/static/js/codemirror/addon/edit/trailingspace.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/edit/trailingspace.js
rename to web/pgadmin/static/js/codemirror/addon/edit/trailingspace.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/brace-fold.js b/web/pgadmin/static/js/codemirror/addon/fold/brace-fold.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/brace-fold.js
rename to web/pgadmin/static/js/codemirror/addon/fold/brace-fold.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/comment-fold.js b/web/pgadmin/static/js/codemirror/addon/fold/comment-fold.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/comment-fold.js
rename to web/pgadmin/static/js/codemirror/addon/fold/comment-fold.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/foldcode.js b/web/pgadmin/static/js/codemirror/addon/fold/foldcode.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/foldcode.js
rename to web/pgadmin/static/js/codemirror/addon/fold/foldcode.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/foldgutter.css b/web/pgadmin/static/js/codemirror/addon/fold/foldgutter.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/foldgutter.css
rename to web/pgadmin/static/js/codemirror/addon/fold/foldgutter.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/foldgutter.js b/web/pgadmin/static/js/codemirror/addon/fold/foldgutter.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/foldgutter.js
rename to web/pgadmin/static/js/codemirror/addon/fold/foldgutter.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/indent-fold.js b/web/pgadmin/static/js/codemirror/addon/fold/indent-fold.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/indent-fold.js
rename to web/pgadmin/static/js/codemirror/addon/fold/indent-fold.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/markdown-fold.js b/web/pgadmin/static/js/codemirror/addon/fold/markdown-fold.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/markdown-fold.js
rename to web/pgadmin/static/js/codemirror/addon/fold/markdown-fold.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/fold/xml-fold.js b/web/pgadmin/static/js/codemirror/addon/fold/xml-fold.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/fold/xml-fold.js
rename to web/pgadmin/static/js/codemirror/addon/fold/xml-fold.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/anyword-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/anyword-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/anyword-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/anyword-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/css-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/css-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/css-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/css-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/html-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/html-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/html-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/html-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/javascript-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/javascript-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/javascript-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/javascript-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/show-hint.css b/web/pgadmin/static/js/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/show-hint.css
rename to web/pgadmin/static/js/codemirror/addon/hint/show-hint.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/show-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/show-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/show-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/sql-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/sql-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/sql-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/sql-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/hint/xml-hint.js b/web/pgadmin/static/js/codemirror/addon/hint/xml-hint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/hint/xml-hint.js
rename to web/pgadmin/static/js/codemirror/addon/hint/xml-hint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/coffeescript-lint.js b/web/pgadmin/static/js/codemirror/addon/lint/coffeescript-lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/coffeescript-lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/coffeescript-lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/css-lint.js b/web/pgadmin/static/js/codemirror/addon/lint/css-lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/css-lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/css-lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/javascript-lint.js b/web/pgadmin/static/js/codemirror/addon/lint/javascript-lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/javascript-lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/javascript-lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/json-lint.js b/web/pgadmin/static/js/codemirror/addon/lint/json-lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/json-lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/json-lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/lint.css b/web/pgadmin/static/js/codemirror/addon/lint/lint.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/lint.css
rename to web/pgadmin/static/js/codemirror/addon/lint/lint.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/lint.js b/web/pgadmin/static/js/codemirror/addon/lint/lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/lint/yaml-lint.js b/web/pgadmin/static/js/codemirror/addon/lint/yaml-lint.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/lint/yaml-lint.js
rename to web/pgadmin/static/js/codemirror/addon/lint/yaml-lint.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/merge/merge.css b/web/pgadmin/static/js/codemirror/addon/merge/merge.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/merge/merge.css
rename to web/pgadmin/static/js/codemirror/addon/merge/merge.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/merge/merge.js b/web/pgadmin/static/js/codemirror/addon/merge/merge.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/merge/merge.js
rename to web/pgadmin/static/js/codemirror/addon/merge/merge.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/mode/loadmode.js b/web/pgadmin/static/js/codemirror/addon/mode/loadmode.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/mode/loadmode.js
rename to web/pgadmin/static/js/codemirror/addon/mode/loadmode.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/mode/multiplex.js b/web/pgadmin/static/js/codemirror/addon/mode/multiplex.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/mode/multiplex.js
rename to web/pgadmin/static/js/codemirror/addon/mode/multiplex.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/mode/multiplex_test.js b/web/pgadmin/static/js/codemirror/addon/mode/multiplex_test.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/mode/multiplex_test.js
rename to web/pgadmin/static/js/codemirror/addon/mode/multiplex_test.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/mode/overlay.js b/web/pgadmin/static/js/codemirror/addon/mode/overlay.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/mode/overlay.js
rename to web/pgadmin/static/js/codemirror/addon/mode/overlay.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/mode/simple.js b/web/pgadmin/static/js/codemirror/addon/mode/simple.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/mode/simple.js
rename to web/pgadmin/static/js/codemirror/addon/mode/simple.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/runmode/colorize.js b/web/pgadmin/static/js/codemirror/addon/runmode/colorize.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/runmode/colorize.js
rename to web/pgadmin/static/js/codemirror/addon/runmode/colorize.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode-standalone.js b/web/pgadmin/static/js/codemirror/addon/runmode/runmode-standalone.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode-standalone.js
rename to web/pgadmin/static/js/codemirror/addon/runmode/runmode-standalone.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode.js b/web/pgadmin/static/js/codemirror/addon/runmode/runmode.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode.js
rename to web/pgadmin/static/js/codemirror/addon/runmode/runmode.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode.node.js b/web/pgadmin/static/js/codemirror/addon/runmode/runmode.node.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/runmode/runmode.node.js
rename to web/pgadmin/static/js/codemirror/addon/runmode/runmode.node.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/scroll/annotatescrollbar.js b/web/pgadmin/static/js/codemirror/addon/scroll/annotatescrollbar.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/scroll/annotatescrollbar.js
rename to web/pgadmin/static/js/codemirror/addon/scroll/annotatescrollbar.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/scroll/scrollpastend.js b/web/pgadmin/static/js/codemirror/addon/scroll/scrollpastend.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/scroll/scrollpastend.js
rename to web/pgadmin/static/js/codemirror/addon/scroll/scrollpastend.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/scroll/simplescrollbars.css b/web/pgadmin/static/js/codemirror/addon/scroll/simplescrollbars.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/scroll/simplescrollbars.css
rename to web/pgadmin/static/js/codemirror/addon/scroll/simplescrollbars.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/scroll/simplescrollbars.js b/web/pgadmin/static/js/codemirror/addon/scroll/simplescrollbars.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/scroll/simplescrollbars.js
rename to web/pgadmin/static/js/codemirror/addon/scroll/simplescrollbars.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/search/match-highlighter.js b/web/pgadmin/static/js/codemirror/addon/search/match-highlighter.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/search/match-highlighter.js
rename to web/pgadmin/static/js/codemirror/addon/search/match-highlighter.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/search/matchesonscrollbar.css b/web/pgadmin/static/js/codemirror/addon/search/matchesonscrollbar.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/search/matchesonscrollbar.css
rename to web/pgadmin/static/js/codemirror/addon/search/matchesonscrollbar.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/search/matchesonscrollbar.js b/web/pgadmin/static/js/codemirror/addon/search/matchesonscrollbar.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/search/matchesonscrollbar.js
rename to web/pgadmin/static/js/codemirror/addon/search/matchesonscrollbar.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/search/search.js b/web/pgadmin/static/js/codemirror/addon/search/search.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/search/search.js
rename to web/pgadmin/static/js/codemirror/addon/search/search.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/search/searchcursor.js b/web/pgadmin/static/js/codemirror/addon/search/searchcursor.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/search/searchcursor.js
rename to web/pgadmin/static/js/codemirror/addon/search/searchcursor.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/selection/active-line.js b/web/pgadmin/static/js/codemirror/addon/selection/active-line.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/selection/active-line.js
rename to web/pgadmin/static/js/codemirror/addon/selection/active-line.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/selection/mark-selection.js b/web/pgadmin/static/js/codemirror/addon/selection/mark-selection.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/selection/mark-selection.js
rename to web/pgadmin/static/js/codemirror/addon/selection/mark-selection.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/selection/selection-pointer.js b/web/pgadmin/static/js/codemirror/addon/selection/selection-pointer.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/selection/selection-pointer.js
rename to web/pgadmin/static/js/codemirror/addon/selection/selection-pointer.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/tern/tern.css b/web/pgadmin/static/js/codemirror/addon/tern/tern.css
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/tern/tern.css
rename to web/pgadmin/static/js/codemirror/addon/tern/tern.css
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/tern/tern.js b/web/pgadmin/static/js/codemirror/addon/tern/tern.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/tern/tern.js
rename to web/pgadmin/static/js/codemirror/addon/tern/tern.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/tern/worker.js b/web/pgadmin/static/js/codemirror/addon/tern/worker.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/tern/worker.js
rename to web/pgadmin/static/js/codemirror/addon/tern/worker.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/addon/wrap/hardwrap.js b/web/pgadmin/static/js/codemirror/addon/wrap/hardwrap.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/addon/wrap/hardwrap.js
rename to web/pgadmin/static/js/codemirror/addon/wrap/hardwrap.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/codemirror.js b/web/pgadmin/static/js/codemirror/codemirror.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/codemirror.js
rename to web/pgadmin/static/js/codemirror/codemirror.js
diff --git a/web/pgadmin/static/js/vendor/codemirror/mode/sql.js b/web/pgadmin/static/js/codemirror/mode/sql.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/codemirror/mode/sql.js
rename to web/pgadmin/static/js/codemirror/mode/sql.js
diff --git a/web/pgadmin/static/js/vendor/jquery-1.11.2.js b/web/pgadmin/static/js/jquery-1.11.2.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-1.11.2.js
rename to web/pgadmin/static/js/jquery-1.11.2.js
diff --git a/web/pgadmin/static/js/vendor/jquery-1.11.2.min.js b/web/pgadmin/static/js/jquery-1.11.2.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-1.11.2.min.js
rename to web/pgadmin/static/js/jquery-1.11.2.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.callbacks-latest.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.callbacks-latest.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.callbacks-latest.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.callbacks-latest.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.callbacks.min-latest.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.callbacks.min-latest.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.callbacks.min-latest.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.callbacks.min-latest.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.pseudoClose.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.pseudoClose.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.pseudoClose.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.pseudoClose.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.pseudoClose.min.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.pseudoClose.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.pseudoClose.min.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.pseudoClose.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeDataTable.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeDataTable.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeDataTable.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeDataTable.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeDataTable.min.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeDataTable.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeDataTable.min.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeDataTable.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.min.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.min.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizePaneAccordions.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeTabLayout.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeTabLayout.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeTabLayout.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeTabLayout.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeTabLayout.min.js b/web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeTabLayout.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/callbacks/jquery.layout.resizeTabLayout.min.js
rename to web/pgadmin/static/js/jquery-layout/callbacks/jquery.layout.resizeTabLayout.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/jquery.layout.js b/web/pgadmin/static/js/jquery-layout/jquery.layout.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/jquery.layout.js
rename to web/pgadmin/static/js/jquery-layout/jquery.layout.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/jquery.layout.min.js b/web/pgadmin/static/js/jquery-layout/jquery.layout.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/jquery.layout.min.js
rename to web/pgadmin/static/js/jquery-layout/jquery.layout.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/jquery.layout_and_plugins.js b/web/pgadmin/static/js/jquery-layout/jquery.layout_and_plugins.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/jquery.layout_and_plugins.js
rename to web/pgadmin/static/js/jquery-layout/jquery.layout_and_plugins.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/jquery.layout_and_plugins.min.js b/web/pgadmin/static/js/jquery-layout/jquery.layout_and_plugins.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/jquery.layout_and_plugins.min.js
rename to web/pgadmin/static/js/jquery-layout/jquery.layout_and_plugins.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.browserZoom.js b/web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.browserZoom.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.browserZoom.js
rename to web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.browserZoom.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.buttons.js b/web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.buttons.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.buttons.js
rename to web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.buttons.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.slideOffscreen.js b/web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.slideOffscreen.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.slideOffscreen.js
rename to web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.slideOffscreen.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.slideOffscreen.min.js b/web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.slideOffscreen.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.slideOffscreen.min.js
rename to web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.slideOffscreen.min.js
diff --git a/web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.state.js b/web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.state.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-layout/plugins/jquery.layout.state.js
rename to web/pgadmin/static/js/jquery-layout/plugins/jquery.layout.state.js
diff --git a/web/pgadmin/static/js/vendor/jquery-ui/jquery-ui.js b/web/pgadmin/static/js/jquery-ui/jquery-ui.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-ui/jquery-ui.js
rename to web/pgadmin/static/js/jquery-ui/jquery-ui.js
diff --git a/web/pgadmin/static/js/vendor/jquery-ui/jquery-ui.min.js b/web/pgadmin/static/js/jquery-ui/jquery-ui.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/jquery-ui/jquery-ui.min.js
rename to web/pgadmin/static/js/jquery-ui/jquery-ui.min.js
diff --git a/web/pgadmin/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js b/web/pgadmin/static/js/modernizr-2.6.2-respond-1.1.0.min.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
rename to web/pgadmin/static/js/modernizr-2.6.2-respond-1.1.0.min.js
diff --git a/web/pgadmin/static/js/vendor/npm.js b/web/pgadmin/static/js/npm.js
similarity index 100%
rename from web/pgadmin/static/js/vendor/npm.js
rename to web/pgadmin/static/js/npm.js
diff --git a/web/pgadmin/templates/base.html b/web/pgadmin/templates/base.html
index 54e321d6f..d1ff45c70 100755
--- a/web/pgadmin/templates/base.html
+++ b/web/pgadmin/templates/base.html
@@ -28,19 +28,19 @@
         {% if config.DEBUG %}<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-theme.min.css') }}">{% else %}<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-theme.min.css') }}">{% endif %}
         <link rel="stylesheet" href="{{ url_for('static', filename='css/overrides.css') }}">
 
-        <script src="{{ url_for('static', filename='js/vendor/modernizr-2.6.2-respond-1.1.0.min.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/modernizr-2.6.2-respond-1.1.0.min.js') }}"></script>
     </head>
     <body>
         <!--[if lt IE 7]>
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/vendor/jquery-1.11.2.js') }}">{% else %}<script src="{{ url_for('static', filename='js/vendor/jquery-1.11.2.min.js') }}">{% endif %}</script>
-        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/vendor/bootstrap.js') }}">{% else %}<script src="{{ url_for('static', filename='js/vendor/bootstrap.min.js') }}">{% endif %}</script>
-        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/vendor/alertifyjs/alertify.js') }}">{% else %}<script src="{{ url_for('static', filename='js/vendor/alertifyjs/alertify.min.js') }}">{% endif %}</script>
-        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/vendor/jquery-ui/jquery-ui.js') }}">{% else %}<script src="{{ url_for('static', filename='js/vendor/jquery-ui/jquery-ui.min.js') }}">{% endif %}</script>
-        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/vendor/jquery-layout/jquery.layout.js') }}">{% else %}<script src="{{ url_for('static', filename='js/vendor/jquery-layout/jquery.layout.min.js') }}">{% endif %}</script>
-        <script src="{{ url_for('static', filename='js/vendor/jquery-layout/plugins/jquery.layout.state.js') }}"></script>
+        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/jquery-1.11.2.js') }}">{% else %}<script src="{{ url_for('static', filename='js/jquery-1.11.2.min.js') }}">{% endif %}</script>
+        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/bootstrap.js') }}">{% else %}<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}">{% endif %}</script>
+        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/alertifyjs/alertify.js') }}">{% else %}<script src="{{ url_for('static', filename='js/alertifyjs/alertify.min.js') }}">{% endif %}</script>
+        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/jquery-ui/jquery-ui.js') }}">{% else %}<script src="{{ url_for('static', filename='js/jquery-ui/jquery-ui.min.js') }}">{% endif %}</script>
+        {% if config.DEBUG %}<script src="{{ url_for('static', filename='js/jquery-layout/jquery.layout.js') }}">{% else %}<script src="{{ url_for('static', filename='js/jquery-layout/jquery.layout.min.js') }}">{% endif %}</script>
+        <script src="{{ url_for('static', filename='js/jquery-layout/plugins/jquery.layout.state.js') }}"></script>
         
         <script>
             alertify.defaults.transition = "zoom";