diff --git a/README.md b/README.md
index 159ae2458..37fabacb0 100644
--- a/README.md
+++ b/README.md
@@ -326,7 +326,7 @@ docker run -p 3000:3000 postwoman:latest
 
 1. [Clone this repo](https://help.github.com/en/articles/cloning-a-repository) with git.
 2. Install dependencies by running `npm install` within the directory that you cloned (probably `hoppscotch`).
-3. Build the release files with `npm run build`.
+3. Build the release files with `npm run generate`.
 4. Find the built project in `./dist`.
 
 ## **Contributing**
diff --git a/assets/scss/styles.scss b/assets/scss/styles.scss
index 85089dc42..c3ddab7fa 100644
--- a/assets/scss/styles.scss
+++ b/assets/scss/styles.scss
@@ -8,6 +8,7 @@ $responsiveWidth: 768px;
 
 :root {
   @apply antialiased;
+
   font-variant-ligatures: common-ligatures;
 }
 
@@ -54,6 +55,7 @@ body {
   @apply transition;
   @apply ease-in-out;
   @apply duration-200;
+
   -webkit-tap-highlight-color: transparent;
   -webkit-touch-callout: none;
 }
@@ -211,6 +213,7 @@ hr {
     .tooltip-arrow {
       @apply mt-0;
       @apply mb-0;
+
       border-width: 5px 5px 0 5px;
       border-left-color: transparent !important;
       border-right-color: transparent !important;
@@ -226,6 +229,7 @@ hr {
     .tooltip-arrow {
       @apply mt-0;
       @apply mb-0;
+
       border-width: 0 5px 5px 5px;
       border-left-color: transparent !important;
       border-right-color: transparent !important;
@@ -241,6 +245,7 @@ hr {
     .tooltip-arrow {
       @apply ml-0;
       @apply mr-0;
+
       border-width: 5px 5px 5px 0;
       border-left-color: transparent !important;
       border-top-color: transparent !important;
@@ -256,6 +261,7 @@ hr {
     .tooltip-arrow {
       @apply ml-0;
       @apply mr-0;
+
       border-width: 5px 0 5px 5px;
       border-top-color: transparent !important;
       border-right-color: transparent !important;
@@ -278,11 +284,14 @@ hr {
       @apply rounded-lg;
       @apply overflow-auto;
       @apply shadow-lg;
+
       max-height: 256px;
 
       button {
         @apply flex-1;
         @apply m-0;
+        @apply justify-start;
+        @apply text-left;
       }
 
       div {
@@ -290,11 +299,6 @@ hr {
         @apply items-stretch;
         @apply flex-col;
       }
-
-      button {
-        @apply justify-start;
-        @apply text-left;
-      }
     }
 
     .popover-arrow {
@@ -362,6 +366,7 @@ button {
     @apply text-actColor;
     @apply fill-current;
     @apply outline-none;
+
     box-shadow: inset 0 0 0 2px var(--fg-color);
   }
 
@@ -423,6 +428,7 @@ button {
   @apply tracking-normal;
   @apply whitespace-no-wrap;
   @apply antialiased;
+
   word-wrap: normal;
   direction: ltr;
   text-rendering: optimizeLegibility;
@@ -481,6 +487,7 @@ code {
   @apply select-text;
   @apply resize-y;
   @apply outline-none;
+
   width: calc(100% - 16px);
 
   &:not([readonly]):not(.ace_editor):hover,
@@ -493,6 +500,7 @@ code {
 .method {
   @apply cursor-pointer;
   @apply uppercase;
+
   min-width: 128px;
 
   &:hover,
@@ -530,11 +538,12 @@ pre {
     @apply w-full;
   }
 
-  &:after {
+  &::after {
     @apply inline-block;
     @apply absolute;
     @apply pointer-events-none;
     @apply font-icon;
+
     content: "\e313";
     top: 16px;
     right: 16px;
@@ -544,6 +553,7 @@ pre {
 select {
   @apply cursor-pointer;
   @apply appearance-none;
+
   height: 40px;
 
   &::-ms-expand {
@@ -563,7 +573,7 @@ input[type="checkbox"] {
     @apply align-middle;
     @apply cursor-pointer;
 
-    &:before {
+    &::before {
       @apply border;
       @apply border-fgColor;
       @apply rounded-lg;
@@ -574,6 +584,7 @@ input[type="checkbox"] {
       @apply transition;
       @apply ease-in-out;
       @apply duration-200;
+
       content: "\2714";
       height: 16px;
       width: 16px;
@@ -581,7 +592,7 @@ input[type="checkbox"] {
     }
   }
 
-  &:checked + label:before {
+  &:checked + label::before {
     @apply bg-acColor;
     @apply border-acColor;
     @apply text-actColor;
@@ -616,6 +627,7 @@ ol {
   @apply flex;
   @apply p-0;
   @apply list-none;
+
   margin: 4px 0 4px;
 
   ul,
@@ -684,6 +696,7 @@ ol li {
   textarea {
     @apply m-0;
     @apply w-full;
+
     line-height: 1;
   }
 
@@ -708,6 +721,7 @@ ol li {
     @apply ease-in-out;
     @apply duration-200;
     @apply shadow-lg;
+
     bottom: 86px;
     left: 50%;
     z-index: 10001;
@@ -753,6 +767,7 @@ section {
   @apply flex;
   @apply order-2;
   @apply ml-4;
+
   width: 33%;
 }
 
@@ -807,15 +822,17 @@ section {
   @apply text-sm;
   @apply rounded-lg;
   @apply shadow-lg;
+
   padding: 16px !important;
 
   .action {
     @apply bg-gray-50;
     @apply text-gray-900;
     @apply rounded-lg;
+    @apply font-bold;
+
     text-transform: none !important;
     padding: 12px 16px !important;
-    font-weight: 500 !important;
     font-size: 16px !important;
     margin: 0 !important;
     margin-left: 8px !important;
diff --git a/assets/scss/themes.scss b/assets/scss/themes.scss
index 1782d1d92..196cec130 100644
--- a/assets/scss/themes.scss
+++ b/assets/scss/themes.scss
@@ -1,6 +1,6 @@
 @mixin baseTheme {
   --font-body: "Poppins", "sans-serif";
-  --font-mono: "Roboto Mono", "monoscpace";
+  --font-mono: "Roboto Mono", "monospace";
   --font-icon: "Material Icons";
 }
 
diff --git a/components/collections/add-folder.vue b/components/collections/add-folder.vue
index d81823319..588239074 100644
--- a/components/collections/add-folder.vue
+++ b/components/collections/add-folder.vue
@@ -21,7 +21,7 @@
             type="text"
             v-model="name"
             :placeholder="$t('my_new_folder')"
-            @keyup.enter="addNewFolder"
+            @keyup.enter="addFolder"
           />
         </li>
       </ul>
@@ -33,7 +33,7 @@
           <button class="icon" @click="hideModal">
             {{ $t("cancel") }}
           </button>
-          <button class="icon primary" @click="addNewFolder">
+          <button class="icon primary" @click="addFolder">
             {{ $t("save") }}
           </button>
         </span>
@@ -52,7 +52,7 @@ export default {
   },
   props: {
     show: Boolean,
-    collection: Object,
+    folder: Object,
     collectionIndex: Number,
   },
   data() {
@@ -61,14 +61,6 @@ export default {
     }
   },
   methods: {
-    addNewFolder() {
-      this.$store.commit("postwoman/addNewFolder", {
-        folder: { name: this.$data.name },
-        collectionIndex: this.$props.collectionIndex,
-      })
-      this.hideModal()
-      this.syncCollections()
-    },
     syncCollections() {
       if (fb.currentUser !== null) {
         if (fb.currentSettings[0].value) {
@@ -76,6 +68,14 @@ export default {
         }
       }
     },
+    addFolder() {
+      this.$store.commit("postwoman/addFolder", {
+        name: this.$data.name,
+        folder: this.$props.folder,
+      })
+      this.hideModal()
+      this.syncCollections()
+    },
     hideModal() {
       this.$emit("hide-modal")
     },
diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index 6d13ee782..b1912bd3a 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -1,6 +1,14 @@
 <template>
   <div>
-    <div class="row-wrapper">
+    <div
+      :class="['row-wrapper', dragging ? 'drop-zone' : '']"
+      @dragover.prevent
+      @drop.prevent="dropEvent"
+      @dragover="dragging = true"
+      @drop="dragging = false"
+      @dragleave="dragging = false"
+      @dragend="dragging = false"
+    >
       <button class="icon" @click="toggleShowChildren">
         <i class="material-icons" v-show="!showChildren && !isFiltered">arrow_right</i>
         <i class="material-icons" v-show="showChildren || isFiltered">arrow_drop_down</i>
@@ -22,7 +30,11 @@
           </button>
           <template slot="popover">
             <div>
-              <button class="icon" @click="$emit('add-folder')" v-close-popover>
+              <button
+                class="icon"
+                @click="$emit('add-folder', { folder: collection })"
+                v-close-popover
+              >
                 <i class="material-icons">create_new_folder</i>
                 <span>{{ $t("new_folder") }}</span>
               </button>
@@ -53,18 +65,16 @@
         >
           <folder
             :folder="folder"
-            :folderIndex="index"
+            :folder-index="index"
             :collection-index="collectionIndex"
             :doc="doc"
             :isFiltered="isFiltered"
-            @edit-folder="editFolder(collectionIndex, folder, index)"
+            @add-folder="$emit('add-folder', $event)"
+            @edit-folder="$emit('edit-folder', $event)"
             @edit-request="$emit('edit-request', $event)"
           />
         </li>
-        <li
-          v-if="collection.folders.length === 0 && collection.requests.length === 0"
-          class="ml-8 border-l border-brdColor"
-        >
+        <li v-if="collection.folders.length === 0 && collection.requests.length === 0">
           <label>{{ $t("collection_empty") }}</label>
         </li>
       </ul>
@@ -78,16 +88,10 @@
             :request="request"
             :collection-index="collectionIndex"
             :folder-index="-1"
+            :folder-name="collection.name"
             :request-index="index"
             :doc="doc"
-            @edit-request="
-              $emit('edit-request', {
-                request,
-                collectionIndex,
-                folderIndex: undefined,
-                requestIndex: index,
-              })
-            "
+            @edit-request="$emit('edit-request', $event)"
           />
         </li>
       </ul>
@@ -111,6 +115,7 @@ export default {
   data() {
     return {
       showChildren: false,
+      dragging: false,
       selectedFolder: {},
     }
   },
@@ -135,8 +140,22 @@ export default {
       })
       this.syncCollections()
     },
-    editFolder(collectionIndex, folder, folderIndex) {
-      this.$emit("edit-folder", { collectionIndex, folder, folderIndex })
+    dropEvent({ dataTransfer }) {
+      this.dragging = !this.dragging
+      const oldCollectionIndex = dataTransfer.getData("oldCollectionIndex")
+      const oldFolderIndex = dataTransfer.getData("oldFolderIndex")
+      const oldFolderName = dataTransfer.getData("oldFolderName")
+      const requestIndex = dataTransfer.getData("requestIndex")
+      this.$store.commit("postwoman/moveRequest", {
+        oldCollectionIndex,
+        newCollectionIndex: this.$props.collectionIndex,
+        newFolderIndex: -1,
+        newFolderName: this.$props.collection.name,
+        oldFolderIndex,
+        oldFolderName,
+        requestIndex,
+      })
+      this.syncCollections()
     },
   },
 }
diff --git a/components/collections/edit-folder.vue b/components/collections/edit-folder.vue
index 209496695..3f383f31d 100644
--- a/components/collections/edit-folder.vue
+++ b/components/collections/edit-folder.vue
@@ -47,7 +47,6 @@ export default {
   },
   props: {
     show: Boolean,
-    collection: Object,
     collectionIndex: Number,
     folder: Object,
     folderIndex: Number,
@@ -70,6 +69,7 @@ export default {
         collectionIndex: this.$props.collectionIndex,
         folder: { ...this.$props.folder, name: this.$data.name },
         folderIndex: this.$props.folderIndex,
+        folderName: this.$props.folder.name,
       })
       this.hideModal()
       this.syncCollections()
diff --git a/components/collections/edit-request.vue b/components/collections/edit-request.vue
index 44310b10c..c2e4e8820 100644
--- a/components/collections/edit-request.vue
+++ b/components/collections/edit-request.vue
@@ -15,42 +15,14 @@
       </ul>
     </div>
     <div slot="body">
-      <ul>
-        <li>
-          <label for="selectLabel">{{ $t("label") }}</label>
-          <input
-            type="text"
-            id="selectLabel"
-            v-model="requestUpdateData.name"
-            @keyup.enter="saveRequest"
-            :placeholder="request.name"
-          />
-          <label for="selectCollection">{{ $t("collection") }}</label>
-          <span class="select-wrapper">
-            <select type="text" id="selectCollection" v-model="requestUpdateData.collectionIndex">
-              <option :key="undefined" :value="undefined" hidden disabled selected>
-                {{ $t("current_collection") }}
-              </option>
-              <option
-                v-for="(collection, index) in $store.state.postwoman.collections"
-                :key="index"
-                :value="index"
-              >
-                {{ collection.name }}
-              </option>
-            </select>
-          </span>
-          <label for="selectFolder">{{ $t("folder") }}</label>
-          <span class="select-wrapper">
-            <select type="text" id="selectFolder" v-model="requestUpdateData.folderIndex">
-              <option :key="undefined" :value="undefined">/</option>
-              <option v-for="(folder, index) in folders" :key="index" :value="index">
-                {{ folder.name }}
-              </option>
-            </select>
-          </span>
-        </li>
-      </ul>
+      <label for="selectLabel">{{ $t("label") }}</label>
+      <input
+        type="text"
+        id="selectLabel"
+        v-model="requestUpdateData.name"
+        @keyup.enter="saveRequest"
+        :placeholder="request.name"
+      />
     </div>
     <div slot="footer">
       <div class="row-wrapper">
@@ -80,6 +52,7 @@ export default {
     show: Boolean,
     collectionIndex: Number,
     folderIndex: Number,
+    folderName: String,
     request: Object,
     requestIndex: Number,
   },
@@ -87,27 +60,9 @@ export default {
     return {
       requestUpdateData: {
         name: undefined,
-        collectionIndex: undefined,
-        folderIndex: undefined,
       },
     }
   },
-  watch: {
-    "requestUpdateData.collectionIndex": function resetFolderIndex() {
-      // if user choosen some folder, than selected other collection, which doesn't have any folders
-      // than `requestUpdateData.folderIndex` won't be reseted
-      this.$data.requestUpdateData.folderIndex = undefined
-    },
-  },
-  computed: {
-    folders() {
-      const userSelectedAnyCollection = this.$data.requestUpdateData.collectionIndex !== undefined
-      if (!userSelectedAnyCollection) return []
-
-      return this.$store.state.postwoman.collections[this.$data.requestUpdateData.collectionIndex]
-        .folders
-    },
-  },
   methods: {
     syncCollections() {
       if (fb.currentUser !== null) {
@@ -117,26 +72,17 @@ export default {
       }
     },
     saveRequest() {
-      const userSelectedAnyCollection = this.$data.requestUpdateData.collectionIndex !== undefined
-
       const requestUpdated = {
         ...this.$props.request,
         name: this.$data.requestUpdateData.name || this.$props.request.name,
-        collection: userSelectedAnyCollection
-          ? this.$data.requestUpdateData.collectionIndex
-          : this.$props.collectionIndex,
-        folder: this.$data.requestUpdateData.folderIndex,
       }
 
-      // pass data separately to don't depend on request's collection, folder fields
-      // probably, they should be deprecated because they don't describe request itself
       this.$store.commit("postwoman/editRequest", {
-        requestOldCollectionIndex: this.$props.collectionIndex,
-        requestOldFolderIndex: this.$props.folderIndex,
-        requestOldIndex: this.$props.requestIndex,
+        requestCollectionIndex: this.$props.collectionIndex,
+        requestFolderName: this.$props.folderName,
+        requestFolderIndex: this.$props.folderIndex,
         requestNew: requestUpdated,
-        requestNewCollectionIndex: requestUpdated.collection,
-        requestNewFolderIndex: requestUpdated.folder,
+        requestIndex: this.$props.requestIndex,
       })
 
       this.hideModal()
diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 6b07a1e76..12b07d9e2 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -1,6 +1,14 @@
 <template>
   <div>
-    <div class="row-wrapper">
+    <div
+      :class="['row-wrapper', dragging ? 'drop-zone' : '']"
+      @dragover.prevent
+      @drop.prevent="dropEvent"
+      @dragover="dragging = true"
+      @drop="dragging = false"
+      @dragleave="dragging = false"
+      @dragend="dragging = false"
+    >
       <div>
         <button class="icon" @click="toggleShowChildren">
           <i class="material-icons" v-show="!showChildren && !isFiltered">arrow_right</i>
@@ -15,7 +23,17 @@
         </button>
         <template slot="popover">
           <div>
-            <button class="icon" @click="editFolder" v-close-popover>
+            <button class="icon" @click="$emit('add-folder', { folder })" v-close-popover>
+              <i class="material-icons">create_new_folder</i>
+              <span>{{ $t("new_folder") }}</span>
+            </button>
+          </div>
+          <div>
+            <button
+              class="icon"
+              @click="$emit('edit-folder', { folder, folderIndex, collectionIndex })"
+              v-close-popover
+            >
               <i class="material-icons">edit</i>
               <span>{{ $t("edit") }}</span>
             </button>
@@ -41,20 +59,24 @@
             :request="request"
             :collection-index="collectionIndex"
             :folder-index="folderIndex"
+            :folder-name="folder.name"
             :request-index="index"
             :doc="doc"
-            @edit-request="
-              $emit('edit-request', {
-                request,
-                collectionIndex,
-                folderIndex,
-                requestIndex: index,
-              })
-            "
+            @edit-request="$emit('edit-request', $event)"
           />
         </li>
-        <li v-if="folder.requests.length === 0" class="flex ml-8 border-l border-brdColor">
-          <label>{{ $t("folder_empty") }}</label>
+      </ul>
+      <ul v-if="folder.folders && folder.folders.length" class="flex-col">
+        <li v-for="(subFolder, subFolderIndex) in folder.folders" :key="subFolder.name">
+          <folder
+            :folder="subFolder"
+            :folder-index="subFolderIndex"
+            :collection-index="collectionIndex"
+            :doc="doc"
+            @add-folder="$emit('add-folder', $event)"
+            @edit-folder="$emit('edit-folder', $event)"
+            @edit-request="$emit('edit-request', $event)"
+          />
         </li>
       </ul>
     </div>
@@ -67,16 +89,18 @@ import deleteIcon from "~/static/icons/delete-24px.svg?inline"
 
 export default {
   components: { deleteIcon },
+  name: "folder",
   props: {
     folder: Object,
-    collectionIndex: Number,
     folderIndex: Number,
+    collectionIndex: Number,
     doc: Boolean,
     isFiltered: Boolean,
   },
   data() {
     return {
       showChildren: false,
+      dragging: false,
     }
   },
   methods: {
@@ -90,22 +114,35 @@ export default {
     toggleShowChildren() {
       this.showChildren = !this.showChildren
     },
-    selectRequest(request) {
-      this.$store.commit("postwoman/selectRequest", { request })
-    },
     removeFolder() {
       if (!confirm(this.$t("are_you_sure_remove_folder"))) return
       this.$store.commit("postwoman/removeFolder", {
-        collectionIndex: this.collectionIndex,
-        folderIndex: this.folderIndex,
+        collectionIndex: this.$props.collectionIndex,
+        folderName: this.$props.folder.name,
+        folderIndex: this.$props.folderIndex,
       })
       this.syncCollections()
       this.$toast.error(this.$t("deleted"), {
         icon: "delete",
       })
     },
-    editFolder() {
-      this.$emit("edit-folder")
+    dropEvent({ dataTransfer }) {
+      this.dragging = !this.dragging
+      const oldCollectionIndex = dataTransfer.getData("oldCollectionIndex")
+      const oldFolderIndex = dataTransfer.getData("oldFolderIndex")
+      const oldFolderName = dataTransfer.getData("oldFolderName")
+      const requestIndex = dataTransfer.getData("requestIndex")
+
+      this.$store.commit("postwoman/moveRequest", {
+        oldCollectionIndex,
+        newCollectionIndex: this.$props.collectionIndex,
+        newFolderIndex: this.$props.folderIndex,
+        newFolderName: this.$props.folder.name,
+        oldFolderIndex,
+        oldFolderName,
+        requestIndex,
+      })
+      this.syncCollections()
     },
   },
 }
diff --git a/components/collections/import-export-collections.vue b/components/collections/import-export-collections.vue
index dbba1f8f2..20d583c90 100644
--- a/components/collections/import-export-collections.vue
+++ b/components/collections/import-export-collections.vue
@@ -108,8 +108,8 @@ export default {
     },
     replaceWithJSON() {
       let reader = new FileReader()
-      reader.onload = (event) => {
-        let content = event.target.result
+      reader.onload = ({ target }) => {
+        let content = target.result
         let collections = JSON.parse(content)
         if (collections[0]) {
           let [name, folders, requests] = Object.keys(collections[0])
@@ -117,7 +117,7 @@ export default {
             // Do nothing
           }
         } else if (collections.info && collections.info.schema.includes("v2.1.0")) {
-          collections = this.parsePostmanCollection(collections)
+          collections = [this.parsePostmanCollection(collections)]
         } else {
           return this.failedImport()
         }
@@ -130,8 +130,8 @@ export default {
     },
     importFromJSON() {
       let reader = new FileReader()
-      reader.onload = (event) => {
-        let content = event.target.result
+      reader.onload = ({ target }) => {
+        let content = target.result
         let collections = JSON.parse(content)
         if (collections[0]) {
           let [name, folders, requests] = Object.keys(collections[0])
@@ -141,8 +141,7 @@ export default {
         } else if (collections.info && collections.info.schema.includes("v2.1.0")) {
           //replace the variables, postman uses {{var}}, Hoppscotch uses <<var>>
           collections = JSON.parse(content.replaceAll(/{{([a-z]+)}}/gi, "<<$1>>"))
-          collections.item = this.flattenPostmanFolders(collections)
-          collections = this.parsePostmanCollection(collections)
+          collections = [this.parsePostmanCollection(collections)]
         } else {
           return this.failedImport()
         }
@@ -192,36 +191,30 @@ export default {
         icon: "error",
       })
     },
-    parsePostmanCollection(collection, folders = true) {
-      let postwomanCollection = folders
-        ? [
-            {
-              name: "",
-              folders: [],
-              requests: [],
-            },
-          ]
-        : {
-            name: "",
-            requests: [],
-          }
-      if (folders) {
-        //pick up collection name even when all children are folders
-        postwomanCollection[0].name = collection.info ? collection.info.name : ""
+    parsePostmanCollection({ info, name, item }) {
+      let postwomanCollection = {
+        name: "",
+        folders: [],
+        requests: [],
       }
-      for (let collectionItem of collection.item) {
-        if (collectionItem.request) {
-          if (postwomanCollection[0]) {
-            postwomanCollection[0].name = collection.info ? collection.info.name : ""
-            postwomanCollection[0].requests.push(this.parsePostmanRequest(collectionItem))
+
+      postwomanCollection.name = info ? info.name : name
+
+      if (item && item.length > 0) {
+        for (let collectionItem of item) {
+          if (collectionItem.request) {
+            if (postwomanCollection.hasOwnProperty("folders")) {
+              postwomanCollection.name = info ? info.name : name
+              postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem))
+            } else {
+              postwomanCollection.name = name ? name : ""
+              postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem))
+            }
+          } else if (this.hasFolder(collectionItem)) {
+            postwomanCollection.folders.push(this.parsePostmanCollection(collectionItem))
           } else {
-            postwomanCollection.name = collection.name ? collection.name : ""
             postwomanCollection.requests.push(this.parsePostmanRequest(collectionItem))
           }
-        } else if (collectionItem.item) {
-          if (collectionItem.item[0]) {
-            postwomanCollection[0].folders.push(this.parsePostmanCollection(collectionItem, false))
-          }
         }
       }
       return postwomanCollection
@@ -300,46 +293,8 @@ export default {
       }
       return pwRequest
     },
-    flattenPostmanFolders(collection) {
-      let items = []
-
-      for (let collectionItem of collection.item) {
-        if (this.hasFolder(collectionItem)) {
-          let newFolderItems = []
-          for (let folderItem of collectionItem.item) {
-            if (this.isSubFolder(folderItem)) {
-              newFolderItems = newFolderItems.concat(this.flattenPostmanItem(folderItem))
-            } else {
-              newFolderItems.push(folderItem)
-            }
-          }
-          collectionItem.item = newFolderItems
-        }
-        items.push(collectionItem)
-      }
-      return items
-    },
     hasFolder(item) {
-      return Object.prototype.hasOwnProperty.call(item, "item")
-    },
-    isSubFolder(item) {
-      return (
-        Object.prototype.hasOwnProperty.call(item, "_postman_isSubFolder") &&
-        item._postman_isSubFolder
-      )
-    },
-    flattenPostmanItem(subFolder, subFolderGlue = " -- ") {
-      delete subFolder._postman_isSubFolder
-      let flattenedItems = []
-      for (let subFolderItem of subFolder.item) {
-        subFolderItem.name = subFolder.name + subFolderGlue + subFolderItem.name
-        if (this.isSubFolder(subFolderItem)) {
-          flattenedItems = flattenedItems.concat(this.flattenPostmanItem(subFolderItem))
-        } else {
-          flattenedItems.push(subFolderItem)
-        }
-      }
-      return flattenedItems
+      return item.hasOwnProperty("item")
     },
   },
 }
diff --git a/components/collections/index.vue b/components/collections/index.vue
index aca710adc..b7b583358 100644
--- a/components/collections/index.vue
+++ b/components/collections/index.vue
@@ -14,30 +14,29 @@ TODO:
     <add-collection :show="showModalAdd" @hide-modal="displayModalAdd(false)" />
     <edit-collection
       :show="showModalEdit"
-      :editingCollection="editingCollection"
-      :editingCollectionIndex="editingCollectionIndex"
+      :editing-collection="editingCollection"
+      :editing-collection-index="editingCollectionIndex"
       @hide-modal="displayModalEdit(false)"
     />
     <add-folder
       :show="showModalAddFolder"
-      :collection="editingCollection"
-      :collectionIndex="editingCollectionIndex"
+      :folder="editingFolder"
       @hide-modal="displayModalAddFolder(false)"
     />
     <edit-folder
       :show="showModalEditFolder"
-      :collection="editingCollection"
-      :collectionIndex="editingCollectionIndex"
+      :collection-index="editingCollectionIndex"
       :folder="editingFolder"
-      :folderIndex="editingFolderIndex"
+      :folder-index="editingFolderIndex"
       @hide-modal="displayModalEditFolder(false)"
     />
     <edit-request
       :show="showModalEditRequest"
-      :collectionIndex="editingCollectionIndex"
-      :folderIndex="editingFolderIndex"
+      :collection-index="editingCollectionIndex"
+      :folder-index="editingFolderIndex"
+      :folder-name="editingFolderName"
       :request="editingRequest"
-      :requestIndex="editingRequestIndex"
+      :request-index="editingRequestIndex"
       @hide-modal="displayModalEditRequest(false)"
     />
     <import-export-collections
@@ -74,12 +73,13 @@ TODO:
       <ul class="flex-col">
         <li v-for="(collection, index) in filteredCollections" :key="collection.name">
           <collection
+            :name="collection.name"
             :collection-index="index"
             :collection="collection"
             :doc="doc"
             :isFiltered="filterText.length > 0"
             @edit-collection="editCollection(collection, index)"
-            @add-folder="addFolder(collection, index)"
+            @add-folder="addFolder($event)"
             @edit-folder="editFolder($event)"
             @edit-request="editRequest($event)"
             @select-collection="$emit('use-collection', collection)"
@@ -119,6 +119,7 @@ export default {
       editingCollection: undefined,
       editingCollectionIndex: undefined,
       editingFolder: undefined,
+      editingFolderName: undefined,
       editingFolderIndex: undefined,
       editingRequest: undefined,
       editingRequestIndex: undefined,
@@ -212,15 +213,14 @@ export default {
       this.displayModalEdit(true)
       this.syncCollections()
     },
-    addFolder(collection, collectionIndex) {
-      this.$data.editingCollection = collection
-      this.$data.editingCollectionIndex = collectionIndex
+    addFolder(payload) {
+      const { folder } = payload
+      this.$data.editingFolder = folder
       this.displayModalAddFolder(true)
       this.syncCollections()
     },
     editFolder(payload) {
-      const { collection, collectionIndex, folder, folderIndex } = payload
-      this.$data.editingCollection = collection
+      const { collectionIndex, folder, folderIndex } = payload
       this.$data.editingCollectionIndex = collectionIndex
       this.$data.editingFolder = folder
       this.$data.editingFolderIndex = folderIndex
@@ -228,9 +228,10 @@ export default {
       this.syncCollections()
     },
     editRequest(payload) {
-      const { request, collectionIndex, folderIndex, requestIndex } = payload
+      const { collectionIndex, folderIndex, folderName, request, requestIndex } = payload
       this.$data.editingCollectionIndex = collectionIndex
       this.$data.editingFolderIndex = folderIndex
+      this.$data.editingFolderName = folderName
       this.$data.editingRequest = request
       this.$data.editingRequestIndex = requestIndex
       this.displayModalEditRequest(true)
diff --git a/components/collections/request.vue b/components/collections/request.vue
index 6be0e5567..b2b5e50d8 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -1,5 +1,12 @@
 <template>
-  <div class="row-wrapper">
+  <div
+    :class="['row-wrapper', dragging ? 'drag-el' : '']"
+    draggable="true"
+    @dragstart="dragStart"
+    @dragover.stop
+    @dragleave="dragging = false"
+    @dragend="dragging = false"
+  >
     <div>
       <button
         class="icon"
@@ -16,7 +23,19 @@
       </button>
       <template slot="popover">
         <div>
-          <button class="icon" @click="$emit('edit-request')" v-close-popover>
+          <button
+            class="icon"
+            @click="
+              $emit('edit-request', {
+                collectionIndex,
+                folderIndex,
+                folderName,
+                request,
+                requestIndex,
+              })
+            "
+            v-close-popover
+          >
             <i class="material-icons">edit</i>
             <span>{{ $t("edit") }}</span>
           </button>
@@ -42,9 +61,15 @@ export default {
     request: Object,
     collectionIndex: Number,
     folderIndex: Number,
+    folderName: String,
     requestIndex: Number,
     doc: Boolean,
   },
+  data() {
+    return {
+      dragging: false,
+    }
+  },
   methods: {
     syncCollections() {
       if (fb.currentUser !== null) {
@@ -56,12 +81,19 @@ export default {
     selectRequest() {
       this.$store.commit("postwoman/selectRequest", { request: this.request })
     },
+    dragStart({ dataTransfer }) {
+      this.dragging = !this.dragging
+      dataTransfer.setData("oldCollectionIndex", this.$props.collectionIndex)
+      dataTransfer.setData("oldFolderIndex", this.$props.folderIndex)
+      dataTransfer.setData("oldFolderName", this.$props.folderName)
+      dataTransfer.setData("requestIndex", this.$props.requestIndex)
+    },
     removeRequest() {
       if (!confirm(this.$t("are_you_sure_remove_request"))) return
       this.$store.commit("postwoman/removeRequest", {
-        collectionIndex: this.collectionIndex,
-        folderIndex: this.folderIndex,
-        requestIndex: this.requestIndex,
+        collectionIndex: this.$props.collectionIndex,
+        folderName: this.$props.folderName,
+        requestIndex: this.$props.requestIndex,
       })
       this.$toast.error(this.$t("deleted"), {
         icon: "delete",
diff --git a/components/collections/save-request-as.vue b/components/collections/save-request-as.vue
index 0d6f27d0f..c61d61f9c 100644
--- a/components/collections/save-request-as.vue
+++ b/components/collections/save-request-as.vue
@@ -40,15 +40,13 @@
               </option>
             </select>
           </span>
-          <label for="selectFolder">{{ $t("folder") }}</label>
-          <span class="select-wrapper">
-            <select type="text" id="selectFolder" v-model="requestData.folderIndex">
-              <option :key="undefined" :value="undefined">/</option>
-              <option v-for="(folder, index) in folders" :key="index" :value="index">
-                {{ folder.name }}
-              </option>
-            </select>
-          </span>
+          <label>{{ $t("folder") }}</label>
+          <autocomplete
+            :placeholder="$t('search')"
+            :source="folders"
+            :spellcheck="false"
+            v-model="requestData.folderName"
+          />
           <label for="selectRequest">{{ $t("request") }}</label>
           <span class="select-wrapper">
             <select type="text" id="selectRequest" v-model="requestData.requestIndex">
@@ -95,60 +93,62 @@ export default {
       requestData: {
         name: undefined,
         collectionIndex: undefined,
-        folderIndex: undefined,
+        folderName: undefined,
         requestIndex: undefined,
       },
     }
   },
   watch: {
     "requestData.collectionIndex": function resetFolderAndRequestIndex() {
-      // if user choosen some folder, than selected other collection, which doesn't have any folders
-      // than `requestUpdateData.folderIndex` won't be reseted
-      this.$data.requestData.folderIndex = undefined
+      // if user has chosen some folder, than selected other collection, which doesn't have any folders
+      // than `requestUpdateData.folderName` won't be reseted
+      this.$data.requestData.folderName = undefined
       this.$data.requestData.requestIndex = undefined
     },
-    "requestData.folderIndex": function resetRequestIndex() {
+    "requestData.folderName": function resetRequestIndex() {
       this.$data.requestData.requestIndex = undefined
     },
-    editingRequest(request) {
-      this.defaultRequestName = request.label || "My Request"
+    editingRequest({ label }) {
+      this.defaultRequestName = label || "My Request"
     },
   },
   computed: {
     folders() {
-      const userSelectedAnyCollection = this.$data.requestData.collectionIndex !== undefined
+      const collections = this.$store.state.postwoman.collections
+      const collectionIndex = this.$data.requestData.collectionIndex
+      const userSelectedAnyCollection = collectionIndex !== undefined
       if (!userSelectedAnyCollection) return []
 
-      const noCollectionAvailable =
-        this.$store.state.postwoman.collections[this.$data.requestData.collectionIndex] !==
-        undefined
+      const noCollectionAvailable = collections[collectionIndex] !== undefined
       if (!noCollectionAvailable) return []
 
-      return this.$store.state.postwoman.collections[this.$data.requestData.collectionIndex].folders
+      return getFolderNames(collections[collectionIndex].folders, [])
     },
     requests() {
-      const userSelectedAnyCollection = this.$data.requestData.collectionIndex !== undefined
-      if (!userSelectedAnyCollection) return []
+      const collections = this.$store.state.postwoman.collections
+      const collectionIndex = this.$data.requestData.collectionIndex
+      const folderName = this.$data.requestData.folderName
+
+      const userSelectedAnyCollection = collectionIndex !== undefined
+      if (!userSelectedAnyCollection) {
+        return []
+      }
+
+      const userSelectedAnyFolder = folderName !== undefined && folderName !== ""
 
-      const userSelectedAnyFolder = this.$data.requestData.folderIndex !== undefined
       if (userSelectedAnyFolder) {
-        const collection = this.$store.state.postwoman.collections[
-          this.$data.requestData.collectionIndex
-        ]
-        const folder = collection.folders[this.$data.requestData.folderIndex]
-        const requests = folder.requests
-        return requests
+        const collection = collections[collectionIndex]
+        const folder = findFolder(folderName, collection)
+        return folder.requests
       } else {
-        const collection = this.$store.state.postwoman.collections[
-          this.$data.requestData.collectionIndex
-        ]
-        const noCollectionAvailable =
-          this.$store.state.postwoman.collections[this.$data.requestData.collectionIndex] !==
-          undefined
-        if (!noCollectionAvailable) return []
+        const collection = collections[collectionIndex]
+        const noCollectionAvailable = collection !== undefined
 
-        const requests = collection.requests
-        return requests
+        if (!noCollectionAvailable) {
+          return []
+        }
+
+        return collection.requests
       }
     },
   },
@@ -178,7 +178,7 @@ export default {
       this.$store.commit("postwoman/saveRequestAs", {
         request: requestUpdated,
         collectionIndex: this.$data.requestData.collectionIndex,
-        folderIndex: this.$data.requestData.folderIndex,
+        folderName: this.$data.requestData.folderName,
         requestIndex: this.$data.requestData.requestIndex,
       })
 
@@ -191,4 +191,36 @@ export default {
     },
   },
 }
+
+function getFolderNames(folders, namesList) {
+  if (folders.length) {
+    folders.forEach((folder) => {
+      namesList.push(folder.name)
+      if (folder.folders && folder.folders.length) {
+        getFolderNames(folder.folders, namesList)
+      }
+    })
+  }
+  return namesList
+}
+
+function findFolder(folderName, currentFolder) {
+  let selectedFolder
+  let result
+
+  if (folderName === currentFolder.name) {
+    return currentFolder
+  }
+
+  for (let i = 0; i < currentFolder.folders.length; i++) {
+    selectedFolder = currentFolder.folders[i]
+
+    result = findFolder(folderName, selectedFolder)
+
+    if (result !== false) {
+      return result
+    }
+  }
+  return false
+}
 </script>
diff --git a/components/environments/edit-environment.vue b/components/environments/edit-environment.vue
index b96ce2078..31674ba6c 100644
--- a/components/environments/edit-environment.vue
+++ b/components/environments/edit-environment.vue
@@ -126,7 +126,7 @@ export default {
     }
   },
   watch: {
-    editingEnvironment: function (update) {
+    editingEnvironment(update) {
       this.name =
         this.$props.editingEnvironment && this.$props.editingEnvironment.name
           ? this.$props.editingEnvironment.name
@@ -151,13 +151,13 @@ export default {
         }
       }
     },
-    clearContent(e) {
+    clearContent({ target }) {
       this.$store.commit("postwoman/removeVariables", [])
-      e.target.innerHTML = this.doneButton
+      target.innerHTML = this.doneButton
       this.$toast.info(this.$t("cleared"), {
         icon: "clear_all",
       })
-      setTimeout(() => (e.target.innerHTML = '<i class="material-icons">clear_all</i>'), 1000)
+      setTimeout(() => (target.innerHTML = '<i class="material-icons">clear_all</i>'), 1000)
     },
     addEnvironmentVariable() {
       let value = { key: "", value: "" }
diff --git a/components/environments/import-export-environment.vue b/components/environments/import-export-environment.vue
index 4c76133eb..9f2aa193b 100644
--- a/components/environments/import-export-environment.vue
+++ b/components/environments/import-export-environment.vue
@@ -108,8 +108,8 @@ export default {
     },
     replaceWithJSON() {
       let reader = new FileReader()
-      reader.onload = (event) => {
-        let content = event.target.result
+      reader.onload = ({ target }) => {
+        let content = target.result
         let environments = JSON.parse(content)
         this.$store.commit("postwoman/replaceEnvironments", environments)
       }
@@ -120,8 +120,8 @@ export default {
     },
     importFromJSON() {
       let reader = new FileReader()
-      reader.onload = (event) => {
-        let content = event.target.result
+      reader.onload = ({ target }) => {
+        let content = target.result
         let importFileObj = JSON.parse(content)
         if (
           importFileObj["_postman_variable_scope"] === "environment" ||
@@ -143,11 +143,9 @@ export default {
         confirmation,
       })
     },
-    importFromPostman(importFileObj) {
-      let environment = { name: importFileObj.name, variables: [] }
-      importFileObj.values.forEach((element) =>
-        environment.variables.push({ key: element.key, value: element.value })
-      )
+    importFromPostman({ name, values }) {
+      let environment = { name, variables: [] }
+      values.forEach(({ key, value }) => environment.variables.push({ key, value }))
       let environments = [environment]
       this.importFromPostwoman(environments)
     },
diff --git a/components/firebase/feeds.vue b/components/firebase/feeds.vue
index 81c13e4c5..846a2b9ec 100644
--- a/components/firebase/feeds.vue
+++ b/components/firebase/feeds.vue
@@ -54,8 +54,8 @@ export default {
     }
   },
   methods: {
-    async deleteFeed(feed) {
-      await fb.deleteFeed(feed.id)
+    async deleteFeed({ id }) {
+      await fb.deleteFeed(id)
       this.$toast.error(this.$t("deleted"), {
         icon: "delete",
       })
diff --git a/components/graphql/type.vue b/components/graphql/type.vue
index 146d2ad49..5efe72411 100644
--- a/components/graphql/type.vue
+++ b/components/graphql/type.vue
@@ -35,9 +35,7 @@ export default {
   },
   methods: {
     isFieldHighlighted({ field }) {
-      return !!this.highlightedFields.find(
-        (highlightedField) => highlightedField.name === field.name
-      )
+      return !!this.highlightedFields.find(({ name }) => name === field.name)
     },
   },
 }
diff --git a/components/layout/history.vue b/components/layout/history.vue
index 494466784..f835feb36 100644
--- a/components/layout/history.vue
+++ b/components/layout/history.vue
@@ -368,8 +368,8 @@ export default {
     useHistory(entry) {
       this.$emit("useHistory", entry)
     },
-    findEntryStatus(entry) {
-      const foundStatusGroup = findStatusGroup(entry.status)
+    findEntryStatus({ status }) {
+      const foundStatusGroup = findStatusGroup(status)
       return (
         foundStatusGroup || {
           className: "",
diff --git a/components/layout/pw-header.vue b/components/layout/pw-header.vue
index 008ac2c98..45517b1d9 100644
--- a/components/layout/pw-header.vue
+++ b/components/layout/pw-header.vue
@@ -359,34 +359,34 @@ export default {
         })
       }
 
-      // let showAd = localStorage.getItem("showAd") === "no"
-      // if (!showAd) {
-      //   setTimeout(() => {
-      //     this.$toast.clear()
-      //     this.$toast.show(
-      //       "<span>Postwoman is now Hoppscotch 🎉<br><u><a href='https://dev.to/liyasthomas/postwoman-is-changing-name-igp' target='_blank' rel='noopener'>Read the announcement</a></u> →<br><sub>Whoosh this away to dismiss.</sub></span>",
-      //       {
-      //         icon: "",
-      //         duration: 0,
-      //         theme: "toasted-ad",
-      //         action: [
-      //           {
-      //             text: "GitHub",
-      //             icon: "chevron_right",
-      //             onClick: (e, toastObject) => {
-      //               // localStorage.setItem("showAd", "no")
-      //               toastObject.goAway(0)
-      //               window.open("https://github.com/hoppscotch/hoppscotch")
-      //             },
-      //           },
-      //         ],
-      //         onComplete() {
-      //           // localStorage.setItem("showAd", "no")
-      //         },
-      //       }
-      //     )
-      //   }, 8000)
-      // }
+      let showAd = localStorage.getItem("showAd") === "no"
+      if (!showAd) {
+        setTimeout(() => {
+          this.$toast.clear()
+          this.$toast.show(
+            "<span><a href='https://github.com/sponsors/hoppscotch' target='_blank' rel='noopener'>Make a donation to support Hoppscotch open source project 🎉</a><br><sub>Whoosh this away to dismiss.</sub></span>",
+            {
+              icon: "",
+              duration: 0,
+              theme: "toasted-ad",
+              action: [
+                {
+                  text: "DONATE",
+                  icon: "favorite",
+                  onClick: (e, toastObject) => {
+                    localStorage.setItem("showAd", "no")
+                    toastObject.goAway(0)
+                    window.open("https://github.com/sponsors/hoppscotch")
+                  },
+                },
+              ],
+              onComplete() {
+                localStorage.setItem("showAd", "no")
+              },
+            }
+          )
+        }, 8000)
+      }
 
       let showExtensionsToast = localStorage.getItem("showExtensionsToast") === "yes"
 
@@ -452,11 +452,5 @@ export default {
       }
     },
   },
-
-  computed: {
-    availableLocales() {
-      return this.$i18n.locales.filter((i) => i.code !== this.$i18n.locale)
-    },
-  },
 }
 </script>
diff --git a/components/lenses/renderers/HTMLLensRenderer.vue b/components/lenses/renderers/HTMLLensRenderer.vue
index 7199d84eb..2a0106810 100644
--- a/components/lenses/renderers/HTMLLensRenderer.vue
+++ b/components/lenses/renderers/HTMLLensRenderer.vue
@@ -73,6 +73,7 @@
     </li>
   </ul>
 </template>
+
 <script>
 import TextContentRendererMixin from "./mixins/TextContentRendererMixin"
 
diff --git a/components/lenses/renderers/ImageLensRenderer.vue b/components/lenses/renderers/ImageLensRenderer.vue
index 2f0e09474..fe93d22ef 100644
--- a/components/lenses/renderers/ImageLensRenderer.vue
+++ b/components/lenses/renderers/ImageLensRenderer.vue
@@ -50,8 +50,8 @@ export default {
         const blob = new Blob([bytes.buffer])
 
         const reader = new FileReader()
-        reader.onload = (e) => {
-          this.imageSource = e.target.result
+        reader.onload = ({ target }) => {
+          this.imageSource = target.result
         }
         reader.readAsDataURL(blob)
       },
@@ -65,8 +65,8 @@ export default {
     const blob = new Blob([bytes.buffer])
 
     const reader = new FileReader()
-    reader.onload = (e) => {
-      this.imageSource = e.target.result
+    reader.onload = ({ target }) => {
+      this.imageSource = target.result
     }
     reader.readAsDataURL(blob)
   },
@@ -78,7 +78,8 @@ export default {
       const url = URL.createObjectURL(file)
       a.href = url
       // TODO get uri from meta
-      a.download = `response on ${Date()}`.replace(/\./g, "[dot]")
+      a.download = `${url.split("/").pop().split("#")[0].split("?")[0]}.${this.responseType}`
+      // `response on ${Date()}`.replace(/\./g, "[dot]")
       document.body.appendChild(a)
       a.click()
       this.$refs.downloadResponse.innerHTML = this.doneButton
diff --git a/components/lenses/renderers/RawLensRenderer.vue b/components/lenses/renderers/RawLensRenderer.vue
index a22142e50..6c256a3ab 100644
--- a/components/lenses/renderers/RawLensRenderer.vue
+++ b/components/lenses/renderers/RawLensRenderer.vue
@@ -55,6 +55,7 @@
     </li>
   </ul>
 </template>
+
 <script>
 import { isJSONContentType } from "~/helpers/utils/contenttypes"
 import TextContentRendererMixin from "./mixins/TextContentRendererMixin"
diff --git a/components/lenses/renderers/XMLLensRenderer.vue b/components/lenses/renderers/XMLLensRenderer.vue
index 171131739..364424116 100644
--- a/components/lenses/renderers/XMLLensRenderer.vue
+++ b/components/lenses/renderers/XMLLensRenderer.vue
@@ -55,6 +55,7 @@
     </li>
   </ul>
 </template>
+
 <script>
 import TextContentRendererMixin from "./mixins/TextContentRendererMixin"
 
diff --git a/components/realtime/log.vue b/components/realtime/log.vue
index 1ca07d928..3f74594f4 100644
--- a/components/realtime/log.vue
+++ b/components/realtime/log.vue
@@ -47,7 +47,7 @@ export default {
   methods: {
     getSourcePrefix,
   },
-  updated: function () {
+  updated() {
     this.$nextTick(function () {
       if (this.$refs.log) {
         this.$refs.log.scrollBy(0, this.$refs.log.scrollHeight + 100)
diff --git a/components/realtime/mqtt.vue b/components/realtime/mqtt.vue
index 6373bdc50..6303cd1ec 100644
--- a/components/realtime/mqtt.vue
+++ b/components/realtime/mqtt.vue
@@ -73,7 +73,7 @@ import Paho from "paho-mqtt"
 import { wsValid } from "~/helpers/utils/valid"
 
 export default {
-  data: function () {
+  data() {
     return {
       url: "wss://test.mosquitto.org:8081",
       client: null,
diff --git a/components/ui/ace-editor.vue b/components/ui/ace-editor.vue
index 618c1ce5f..89b6ca5f1 100644
--- a/components/ui/ace-editor.vue
+++ b/components/ui/ace-editor.vue
@@ -75,7 +75,7 @@ export default {
       })
     },
     lang(value) {
-      this.editor.getSession().setMode("ace/mode/" + value)
+      this.editor.getSession().setMode(`ace/mode/${value}`)
     },
     options(value) {
       this.editor.setOptions(value)
diff --git a/components/ui/autocomplete.vue b/components/ui/autocomplete.vue
index d7d64df46..1bf613206 100644
--- a/components/ui/autocomplete.vue
+++ b/components/ui/autocomplete.vue
@@ -10,7 +10,7 @@
       @keydown="handleKeystroke"
       ref="acInput"
       :spellcheck="spellcheck"
-      :autocapitalize="spellcheck"
+      :autocapitalize="autocapitalize"
       :autocorrect="spellcheck"
     />
     <ul
@@ -86,6 +86,12 @@ export default {
       required: false,
     },
 
+    autocapitalize: {
+      type: String,
+      default: "off",
+      required: false,
+    },
+
     placeholder: {
       type: String,
       default: "",
@@ -190,12 +196,11 @@ export default {
 
       return (
         this.source
-          .filter((entry) => {
-            return (
+          .filter(
+            (entry) =>
               entry.toLowerCase().startsWith(input.toLowerCase()) &&
               input.toLowerCase() !== entry.toLowerCase()
-            )
-          })
+          )
           // Cut off the part that's already been typed.
           .map((entry) => entry.substring(this.selectionStart))
           // We only want the top 6 suggestions.
diff --git a/helpers/__tests__/fb.spec.js b/helpers/__tests__/fb.spec.js
index f7d2c3886..ead98b043 100644
--- a/helpers/__tests__/fb.spec.js
+++ b/helpers/__tests__/fb.spec.js
@@ -121,35 +121,6 @@ beforeEach(async () => {
       value: true,
     })
 
-  await mocksdk
-    .firestore()
-    .collection("users")
-    .doc(testuser.uid)
-    .collection("settings")
-    .doc("syncTeams")
-    .set({
-      author: testuser.uid,
-      author_image: testuser.photoURL,
-      author_name: testuser.displayName,
-      name: "syncTeams",
-      updatedOn: new Date(1598703948000),
-      value: true,
-    })
-
-  await mocksdk
-    .firestore()
-    .collection("users")
-    .doc(testuser.uid)
-    .collection("teams")
-    .doc("sync")
-    .set({
-      author: testuser.uid,
-      author_image: testuser.photoURL,
-      author_name: testuser.displayName,
-      team: [],
-      updatedOn: new Date(1598703948000),
-    })
-
   await mocksdk
     .firestore()
     .collection("users")
@@ -1232,78 +1203,4 @@ describe("FirebaseInstance", () => {
       )
     })
   })
-
-  describe("writeTeams", () => {
-    test("resolves for proper authenticated request", async () => {
-      const fb = new FirebaseInstance(mocksdk)
-
-      signInUser()
-
-      await expect(fb.writeTeams([])).resolves.toBeUndefined()
-    })
-
-    test("rejects for non-authenticated request", async () => {
-      const fb = new FirebaseInstance(mocksdk)
-
-      signOutUser()
-
-      await expect(fb.writeTeams([])).rejects.toBeDefined()
-    })
-
-    test("stores data on firestore with proper structure", async () => {
-      const fb = new FirebaseInstance(mocksdk)
-
-      signInUser()
-
-      await fb.writeTeams([])
-
-      const doc = (
-        await mocksdk
-          .firestore()
-          .collection("users")
-          .doc(testuser.uid)
-          .collection("teams")
-          .doc("sync")
-          .get()
-      ).data()
-
-      expect(doc).toEqual(
-        expect.objectContaining({
-          updatedOn: expect.any(Date),
-          author: expect.any(String),
-          author_name: expect.any(String),
-          author_image: expect.any(String),
-          team: expect.anything(),
-        })
-      )
-    })
-
-    test("stores data on firestore with fields having proper values", async () => {
-      const fb = new FirebaseInstance(mocksdk)
-
-      signInUser()
-
-      await fb.writeTeams([])
-
-      const doc = (
-        await mocksdk
-          .firestore()
-          .collection("users")
-          .doc(testuser.uid)
-          .collection("teams")
-          .doc("sync")
-          .get()
-      ).data()
-
-      expect(doc).toEqual(
-        expect.objectContaining({
-          updatedOn: expect.any(Date),
-          author: testuser.uid,
-          author_name: testuser.displayName,
-          author_image: testuser.photoURL,
-          team: expect.anything(),
-        })
-      )
-    })
-  })
 })
diff --git a/helpers/fb.js b/helpers/fb.js
index f564448d8..30c3dd7d8 100644
--- a/helpers/fb.js
+++ b/helpers/fb.js
@@ -32,7 +32,6 @@ export class FirebaseInstance {
     this.currentHistory = []
     this.currentCollections = []
     this.currentEnvironments = []
-    this.currentTeams = []
 
     this.app.auth().onAuthStateChanged((user) => {
       if (user) {
@@ -121,19 +120,6 @@ export class FirebaseInstance {
               this.currentEnvironments = environments[0].environment
             }
           })
-
-        this.usersCollection
-          .doc(this.currentUser.uid)
-          .collection("teams")
-          .onSnapshot((teamsRef) => {
-            const teams = []
-            teamsRef.forEach((doc) => {
-              const team = doc.data()
-              team.id = doc.id
-              teams.push(team)
-            })
-            this.currentTeams = teams[0].team
-          })
       } else {
         this.currentUser = null
       }
@@ -302,24 +288,6 @@ export class FirebaseInstance {
       throw e
     }
   }
-
-  async writeTeams(team) {
-    const ev = {
-      updatedOn: new Date(),
-      author: this.currentUser.uid,
-      author_name: this.currentUser.displayName,
-      author_image: this.currentUser.photoURL,
-      team,
-    }
-
-    try {
-      await this.usersCollection.doc(this.currentUser.uid).collection("teams").doc("sync").set(ev)
-    } catch (e) {
-      console.error("error updating", ev, e)
-
-      throw e
-    }
-  }
 }
 
 export const fb = new FirebaseInstance(firebase.initializeApp(firebaseConfig), authProviders)
diff --git a/nuxt.config.js b/nuxt.config.js
index 2b2e5171c..549373edd 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,5 +1,4 @@
-// Some helpful application constants.
-// TODO: Use these when rendering the pages (rather than just for head/meta tags...)
+// Common options
 export const options = {
   name: "Hoppscotch",
   shortDescription: "A free, fast and beautiful API request builder",
@@ -15,14 +14,20 @@ export const options = {
     twitter: "@liyasthomas",
   },
 }
+
 export default {
+  // Disable server-side rendering (https://go.nuxtjs.dev/ssr-mode)
   ssr: false,
+
+  // Target (https://go.nuxtjs.dev/config-target)
+  target: "static",
+
+  // Default: localhost
   server: {
-    host: "0.0.0.0", // default: localhost
+    host: "0.0.0.0",
   },
-  /*
-   ** Headers of the page
-   */
+
+  // Global page headers (https://go.nuxtjs.dev/config-head)
   head: {
     title: `${options.name} • ${options.shortDescription}`,
     meta: [
@@ -81,66 +86,60 @@ export default {
       },
     ],
   },
-  /*
-   ** Customize the progress-bar color
-   */
+
+  // Customize the progress-bar color (https://nuxtjs.org/api/configuration-loading/#customizing-the-progress-bar)
   loading: {
     color: options.loading.color,
     continuous: true,
   },
-  /*
-   ** Customize the loading indicator
-   */
+
+  // Customize the loading indicator (https://nuxtjs.org/api/configuration-loading-indicator)
   loadingIndicator: {
     name: "pulse",
     color: options.loading.color,
     background: options.loading.background,
   },
-  /*
-   ** Global CSS
-   */
+
+  // Global CSS (https://go.nuxtjs.dev/config-css)
   css: ["~/assets/scss/styles.scss", "~/assets/scss/themes.scss", "~/assets/scss/fonts.scss"],
-  /*
-   ** Plugins to load before mounting the App
-   */
+
+  // Plugins to run before rendering page (https://go.nuxtjs.dev/config-plugins)
   plugins: ["~/plugins/vuex-persist", "~/plugins/v-tooltip"],
-  /*
-   ** Auto import components
-   ** See https://nuxtjs.org/api/configuration-components
-   */
+
+  // Auto import components (https://go.nuxtjs.dev/config-components)
   components: true,
-  /*
-   ** Nuxt.js dev-modules
-   */
+
+  // Modules for dev and build (recommended) (https://go.nuxtjs.dev/config-modules)
   buildModules: [
-    // https://pwa.nuxtjs.org
+    // https://github.com/nuxt-community/pwa-module
     "@nuxtjs/pwa",
-    // Doc: https://github.com/nuxt-community/analytics-module
+    // https://github.com/nuxt-community/analytics-module
     "@nuxtjs/google-analytics",
-    // Doc: https://github.com/nuxt-community/gtm-module
+    // https://github.com/nuxt-community/gtm-module
     "@nuxtjs/gtm",
-    // Doc: https://github.com/nuxt-community/svg-module
+    // https://github.com/nuxt-community/svg-module
     "@nuxtjs/svg",
-    // Doc: https://tailwindcss.nuxtjs.org
+    // https://github.com/nuxt-community/nuxt-tailwindcss
     "@nuxtjs/tailwindcss",
-    // Doc: https://color-mode.nuxtjs.org
+    // https://github.com/nuxt-community/color-mode-module
     "@nuxtjs/color-mode",
   ],
-  /*
-   ** Nuxt.js modules
-   */
+
+  // Modules (https://go.nuxtjs.dev/config-modules)
   modules: [
-    // https://axios.nuxtjs.org
+    // https://github.com/nuxt-community/axios-module
     "@nuxtjs/axios",
     // https://github.com/nuxt-community/modules/tree/master/packages/toast
     "@nuxtjs/toast",
-    // Doc: https://github.com/nuxt-community/nuxt-i18n
+    // https://github.com/nuxt-community/i18n-module
     "nuxt-i18n",
-    // Doc: https://github.com/nuxt-community/robots-module
+    // https://github.com/nuxt-community/robots-module
     "@nuxtjs/robots",
-    // Doc: https://github.com/nuxt-community/sitemap-module
+    // https://github.com/nuxt-community/sitemap-module
     "@nuxtjs/sitemap",
   ],
+
+  // PWA module configuration (https://pwa.nuxtjs.org/setup)
   pwa: {
     meta: {
       ogHost: process.env.BASE_URL,
@@ -160,32 +159,46 @@ export default {
     },
     workbox: false,
   },
+
+  // Toast module configuration (https://github.com/nuxt-community/modules/tree/master/packages/toast)
   toast: {
     position: "bottom-center",
     duration: 3000,
     theme: "bubble",
     keepOnHover: true,
   },
+
+  // Google Analytics module configuration (https://github.com/nuxt-community/analytics-module)
   googleAnalytics: {
     id: process.env.GA_ID,
   },
+
+  // Google Tag Manager module configuration (https://github.com/nuxt-community/gtm-module)
   gtm: {
     id: process.env.GTM_ID,
   },
+
+  // Sitemap module configuration (https://github.com/nuxt-community/sitemap-module)
   sitemap: {
     hostname: process.env.BASE_URL || "https://hoppscotch.io/",
   },
+
+  // Robots module configuration (https://github.com/nuxt-community/robots-module)
   robots: {
     UserAgent: "*",
     Disallow: "",
     Allow: "/",
     Sitemap: `${process.env.BASE_URL}sitemap.xml`,
   },
+
+  // Color Mode module configuration (https://github.com/nuxt-community/color-mode-module)
   colorMode: {
     classSuffix: "",
     preference: "dark",
     fallback: "dark",
   },
+
+  // i18n module configuration (https://github.com/nuxt-community/i18n-module)
   i18n: {
     locales: [
       {
@@ -296,13 +309,10 @@ export default {
       fallbackLocale: "en",
     },
   },
-  /*
-   ** Build configuration
-   */
+
+  // Build Configuration (https://go.nuxtjs.dev/config-build)
   build: {
-    /*
-     ** You can extend webpack config here
-     */
+    // You can extend webpack config here
     extend(config, ctx) {
       // Sets webpack's mode to development if `isDev` is true.
       if (ctx.isDev) {
@@ -316,17 +326,20 @@ export default {
     cache: true,
     // hardSource: true,
   },
-  /*
-   ** Generate configuration
-   */
+
+  // Generate configuration (https://nuxtjs.org/api/configuration-generate)
   generate: {
     fallback: true,
   },
+
+  // Public runtime configuration (https://nuxtjs.org/guide/runtime-config)
   publicRuntimeConfig: {
     GA_ID: process.env.GA_ID || "UA-61422507-4",
     GTM_ID: process.env.GTM_ID || "GTM-NMKVBMV",
     BASE_URL: process.env.BASE_URL || "https://hoppscotch.io/",
   },
+
+  // Private runtime configuration (https://nuxtjs.org/guide/runtime-config)
   privateRuntimeConfig: {
     API_KEY: process.env.API_KEY,
     AUTH_DOMAIN: process.env.AUTH_DOMAIN,
diff --git a/pages/graphql.vue b/pages/graphql.vue
index 24ae5e60d..ce4be9bdf 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -11,15 +11,19 @@
                 type="url"
                 v-model="url"
                 spellcheck="false"
-                @keyup.enter="getSchema()"
+                @keyup.enter="onPollSchemaClick()"
               />
             </li>
             <div>
               <li>
                 <label for="get" class="hide-on-small-screen">&nbsp;</label>
-                <button id="get" name="get" @click="getSchema">
-                  {{ $t("get_schema") }}
-                  <span><i class="material-icons">send</i></span>
+                <button id="get" name="get" @click="onPollSchemaClick">
+                  {{ !isPollingSchema ? $t("connect") : $t("disconnect") }}
+                  <span
+                    ><i class="material-icons">{{
+                      !isPollingSchema ? "sync" : "sync_disabled"
+                    }}</i></span
+                  >
                 </button>
               </li>
             </div>
@@ -356,6 +360,8 @@ export default {
       expandResponse: false,
       responseBodyMaxLines: 16,
       graphqlFieldsFilterText: undefined,
+      isPollingSchema: false,
+      timeoutSubscription: null,
 
       settings: {
         SCROLL_INTO_ENABLED:
@@ -455,6 +461,12 @@ export default {
       this.getDocsFromSchema(gqlSchema)
     }
   },
+  beforeRouteLeave(_to, _from, next) {
+    this.isPollingSchema = false
+    if (this.timeoutSubscription) clearTimeout(this.timeoutSubscription)
+
+    next()
+  },
   methods: {
     isGqlTypeHighlighted({ gqlType }) {
       if (!this.graphqlFieldsFilterText) return false
@@ -471,12 +483,12 @@ export default {
 
       if (!fields || fields.length === 0) return []
 
-      return fields.filter((field) => {
-        return this.isTextFoundInGraphqlFieldObject({
+      return fields.filter((field) =>
+        this.isTextFoundInGraphqlFieldObject({
           text: this.graphqlFieldsFilterText,
           graphqlFieldObject: field,
         })
-      })
+      )
     },
     isTextFoundInGraphqlFieldObject({ text, graphqlFieldObject }) {
       const normalizedText = text.toLowerCase()
@@ -491,9 +503,9 @@ export default {
     getFilteredGraphqlFields({ filterText, fields }) {
       if (!filterText) return fields
 
-      return fields.filter((field) => {
-        return this.isTextFoundInGraphqlFieldObject({ text: filterText, graphqlFieldObject: field })
-      })
+      return fields.filter((field) =>
+        this.isTextFoundInGraphqlFieldObject({ text: filterText, graphqlFieldObject: field })
+      )
     },
     getFilteredGraphqlTypes({ filterText, types }) {
       if (!filterText) return types
@@ -509,12 +521,11 @@ export default {
         }
 
         const isFilterTextMatchingAtLeastOneField = Object.values(type._fields || {}).some(
-          (field) => {
-            return this.isTextFoundInGraphqlFieldObject({
+          (field) =>
+            this.isTextFoundInGraphqlFieldObject({
               text: filterText,
               graphqlFieldObject: field,
             })
-          }
         )
 
         return isFilterTextMatchingAtLeastOneField
@@ -682,6 +693,79 @@ export default {
       }
       this.gqlTypes = types
     },
+    async onPollSchemaClick() {
+      if (this.isPollingSchema) {
+        this.isPollingSchema = false
+      } else {
+        this.isPollingSchema = true
+        await this.getSchema()
+
+        this.pollSchema()
+      }
+    },
+    async pollSchema() {
+      if (!this.isPollingSchema) return
+
+      this.$nuxt.$loading.start()
+
+      try {
+        const query = JSON.stringify({
+          query: gql.getIntrospectionQuery(),
+        })
+
+        let headers = {}
+        this.headers.forEach(({ key, value }) => {
+          headers[key] = value
+        })
+
+        const reqOptions = {
+          method: "post",
+          url: this.url,
+          headers: {
+            ...headers,
+            "content-type": "application/json",
+          },
+          data: query,
+        }
+
+        const data = await sendNetworkRequest(reqOptions, this.$store)
+
+        // HACK : Temporary trailing null character issue from the extension fix
+        const response = new TextDecoder("utf-8").decode(data.data).replace(/\0+$/, "")
+        const introspectResponse = JSON.parse(response)
+
+        const schema = gql.buildClientSchema(introspectResponse.data)
+
+        this.$store.commit("setGQLState", {
+          value: JSON.stringify(introspectResponse.data),
+          attribute: "schemaIntrospection",
+        })
+
+        this.schema = gql.printSchema(schema, {
+          commentDescriptions: true,
+        })
+
+        this.getDocsFromSchema(schema)
+
+        this.$refs.queryEditor.setValidationSchema(schema)
+        this.$nuxt.$loading.finish()
+      } catch (error) {
+        this.$nuxt.$loading.finish()
+
+        this.schema = `${error}. ${this.$t("check_console_details")}`
+        this.$toast.error(
+          `${this.$t("graphql_introspect_failed")} ${this.$t("check_graphql_valid")}`,
+          {
+            icon: "error",
+          }
+        )
+        console.log("Error", error)
+      }
+
+      this.$nuxt.$loading.finish()
+
+      if (this.isPollingSchema) this.timeoutSubscription = setTimeout(this.pollSchema, 7000)
+    },
     async getSchema() {
       const startTime = Date.now()
 
diff --git a/pages/index.vue b/pages/index.vue
index 3ed8e5c14..76eac606e 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1361,7 +1361,7 @@ export default {
             : true,
       },
       currentMethodIndex: 0,
-      codegens: codegens,
+      codegens,
       methodMenuItems: [
         "GET",
         "HEAD",
@@ -1416,7 +1416,7 @@ export default {
       this.setRouteQueryState()
     },
     params: {
-      handler: function (newValue) {
+      handler(newValue) {
         if (!this.paramsWatchEnabled) {
           this.paramsWatchEnabled = true
           return
@@ -1474,7 +1474,7 @@ export default {
         ? "application/json"
         : ""
     },
-    preRequestScript: function (val, oldVal) {
+    preRequestScript(val, oldVal) {
       this.uri = this.uri
     },
   },
@@ -1826,7 +1826,7 @@ export default {
         httpUser: this.httpUser,
         httpPassword: this.httpPassword,
         bearerToken: this.bearerToken,
-        headers: headers,
+        headers,
         rawInput: this.rawInput,
         rawParams: this.rawParams,
         rawRequestBody: this.rawRequestBody,
@@ -1860,7 +1860,7 @@ export default {
         if (env.name === "Globals" || env.name === "globals") {
           preRequestScriptString += this.useSelectedEnvironment({
             environment: env,
-            environments: environments,
+            environments,
           })
         }
       }
@@ -2390,6 +2390,7 @@ export default {
       switch (name) {
         case "bodyParams":
           this.bodyParams = []
+          this.files = []
           break
         case "rawParams":
           this.rawParams = "{}"
@@ -2518,7 +2519,6 @@ export default {
           icon: "attach_file",
         })
       }
-      this.$refs.attachment.value = ""
     },
     uploadPayload() {
       this.rawInput = true
diff --git a/pages/settings.vue b/pages/settings.vue
index d16007f59..c89104182 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -257,9 +257,9 @@ export default {
   watch: {
     proxySettings: {
       deep: true,
-      handler(value) {
-        this.applySetting("PROXY_URL", value.url)
-        this.applySetting("PROXY_KEY", value.key)
+      handler({ url, key }) {
+        this.applySetting("PROXY_URL", url)
+        this.applySetting("PROXY_KEY", key)
       },
     },
   },
diff --git a/store/postwoman.js b/store/postwoman.js
index 5f4817875..ced4a63a8 100644
--- a/store/postwoman.js
+++ b/store/postwoman.js
@@ -205,86 +205,70 @@ export const mutations = {
     collections[collectionIndex] = collection
   },
 
-  addNewFolder({ collections }, payload) {
-    const { collectionIndex, folder } = payload
-    collections[collectionIndex].folders.push({
-      name: "",
+  addFolder({ collections }, payload) {
+    const { name, folder } = payload
+
+    const newFolder = {
+      name: name,
       requests: [],
-      ...folder,
-    })
+      folders: [],
+    }
+    folder.folders.push(newFolder)
   },
 
   editFolder({ collections }, payload) {
-    const { collectionIndex, folder, folderIndex } = payload
-    Vue.set(collections[collectionIndex].folders, folderIndex, folder)
+    const { collectionIndex, folder, folderIndex, folderName } = payload
+    const collection = collections[collectionIndex]
+
+    let parentFolder = findFolder(folderName, collection, true)
+    if (parentFolder && parentFolder.folders) {
+      Vue.set(parentFolder.folders, folderIndex, folder)
+    }
   },
 
   removeFolder({ collections }, payload) {
-    const { collectionIndex, folderIndex } = payload
-    collections[collectionIndex].folders.splice(folderIndex, 1)
-  },
+    const { collectionIndex, folderIndex, folderName } = payload
+    const collection = collections[collectionIndex]
 
-  addRequest({ collections }, payload) {
-    const { request } = payload
-
-    // Request that is directly attached to collection
-    if (request.folder === -1) {
-      collections[request.collection].requests.push(request)
-      return
+    let parentFolder = findFolder(folderName, collection, true)
+    if (parentFolder && parentFolder.folders) {
+      parentFolder.folders.splice(folderIndex, 1)
     }
-
-    collections[request.collection].folders[request.folder].requests.push(request)
   },
 
   editRequest({ collections }, payload) {
     const {
-      requestOldCollectionIndex,
-      requestOldFolderIndex,
-      requestOldIndex,
+      requestCollectionIndex,
+      requestFolderName,
+      requestFolderIndex,
       requestNew,
-      requestNewCollectionIndex,
-      requestNewFolderIndex,
+      requestIndex,
     } = payload
 
-    const changedCollection = requestOldCollectionIndex !== requestNewCollectionIndex
-    const changedFolder = requestOldFolderIndex !== requestNewFolderIndex
-    const changedPlace = changedCollection || changedFolder
+    let collection = collections[requestCollectionIndex]
 
-    // set new request
-    if (requestNewFolderIndex !== undefined) {
-      Vue.set(
-        collections[requestNewCollectionIndex].folders[requestNewFolderIndex].requests,
-        requestOldIndex,
-        requestNew
-      )
-    } else {
-      Vue.set(collections[requestNewCollectionIndex].requests, requestOldIndex, requestNew)
+    if (requestFolderIndex === -1) {
+      Vue.set(collection.requests, requestIndex, requestNew)
+      return
     }
 
-    // remove old request
-    if (changedPlace) {
-      if (requestOldFolderIndex !== undefined) {
-        collections[requestOldCollectionIndex].folders[requestOldFolderIndex].requests.splice(
-          requestOldIndex,
-          1
-        )
-      } else {
-        collections[requestOldCollectionIndex].requests.splice(requestOldIndex, 1)
-      }
-    }
+    let folder = findFolder(requestFolderName, collection, false)
+    Vue.set(folder.requests, requestIndex, requestNew)
   },
 
   saveRequestAs({ collections }, payload) {
-    const { request, collectionIndex, folderIndex, requestIndex } = payload
+    const { request, collectionIndex, folderName, requestIndex } = payload
 
     const specifiedCollection = collectionIndex !== undefined
-    const specifiedFolder = folderIndex !== undefined
+    const specifiedFolder = folderName !== undefined
     const specifiedRequest = requestIndex !== undefined
 
     if (specifiedCollection && specifiedFolder && specifiedRequest) {
-      Vue.set(collections[collectionIndex].folders[folderIndex].requests, requestIndex, request)
+      const folder = findFolder(folderName, collections[collectionIndex])
+      Vue.set(folder.requests, requestIndex, request)
     } else if (specifiedCollection && specifiedFolder && !specifiedRequest) {
-      const requests = collections[collectionIndex].folders[folderIndex].requests
+      const folder = findFolder(folderName, collections[collectionIndex])
+      const requests = folder.requests
       const lastRequestIndex = requests.length - 1
       Vue.set(requests, lastRequestIndex + 1, request)
     } else if (specifiedCollection && !specifiedFolder && specifiedRequest) {
@@ -297,61 +281,53 @@ export const mutations = {
     }
   },
 
-  saveRequest({ collections }, payload) {
-    const { request } = payload
-
-    // Remove the old request from collection
-    if (
-      Object.prototype.hasOwnProperty.call(request, "oldCollection") &&
-      request.oldCollection > -1
-    ) {
-      const folder =
-        Object.prototype.hasOwnProperty.call(request, "oldFolder") && request.oldFolder >= -1
-          ? request.oldFolder
-          : request.folder
-      if (folder > -1) {
-        collections[request.oldCollection].folders[folder].requests.splice(request.requestIndex, 1)
-      } else {
-        collections[request.oldCollection].requests.splice(request.requestIndex, 1)
-      }
-    } else if (
-      Object.prototype.hasOwnProperty.call(request, "oldFolder") &&
-      request.oldFolder !== -1
-    ) {
-      collections[request.collection].folders[folder].requests.splice(request.requestIndex, 1)
-    }
-
-    delete request.oldCollection
-    delete request.oldFolder
-
-    // Request that is directly attached to collection
-    if (request.folder === -1) {
-      Vue.set(collections[request.collection].requests, request.requestIndex, request)
-      return
-    }
-
-    Vue.set(
-      collections[request.collection].folders[request.folder].requests,
-      request.requestIndex,
-      request
-    )
-  },
-
   removeRequest({ collections }, payload) {
-    const { collectionIndex, folderIndex, requestIndex } = payload
+    const { collectionIndex, folderName, requestIndex } = payload
+    let collection = collections[collectionIndex]
 
-    // Request that is directly attached to collection
-    if (folderIndex === -1) {
-      collections[collectionIndex].requests.splice(requestIndex, 1)
+    if (collection.name === folderName) {
+      collection.requests.splice(requestIndex, 1)
       return
     }
+    let folder = findFolder(folderName, collection, false)
 
-    collections[collectionIndex].folders[folderIndex].requests.splice(requestIndex, 1)
+    if (folder) {
+      folder.requests.splice(requestIndex, 1)
+    }
   },
 
   selectRequest(state, { request }) {
     state.selectedRequest = Object.assign({}, request)
   },
+
+  moveRequest({ collections }, payload) {
+    const {
+      oldCollectionIndex,
+      newCollectionIndex,
+      newFolderIndex,
+      newFolderName,
+      oldFolderName,
+      requestIndex,
+    } = payload
+
+    const isCollection = newFolderIndex === -1
+    const oldCollection = collections[oldCollectionIndex]
+    const newCollection = collections[newCollectionIndex]
+    const request = findRequest(oldFolderName, oldCollection, requestIndex)
+
+    if (isCollection) {
+      newCollection.requests.push(request)
+      return
+    }
+
+    if (!isCollection) {
+      const folder = findFolder(newFolderName, newCollection, false)
+      if (folder) {
+        folder.requests.push(request)
+        return
+      }
+    }
+  },
 }
 
 function testValue(myValue) {
@@ -362,3 +338,45 @@ function testValue(myValue) {
     return myValue
   }
 }
+
+function findRequest(folderName, currentFolder, requestIndex) {
+  let selectedFolder, result
+
+  if (folderName === currentFolder.name) {
+    let request = currentFolder.requests[requestIndex]
+    currentFolder.requests.splice(requestIndex, 1)
+    return request
+  } else {
+    for (let i = 0; i < currentFolder.folders.length; i += 1) {
+      selectedFolder = currentFolder.folders[i]
+
+      result = findRequest(folderName, selectedFolder, requestIndex)
+
+      if (result !== false) {
+        return result
+      }
+    }
+    return false
+  }
+}
+
+function findFolder(folderName, currentFolder, returnParent, parentFolder) {
+  let selectedFolder, result
+
+  if (folderName === currentFolder.name && returnParent) {
+    return parentFolder
+  } else if (folderName === currentFolder.name && !returnParent) {
+    return currentFolder
+  } else {
+    for (let i = 0; i < currentFolder.folders.length; i++) {
+      selectedFolder = currentFolder.folders[i]
+
+      result = findFolder(folderName, selectedFolder, returnParent, currentFolder)
+
+      if (result !== false) {
+        return result
+      }
+    }
+    return false
+  }
+}