diff --git a/components/ui/Chat/Embeds/File/File.html b/components/ui/Chat/Embeds/File/File.html
index 8b91f4d416..a6bcff932c 100644
--- a/components/ui/Chat/Embeds/File/File.html
+++ b/components/ui/Chat/Embeds/File/File.html
@@ -6,12 +6,7 @@
       <TypographySubtitle :size="6" :text="`${file.name}`" />
       <TypographyText :text="`${file.type} - ${getFileSize}`" />
     </div>
-    <a
-      :href="file.url"
-      target="_blank"
-      class="button is-primary"
-      data-cy="chat-file"
-    >
+    <a @click="download" class="button is-primary" data-cy="chat-file">
       <download-icon size="1x" class="download" />
     </a>
   </template>
diff --git a/components/ui/Chat/Embeds/File/File.vue b/components/ui/Chat/Embeds/File/File.vue
index b5ef373098..4e49e7b9ff 100644
--- a/components/ui/Chat/Embeds/File/File.vue
+++ b/components/ui/Chat/Embeds/File/File.vue
@@ -2,7 +2,7 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { DownloadIcon, FileIcon } from 'satellite-lucide-icons'
-import { FileMessage } from '~/types/textile/mailbox'
+import { FileMessagePayload } from './types'
 import { isMimeEmbeddableImage } from '~/utilities/FileType'
 
 export default Vue.extend({
@@ -12,7 +12,7 @@ export default Vue.extend({
   },
   props: {
     file: {
-      type: Object as PropType<FileMessage>,
+      type: Object as PropType<FileMessagePayload>,
       required: true,
     },
   },
@@ -24,6 +24,15 @@ export default Vue.extend({
       return isMimeEmbeddableImage(this.file.type)
     },
   },
+  methods: {
+    download() {
+      this.$TextileManager.sharedBucket?.pullFile(
+        this.file.id,
+        this.file.name,
+        this.file.size,
+      )
+    },
+  },
 })
 </script>
 <style lang="less" scoped src="./File.less"></style>
diff --git a/components/ui/Chat/Embeds/File/types.d.ts b/components/ui/Chat/Embeds/File/types.d.ts
index 8f936988e2..602cc7400c 100644
--- a/components/ui/Chat/Embeds/File/types.d.ts
+++ b/components/ui/Chat/Embeds/File/types.d.ts
@@ -1,6 +1,7 @@
-export type FileData = {
-  filename: String
-  size: Number
-  type: String
-  src: String
+export type FileMessagePayload = {
+  url: string
+  name: string
+  size: number
+  type: string
+  id: string
 }
diff --git a/components/ui/Chat/Image/Image.vue b/components/ui/Chat/Image/Image.vue
index 276ba74465..98c128e698 100644
--- a/components/ui/Chat/Image/Image.vue
+++ b/components/ui/Chat/Image/Image.vue
@@ -2,7 +2,8 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { ImageIcon, DownloadIcon } from 'satellite-lucide-icons'
-import { FileMessage } from '~/types/textile/mailbox'
+import { FileMessagePayload } from '../Embeds/File/types'
+// @ts-ignore
 import placeholderImage from '~/assets/svg/mascot/sad_curious.svg'
 
 export default Vue.extend({
@@ -20,7 +21,7 @@ export default Vue.extend({
       default: false,
     },
     image: {
-      type: Object as PropType<FileMessage>,
+      type: Object as PropType<FileMessagePayload>,
       required: true,
     },
   },
diff --git a/components/views/chat/message/Message.vue b/components/views/chat/message/Message.vue
index 8278264168..615f4d6f07 100644
--- a/components/views/chat/message/Message.vue
+++ b/components/views/chat/message/Message.vue
@@ -196,11 +196,11 @@ export default Vue.extend({
       this.$toast.show(this.$t('ui.copied') as string)
     },
     saveImage() {
-      const a = document.createElement('a')
-      a.setAttribute('type', 'hidden')
-      a.setAttribute('download', 'download')
-      a.href = URL.createObjectURL(this.blob)
-      a.click()
+      this.$TextileManager.sharedBucket?.pullFile(
+        this.message.payload.id,
+        this.message.payload.name,
+        this.message.payload.size,
+      )
     },
     /**
      * @method toPng
diff --git a/components/views/files/upload/Upload.vue b/components/views/files/upload/Upload.vue
index e101bb8288..c3ee10526a 100644
--- a/components/views/files/upload/Upload.vue
+++ b/components/views/files/upload/Upload.vue
@@ -3,7 +3,6 @@
 import { FilePlusIcon, PlusIcon } from 'satellite-lucide-icons'
 import Vue, { PropType } from 'vue'
 import { mapState } from 'vuex'
-import { Config } from '~/config'
 import { PropCommonEnum } from '~/libraries/Enums/enums'
 import { isHeic } from '~/utilities/FileType'
 import { UploadDropItemType } from '~/types/files/file'
@@ -124,18 +123,16 @@ export default Vue.extend({
           }),
         )
         for (const uploadFile of filesToUpload) {
-          if (uploadFile.file.size <= Config.nsfwPictureLimit) {
-            uploadFile.nsfw.checking = true
-            try {
-              uploadFile.nsfw.status = await this.$Security.isNSFW(
-                uploadFile.file,
-              )
-            } catch (err) {
-              uploadFile.nsfw.status = true
-              uploadFile.nsfw.checking = false
-            }
+          uploadFile.nsfw.checking = true
+          try {
+            uploadFile.nsfw.status = await this.$Security.isNSFW(
+              uploadFile.file,
+            )
+          } catch (err) {
+            uploadFile.nsfw.status = true
             uploadFile.nsfw.checking = false
           }
+          uploadFile.nsfw.checking = false
           this.loadPicture(uploadFile, () =>
             this.$store.commit('chat/addFile', {
               file: uploadFile,
diff --git a/components/views/files/view/View.vue b/components/views/files/view/View.vue
index 29a4df132d..c45427bbb1 100644
--- a/components/views/files/view/View.vue
+++ b/components/views/files/view/View.vue
@@ -57,7 +57,7 @@ export default Vue.extend({
           .slice(((this.file.name.lastIndexOf('.') - 1) >>> 0) + 2)
           .toLowerCase()
 
-        await this.$TextileManager.bucket?.pullFileStream(
+        await this.$TextileManager.personalBucket?.pullFile(
           this.file.id,
           this.file.extension === fileExt
             ? this.file.name
diff --git a/config.ts b/config.ts
index ce2d40739c..b4f4e06ecc 100644
--- a/config.ts
+++ b/config.ts
@@ -13,8 +13,9 @@ export const Config = {
       'https://webapi.hub.edge.satellite.one',
     groupChatThreadID:
       'bafkv7ordeargenxdutqdltvlo6sbfcfdhuvmocrt4qe6kpohrdbrbdi',
-    fsTable: 'sat.json',
-    bucketName: 'personal-files',
+    bucketIndex: 'sat.json',
+    personalBucket: 'personal-files',
+    sharedBucket: 'shared-files',
   },
   ipfs: {
     gateway: 'https://satellite.mypinata.cloud/ipfs/',
diff --git a/libraries/Files/FilSystem.ts b/libraries/Files/FilSystem.ts
index 13acd1c6d2..9ee70adcaa 100644
--- a/libraries/Files/FilSystem.ts
+++ b/libraries/Files/FilSystem.ts
@@ -5,7 +5,7 @@ import { DIRECTORY_TYPE } from './types/directory'
 import { Fil } from './Fil'
 import { Item } from './abstracts/Item.abstract'
 import {
-  FileSystemExport,
+  PersonalBucketIndex,
   ExportItem,
   FILESYSTEM_TYPE,
   ExportFile,
@@ -95,9 +95,9 @@ export class FilSystem {
 
   /**
    * @getter export
-   * @returns {FileSystemExport} returns exported filesystem object
+   * @returns {PersonalBucketIndex} returns exported filesystem object
    */
-  get export(): FileSystemExport {
+  get export(): PersonalBucketIndex {
     return {
       type: FILESYSTEM_TYPE.DEFAULT,
       version: ++this._version,
@@ -242,10 +242,10 @@ export class FilSystem {
 
   /**
    * @method import
-   * @param {FileSystemExport} fs
+   * @param {PersonalBucketIndex} fs
    * @description sets global file system based on parameter. will be fetched from Bucket
    */
-  public async import(fs: FileSystemExport) {
+  public async import(fs: PersonalBucketIndex) {
     for (const item of fs.content) {
       await this.importChildren(item)
     }
diff --git a/libraries/Files/TextileFileSystem.ts b/libraries/Files/TextileFileSystem.ts
index ca998ca0e9..0294694cc5 100644
--- a/libraries/Files/TextileFileSystem.ts
+++ b/libraries/Files/TextileFileSystem.ts
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import skaler from 'skaler'
 import { FilSystem } from './FilSystem'
 import { FILE_TYPE } from './types/file'
-import { Bucket } from './remote/textile/Bucket'
+import { PersonalBucket } from './remote/textile/PersonalBucket'
 import { Config } from '~/config'
 import { EnvInfo } from '~/utilities/EnvInfo'
 import { mimeType, isHeic, isMimeEmbeddableImage } from '~/utilities/FileType'
@@ -13,10 +13,10 @@ const convert = require('heic-convert')
 export class TextileFileSystem extends FilSystem {
   /**
    * @getter bucket
-   * @returns {Bucket} bucket global to upload files to textile
+   * @returns {PersonalBucket} bucket global to upload files to textile
    */
-  get bucket(): Bucket {
-    return Vue.prototype.$TextileManager.bucket
+  get bucket(): PersonalBucket {
+    return Vue.prototype.$TextileManager.personalBucket
   }
 
   /**
diff --git a/libraries/Files/errors/Errors.ts b/libraries/Files/errors/Errors.ts
index 242146edda..d683b7f71d 100644
--- a/libraries/Files/errors/Errors.ts
+++ b/libraries/Files/errors/Errors.ts
@@ -4,8 +4,6 @@ export enum TextileErrors {
 
 export enum FileSystemErrors {
   // internal
-  METHOD_MISSING = 'Method not implemented.',
-  RFM_ABSTRACT_ONLY = 'RFM class is Abstract. It can only be extended',
   ITEM_ABSTRACT_ONLY = 'Item class is Abstract. It can only be extended',
   // user facing - Item
   NO_EMPTY_STRING = 'pages.files.errors.no_empty',
diff --git a/libraries/Files/interface/RFM.interface.ts b/libraries/Files/interface/RFM.interface.ts
new file mode 100644
index 0000000000..8faaf1daa6
--- /dev/null
+++ b/libraries/Files/interface/RFM.interface.ts
@@ -0,0 +1,19 @@
+// Remote file management
+import {
+  PersonalBucketIndex,
+  SharedBucketIndex,
+} from '~/libraries/Files/types/filesystem'
+
+export interface RFM {
+  get index(): PersonalBucketIndex | SharedBucketIndex | undefined
+
+  getBucket({ name, encrypted }: { name: string; encrypted?: boolean }): void
+
+  pushFile(file: File, path: string, progressCallback: Function): void
+
+  pullFile(id: string, name: string, size: number): void
+
+  removeFile(name: string): void
+
+  updateIndex(index: PersonalBucketIndex | SharedBucketIndex): void
+}
diff --git a/libraries/Files/remote/textile/Bucket.ts b/libraries/Files/remote/abstracts/Bucket.abstract.ts
similarity index 56%
rename from libraries/Files/remote/textile/Bucket.ts
rename to libraries/Files/remote/abstracts/Bucket.abstract.ts
index c83a45ff2a..66fec4fba8 100644
--- a/libraries/Files/remote/textile/Bucket.ts
+++ b/libraries/Files/remote/abstracts/Bucket.abstract.ts
@@ -1,44 +1,34 @@
-import { Buckets, Root } from '@textile/buckets'
+import { Buckets, PushPathResult, Root } from '@textile/buckets'
 import { createWriteStream } from 'streamsaver'
 import { Config } from '~/config'
 import {
-  FileSystemExport,
-  FILESYSTEM_TYPE,
+  PersonalBucketIndex,
+  SharedBucketIndex,
 } from '~/libraries/Files/types/filesystem'
 import { TextileInitializationData } from '~/types/textile/manager'
-import { RFM } from '~/libraries/Files/remote/abstracts/RFM.abstract'
-import { RFMInterface } from '~/libraries/Files/remote/interface/RFM.interface'
+import { RFM } from '~/libraries/Files/interface/RFM.interface'
 import { TextileError } from '~/store/textile/types'
 
-export class Bucket extends RFM implements RFMInterface {
-  private _textile: TextileInitializationData
-  private _index: FileSystemExport | null = null
-  private _buckets: Buckets | null
-  private _key: Root['key'] | null
-  private _root: Root | Root['path'] = ''
+export abstract class Bucket implements RFM {
+  protected _textile?: TextileInitializationData
+  protected _buckets?: Buckets
+  protected _key?: Root['key']
+  protected _root?: Root | Root['path']
 
   constructor(textile: TextileInitializationData) {
-    super()
     this._textile = textile
-    this._buckets = null
-    this._key = null
   }
 
-  /**
-   * @getter
-   * @returns file system export data
-   */
-  get index(): FileSystemExport | null {
-    return this._index
-  }
+  abstract get index(): PersonalBucketIndex | SharedBucketIndex | undefined
+  abstract updateIndex(index: PersonalBucketIndex | SharedBucketIndex): void
 
   /**
-   * @method init
+   * @method getBucket
    * @description Initializes bucket
-   * @param name bucket name
+   * @param param0 bucket name and encrypted status
    * @returns a promise that resolves when the initialization completes
    */
-  async init(name: string): Promise<FileSystemExport> {
+  async getBucket({ name, encrypted }: { name: string; encrypted?: boolean }) {
     if (!Config.textile.key) {
       throw new Error('Textile key not found')
     }
@@ -47,69 +37,17 @@ export class Bucket extends RFM implements RFMInterface {
       { key: Config.textile.key },
       { host: Config.textile.apiUrl },
     )
+    if (!this._textile?.identity) {
+      throw new Error('textile not initialized')
+    }
     await this._buckets.getToken(this._textile.identity)
 
-    const result = await this._buckets.getOrCreate(name, { encrypted: true })
+    const result = await this._buckets.getOrCreate(name, { encrypted })
 
     if (!result.root) throw new Error(`failed to open bucket ${name}`)
 
     this._key = result.root.key
     this._root = result.root
-
-    try {
-      const data = []
-      for await (const bytes of this._buckets.pullPath(
-        this._key,
-        Config.textile.fsTable,
-      )) {
-        data.push(bytes)
-      }
-      this._index = JSON.parse(
-        await new Blob(data, {
-          type: 'application/json',
-        }).text(),
-      )
-
-      if (!this._index) throw new Error('Index not found')
-
-      return this._index
-    } catch (e) {
-      return {
-        type: FILESYSTEM_TYPE.DEFAULT,
-        version: 1,
-        content: [],
-      }
-    }
-  }
-
-  /**
-   * @method updateIndex
-   * @param index FileSystemExport
-   * @description sets file system import data
-   */
-  async updateIndex(index: FileSystemExport) {
-    if (!this._buckets || !this._key) {
-      throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
-    }
-    this._index = index
-    const res = await this._buckets.pushPath(
-      this._key,
-      Config.textile.fsTable,
-      Buffer.from(JSON.stringify(index)),
-      { root: this._root },
-    )
-    this._root = res.root
-  }
-
-  /**
-   * @method ipnsLink
-   * @returns {Promise<string>} ipns bucket link
-   */
-  async ipnsLink(): Promise<string> {
-    if (!this._buckets || !this._key) {
-      throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
-    }
-    return (await this._buckets.links(this._key)).ipns
   }
 
   /**
@@ -119,8 +57,13 @@ export class Bucket extends RFM implements RFMInterface {
    * @param {File} file file to be uploaded
    * @param {string} path uuid to maintain unique bucket paths
    * @param {Function} progressCallback used to show progress meter in componment that calls this method
+   * @returns {string} path to file, used moreso for shared buckets
    */
-  async pushFile(file: File, path: string, progressCallback: Function) {
+  async pushFile(
+    file: File,
+    path: string,
+    progressCallback: Function,
+  ): Promise<PushPathResult> {
     if (!this._buckets || !this._key) {
       throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
     }
@@ -140,6 +83,7 @@ export class Bucket extends RFM implements RFMInterface {
       },
     )
     this._root = res.root
+    return res
   }
 
   private _getStream(file: File) {
@@ -166,13 +110,13 @@ export class Bucket extends RFM implements RFMInterface {
   }
 
   /**
-   * @method pullFileStream
+   * @method pullFile
    * @description fetch encrypted file from bucket
    * @param {string} id file path in bucket
    * @param {string} name file name
    * @param {number} size file size to show progress in browser
    */
-  async pullFileStream(id: string, name: string, size: number) {
+  async pullFile(id: string, name: string, size: number) {
     if (!this._buckets || !this._key) {
       throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
     }
@@ -190,13 +134,13 @@ export class Bucket extends RFM implements RFMInterface {
   /**
    * @method removeFile
    * @description Remove file from bucket
-   * @param {string} name file name
+   * @param {string} id file path in bucket
    */
-  async removeFile(name: string) {
+  async removeFile(id: string) {
     if (!this._buckets || !this._key) {
       throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
     }
-    const res = await this._buckets.removePath(this._key, name, {
+    const res = await this._buckets.removePath(this._key, id, {
       root: this._root,
     })
     if (res.root) {
diff --git a/libraries/Files/remote/abstracts/RFM.abstract.ts b/libraries/Files/remote/abstracts/RFM.abstract.ts
deleted file mode 100644
index 507483823e..0000000000
--- a/libraries/Files/remote/abstracts/RFM.abstract.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Remote file management
-import { FileSystemErrors } from '../../errors/Errors'
-import { Fil } from '../../Fil'
-import { RFMInterface } from '../interface/RFM.interface'
-import { FileSystemExport } from '~/libraries/Files/types/filesystem'
-
-export abstract class RFM implements RFMInterface {
-  constructor() {
-    if (this.constructor.name === 'RFM')
-      throw new Error(FileSystemErrors.RFM_ABSTRACT_ONLY)
-  }
-
-  updateIndex(index: FileSystemExport): void {
-    throw new Error(FileSystemErrors.METHOD_MISSING)
-  }
-
-  get index(): FileSystemExport | null {
-    throw new Error(FileSystemErrors.METHOD_MISSING)
-  }
-
-  delete(file: Fil): boolean {
-    throw new Error(FileSystemErrors.METHOD_MISSING)
-  }
-
-  upload(file: File, name: string, meta: any): string {
-    throw new Error(FileSystemErrors.METHOD_MISSING)
-  }
-}
diff --git a/libraries/Files/remote/interface/RFM.interface.ts b/libraries/Files/remote/interface/RFM.interface.ts
deleted file mode 100644
index 4968a0945a..0000000000
--- a/libraries/Files/remote/interface/RFM.interface.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Fil } from '../../Fil'
-import { FileSystemExport } from '~/libraries/Files/types/filesystem'
-
-export interface RFMInterface {
-  updateIndex(index: FileSystemExport): void
-  get index(): FileSystemExport | null
-  upload(file: File, name: string, meta: any): string
-  delete(file: Fil): boolean
-}
diff --git a/libraries/Files/remote/textile/PersonalBucket.ts b/libraries/Files/remote/textile/PersonalBucket.ts
new file mode 100644
index 0000000000..a08d6798b6
--- /dev/null
+++ b/libraries/Files/remote/textile/PersonalBucket.ts
@@ -0,0 +1,75 @@
+import Vue from 'vue'
+import { Bucket } from '~/libraries/Files/remote/abstracts/Bucket.abstract'
+import { Config } from '~/config'
+import {
+  FILESYSTEM_TYPE,
+  PersonalBucketIndex,
+} from '~/libraries/Files/types/filesystem'
+import { FilSystem } from '~/libraries/Files/FilSystem'
+import { TextileError } from '~/store/textile/types'
+
+export class PersonalBucket extends Bucket {
+  private _index: PersonalBucketIndex = {
+    type: FILESYSTEM_TYPE.DEFAULT,
+    version: 1,
+    content: [],
+  }
+
+  /**
+   * @getter
+   * @returns file system export data
+   */
+  get index(): PersonalBucketIndex {
+    return this._index
+  }
+
+  /**
+   * @method init
+   * @description Initializes bucket
+   * @param name bucket name
+   */
+  async init({ name, encrypted }: { name: string; encrypted: boolean }) {
+    await this.getBucket({ name, encrypted })
+    if (!this._buckets || !this._key) {
+      throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
+    }
+    try {
+      const data = []
+      for await (const bytes of this._buckets.pullPath(
+        this._key,
+        Config.textile.bucketIndex,
+      )) {
+        data.push(bytes)
+      }
+      this._index = JSON.parse(
+        await new Blob(data, {
+          type: 'application/json',
+        }).text(),
+      )
+      const $FileSystem: FilSystem = Vue.prototype.$FileSystem
+      await $FileSystem.import(this._index)
+      Vue.prototype.$Logger.log('File System', 'Initialized')
+    } catch (e) {
+      Vue.prototype.$Logger.log('File System', 'index not found')
+    }
+  }
+
+  /**
+   * @method updateIndex
+   * @param index PersonalBucketIndex
+   * @description sets file system import data
+   */
+  async updateIndex(index: PersonalBucketIndex) {
+    if (!this._buckets || !this._key) {
+      throw new Error('Bucket or bucket key not found')
+    }
+    this._index = index
+    const res = await this._buckets.pushPath(
+      this._key,
+      Config.textile.bucketIndex,
+      Buffer.from(JSON.stringify(index)),
+      { root: this._root },
+    )
+    this._root = res.root
+  }
+}
diff --git a/libraries/Files/remote/textile/SharedBucket.ts b/libraries/Files/remote/textile/SharedBucket.ts
new file mode 100644
index 0000000000..1b96ef221c
--- /dev/null
+++ b/libraries/Files/remote/textile/SharedBucket.ts
@@ -0,0 +1,69 @@
+import Vue from 'vue'
+import { Bucket } from '~/libraries/Files/remote/abstracts/Bucket.abstract'
+import { Config } from '~/config'
+import { SharedBucketIndex } from '~/libraries/Files/types/filesystem'
+import { TextileError } from '~/store/textile/types'
+
+export class SharedBucket extends Bucket {
+  private _index: SharedBucketIndex = {
+    version: 1,
+    content: [],
+  }
+
+  /**
+   * @getter
+   * @returns file system export data
+   */
+  get index(): SharedBucketIndex {
+    return this._index
+  }
+
+  /**
+   * @method init
+   * @description Initializes bucket
+   * @param name bucket name
+   */
+  async init({ name }: { name: string }) {
+    await this.getBucket({ name })
+    if (!this._buckets || !this._key) {
+      throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
+    }
+    Vue.prototype.$Logger.log('Shared Bucket', 'Initialized')
+    // todo - add index tracking capabilities to shared bucket
+    // try {
+    //   const data = []
+    //   for await (const bytes of this._buckets.pullPath(
+    //     this._key,
+    //     Config.textile.bucketIndex,
+    //   )) {
+    //     data.push(bytes)
+    //   }
+    //   this._index = JSON.parse(
+    //     await new Blob(data, {
+    //       type: 'application/json',
+    //     }).text(),
+    //   )
+    // } catch (e) {
+    //   console.log(e)
+    // }
+  }
+
+  /**
+   * @method updateIndex
+   * @param index SharedBucketIndex
+   * @description sets index data and root
+   */
+  async updateIndex(index: SharedBucketIndex) {
+    if (!this._buckets || !this._key) {
+      throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
+    }
+    this._index = index
+    const res = await this._buckets.pushPath(
+      this._key,
+      Config.textile.bucketIndex,
+      Buffer.from(JSON.stringify(index)),
+      { root: this._root },
+    )
+    this._root = res.root
+  }
+}
diff --git a/libraries/Files/test/Bucket.test.ts b/libraries/Files/test/Bucket.test.ts
index 7bf62740d5..59315ac342 100644
--- a/libraries/Files/test/Bucket.test.ts
+++ b/libraries/Files/test/Bucket.test.ts
@@ -1,8 +1,8 @@
 import { Fil } from '../Fil'
 import { FilSystem } from '../FilSystem'
-import { Bucket } from '../remote/textile/Bucket'
+import { PersonalBucket } from '../remote/textile/PersonalBucket'
 import { DIRECTORY_TYPE } from '../types/directory'
-import { FileSystemExport } from '../types/filesystem'
+import { FILESYSTEM_TYPE, PersonalBucketIndex } from '../types/filesystem'
 
 const mockFileData = {
   name: 'TestFile.png',
@@ -30,7 +30,7 @@ describe('Test FileSystem Directory', () => {
     fs.openDirectory('dir')
     fs.addChild(file2)
 
-    const ex: FileSystemExport = fs.export
+    const ex: PersonalBucketIndex = fs.export
 
     expect(ex.version + 1).toEqual(fs.export.version)
   })
@@ -41,9 +41,13 @@ describe('Test FileSystem Directory', () => {
       users: 'Users',
       wallet: 'SolanaWallet',
     }
-    const bucket = new Bucket(initializationData)
+    const bucket = new PersonalBucket(initializationData)
 
-    expect(bucket.index).toBeNull()
+    expect(bucket.index).toStrictEqual({
+      type: FILESYSTEM_TYPE.DEFAULT,
+      version: 1,
+      content: [],
+    })
   })
   it.skip('initialize bucket', async () => {
     const initializationData = {
@@ -54,7 +58,7 @@ describe('Test FileSystem Directory', () => {
       users: 'Users',
       wallet: 'SolanaWallet',
     }
-    const bucket = new Bucket(initializationData)
+    const bucket = new PersonalBucket(initializationData)
     try {
       await bucket.init('init')
     } catch (error) {
diff --git a/libraries/Files/test/TextileFileSystem.test.ts b/libraries/Files/test/TextileFileSystem.test.ts
index cc894b254d..ae5ba2be4c 100644
--- a/libraries/Files/test/TextileFileSystem.test.ts
+++ b/libraries/Files/test/TextileFileSystem.test.ts
@@ -10,9 +10,9 @@ Vue.prototype.$TextileManager = new TextileManager()
 describe('', () => {
   Vue.prototype.$TextileManager = new TextileManager()
   const TMConstructor = Vue.prototype.$TextileManager
-  TMConstructor.bucket = jest.fn()
-  TMConstructor.bucket.removeFile = jest.fn()
-  TMConstructor.bucket.pushFile = jest.fn()
+  TMConstructor.personalBucket = jest.fn()
+  TMConstructor.personalBucket.removeFile = jest.fn()
+  TMConstructor.personalBucket.pushFile = jest.fn()
   const TextileFileSystemConstructor = new TextileFileSystem()
   const inst = TextileFileSystemConstructor
   const state = inst.bucket
@@ -24,7 +24,7 @@ describe('', () => {
 
   test('TextileFileSystem.removeFile', async () => {
     await inst.removeFile('TestFile.png')
-    expect(TMConstructor.bucket.removeFile).toHaveBeenCalled()
+    expect(TMConstructor.personalBucket.removeFile).toHaveBeenCalled()
   })
 
   test('TextileFileSystem.uploadFile', async () => {
@@ -41,7 +41,7 @@ describe('', () => {
     }
 
     await inst.uploadFile(testFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.personalBucket.pushFile).toHaveBeenCalled()
   })
 
   // This test is skipped due to it exceeding the timeout (5000 ms).
@@ -59,7 +59,7 @@ describe('', () => {
     }
 
     await inst.uploadFile(testBlobFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.personalBucket.pushFile).toHaveBeenCalled()
   })
 
   test.skip('TextileFileSystem.uploadFile for png file', async () => {
@@ -75,6 +75,6 @@ describe('', () => {
     }
 
     await inst.uploadFile(testBlobFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.personalBucket.pushFile).toHaveBeenCalled()
   })
 })
diff --git a/libraries/Files/types/filesystem.ts b/libraries/Files/types/filesystem.ts
index 62f2dea48b..ae078b65ca 100644
--- a/libraries/Files/types/filesystem.ts
+++ b/libraries/Files/types/filesystem.ts
@@ -28,8 +28,21 @@ export interface ExportDirectory extends ExportSharedProps {
 
 export type ExportItem = ExportFile | ExportDirectory
 
-export type FileSystemExport = {
+export type PersonalBucketIndex = {
   type: FILESYSTEM_TYPE
   version: number
   content: Array<ExportItem>
 }
+
+export interface SharedBucketIndexItem {
+  id: string
+  name: string
+  url: string
+  size: number
+  nsfw: boolean
+}
+
+export type SharedBucketIndex = {
+  version: number
+  content: SharedBucketIndexItem[]
+}
diff --git a/libraries/Textile/BucketManager.test.ts b/libraries/Textile/BucketManager.test.ts
deleted file mode 100644
index 9272cd100a..0000000000
--- a/libraries/Textile/BucketManager.test.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-import * as web3 from '@solana/web3.js'
-import * as index from '@textile/grpc-authentication/dist/cjs/index'
-import * as hub from '@textile/hub'
-import * as BucketManager from '~/libraries/Textile/BucketManager'
-const BucketManagerDefault = BucketManager.default
-
-describe('BucketManager.default.progressParse', () => {
-  let inst48: any
-  let inst47: any
-  let inst46: any
-  let inst49: any
-  let inst43: any
-  let inst42: any
-  let inst41: any
-  let inst44: any
-  let inst45: any
-  let inst23: any
-  let inst22: any
-  let inst21: any
-  let inst24: any
-  let inst25: any
-  let inst18: any
-  let inst17: any
-  let inst16: any
-  let inst19: any
-  let inst20: any
-  let inst13: any
-  let inst12: any
-  let inst11: any
-  let inst14: any
-  let inst15: any
-  let inst8: any
-  let inst7: any
-  let inst: any
-  let inst9: any
-  let inst10: any
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-  let inst6: any
-  let DefaultBucketManager: any
-
-  beforeEach(() => {
-    inst48 = new hub.Client(undefined, true)
-    inst47 = new Uint8Array([])
-    inst46 = new Uint8Array([])
-    inst49 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst43 = new hub.Client(undefined, true)
-    inst42 = new Uint8Array([])
-    inst41 = new Uint8Array([])
-    inst44 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst45 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst41,
-          public: { verify: () => true, bytes: inst42 },
-        },
-        client: inst43,
-        users: hub.Users.withUserAuth(
-          { key: '', sig: '', msg: '', token: undefined },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '',
-        },
-      },
-      { sign: () => inst44, public: null },
-      '',
-    )
-    DefaultBucketManager = BucketManager.default
-    DefaultBucketManager = BucketManager.default
-    DefaultBucketManager = BucketManager.default
-    inst23 = new hub.Client(undefined, true)
-    inst22 = new Uint8Array([])
-    inst21 = new Uint8Array([])
-    inst24 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst25 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst21,
-          public: { verify: () => false, bytes: inst22 },
-        },
-        client: inst23,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'elio@example.com',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Error in retrieving email.',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'NoWiFi4you',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst24, public: null },
-      'Janet Homenick',
-    )
-    inst18 = new hub.Client(undefined, true)
-    inst17 = new Uint8Array([])
-    inst16 = new Uint8Array([])
-    inst19 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst20 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst16,
-          public: { verify: () => true, bytes: inst17 },
-        },
-        client: inst18,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Error getting key from: %s',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'YouarenotAllowed2Use',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst19, public: null },
-      'Becky Bednar',
-    )
-    inst13 = new hub.Client(undefined, true)
-    inst12 = new Uint8Array([])
-    inst11 = new Uint8Array([])
-    inst14 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst15 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst11,
-          public: { verify: () => false, bytes: inst12 },
-        },
-        client: inst13,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'does not exist',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '!Lov3MyPianoPony',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst14, public: null },
-      'Ronald Keeling',
-    )
-    inst8 = new hub.Client(undefined, true)
-    inst7 = new Uint8Array([])
-    inst = new Uint8Array([])
-    inst9 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst10 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst,
-          public: { verify: () => true, bytes: inst7 },
-        },
-        client: inst8,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Elio',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Could not find an existing submission in location.  rubric is original.',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'accessdenied4u',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '0.0.0.0',
-        },
-      },
-      { sign: () => inst9, public: null },
-      'Janet Homenick',
-    )
-    inst4 = new hub.Client(undefined, true)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    inst5 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst6 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => true, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'invalid option',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '!Lov3MyPianoPony',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst5, public: null },
-      'Becky Bednar',
-    )
-  })
-
-  test('0', () => {
-    const result: any = inst6.progressParse(10, 0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('1', () => {
-    const result: any = inst10.progressParse(2, 300)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('2', () => {
-    const result: any = inst15.progressParse(16, 10000)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('3', () => {
-    const result: any = inst20.progressParse(1, 0.0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('4', () => {
-    const result: any = inst25.progressParse(256, 0.0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('5', () => {
-    const result: any = inst45.progressParse(NaN, NaN)
-    expect(result).toMatchSnapshot()
-  })
-})
-
-describe('BucketManager.default.getBucket', () => {
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-
-  beforeEach(() => {
-    inst4 = new hub.Client(undefined, undefined)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    const DefaultBucketManager = BucketManager.default
-    inst5 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => true, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.withUserAuth(
-          () => ({ key: '', sig: '', msg: '', token: '' }),
-          undefined,
-        ),
-        wallet: {
-          mnemonic: undefined,
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '',
-        },
-      },
-      null,
-      '',
-    )
-  })
-
-  test('0', async () => {
-    await inst5.getBucket()
-  })
-})
-
-describe('BucketManager.default.getLinks', () => {
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-
-  beforeEach(() => {
-    inst4 = new hub.Client(undefined, false)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    const DefaultBucketManager = BucketManager.default
-    inst5 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => false, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.copyAuth(
-          index.GrpcAuthentication.withUserAuth(
-            { key: '', sig: '', msg: '', token: '' },
-            undefined,
-          ),
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '',
-          keypair: web3.Keypair.generate(),
-          path: '',
-          address: '',
-        },
-      },
-      null,
-      '',
-    )
-  })
-
-  test('0', async () => {
-    await inst5.getLinks()
-  })
-
-  describe('BucketManager.default.fetchIndex', () => {
-    let inst4: any
-    let inst3: any
-    let inst2: any
-    let inst5: any
-
-    beforeEach(() => {
-      inst4 = new hub.Client(undefined, true)
-      inst3 = new Uint8Array([])
-      inst2 = new Uint8Array([])
-      inst5 = new BucketManagerDefault(
-        {
-          identity: {
-            sign: () => inst2,
-            public: { verify: () => false, bytes: inst3 },
-          },
-          client: inst4,
-          users: hub.Users.copyAuth(
-            index.GrpcAuthentication.withUserAuth(
-              () => ({ key: '', sig: '', msg: '', token: '' }),
-              undefined,
-            ),
-            undefined,
-          ),
-          wallet: {
-            mnemonic: undefined,
-            keypair: web3.Keypair.generate(),
-            path: undefined,
-            address: '',
-          },
-        },
-        undefined,
-        '',
-      )
-    })
-
-    test('0', async () => {
-      await inst5.fetchIndex()
-    })
-  })
-})
diff --git a/libraries/Textile/BucketManager.ts b/libraries/Textile/BucketManager.ts
deleted file mode 100644
index 3376a7f88b..0000000000
--- a/libraries/Textile/BucketManager.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { Buckets, Links, PushPathResult, Root } from '@textile/buckets'
-import { Identity } from '@textile/crypto'
-import { Config } from '~/config'
-import { TextileInitializationData } from '~/types/textile/manager'
-
-/* TODO: Buckets are not yet secure - AP-402
- encrypt storage and allow the recipent to decrypt with
- their priv key. */
-export default class BucketManager {
-  buckets: Buckets | null
-  bucketKey: Root['key'] | null
-  textile: TextileInitializationData
-  identity: Identity
-  bucketName: string
-  prefix: string
-
-  constructor(
-    textile: TextileInitializationData,
-    identity: Identity,
-    prefix: string,
-  ) {
-    this.identity = identity
-    this.textile = textile
-    this.buckets = null
-    this.bucketKey = null
-    this.bucketName = 'v74files'
-    this.prefix = prefix
-  }
-
-  /**
-   * @method progressParse
-   * @description handles progress math from file size
-   * @param uploaded how much of file has been uploaded
-   * @param2 total actual size of file
-   * @example progressParse(returnedNumber, file.size)
-   */
-  private progressParse(uploaded: number, total: number) {
-    return (uploaded / total) * 100
-  }
-
-  async init() {
-    if (!Config.textile.key) {
-      throw new Error('Textile key not found')
-    }
-    this.buckets = await Buckets.withKeyInfo(
-      { key: Config.textile.key },
-      { host: Config.textile.apiUrl },
-    )
-    await this.buckets.getToken(this.identity)
-    const result = await this.buckets.getOrCreate(
-      `hub.textile.io/ipfs/${this.identity}/${this.prefix}`,
-    )
-    if (!result.root) throw new Error('failed to open buckets')
-    this.bucketKey = result.root.key
-    await this.ensureIndex()
-  }
-
-  async removeFromIndex(file: File) {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    let array: any[] = []
-    if (bytesStream) {
-      const next = await bytesStream.next()
-      const value = next.value
-      const oldIndex = JSON.parse(Buffer.from(value).toString())
-      array = [...oldIndex.paths]
-    }
-
-    const filtered = array.filter((item) => {
-      // @ts-ignore
-      return item.file.name !== file.file.name
-    })
-
-    const index = {
-      date: new Date().getTime(),
-      meta: {},
-      paths: filtered,
-    }
-    // Store the index in the Bucket (or in the Thread later)
-    const buf = Buffer.from(JSON.stringify(index, null, 2))
-    await this.buckets.pushPath(this.bucketKey, path, buf)
-  }
-
-  async addToIndex(file: File, root: string | undefined, remotePath: string) {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    let array: any[] = []
-    if (bytesStream) {
-      const next = await bytesStream.next()
-      const value = next.value
-      const oldIndex = JSON.parse(Buffer.from(value).toString())
-      array = [...oldIndex.paths]
-    }
-    const index = {
-      date: new Date().getTime(),
-      meta: {},
-      paths: [
-        ...array,
-        {
-          at: Date.now(),
-          file: {
-            name: file.name,
-            size: file.size,
-            type: file.type,
-            author: this.prefix,
-          },
-          path: remotePath,
-          remote: encodeURI(`${Config.textile.browser}${root}${remotePath}`),
-        },
-      ],
-    }
-    // Store the index in the Bucket (or in the Thread later)
-    const buf = Buffer.from(JSON.stringify(index, null, 1))
-    await this.buckets.pushPath(this.bucketKey, path, buf)
-  }
-
-  async ensureIndex(): Promise<boolean> {
-    const path = `${this.prefix}/index.json`
-    return new Promise((resolve) => {
-      if (!this.buckets || !this.bucketKey) return null
-      this.buckets
-        .listPath(this.bucketKey, path)
-        .then(() => {
-          resolve(true)
-        })
-        .catch(async (e) => {
-          const index = {
-            date: new Date().getTime(),
-            meta: {},
-            paths: [],
-          }
-          // Store the index in the Bucket (or in the Thread later)
-          const buf = Buffer.from(JSON.stringify(index, null, 2))
-          if (!this.buckets || !this.bucketKey) return null
-          await this.buckets.pushPath(this.bucketKey, path, buf)
-          resolve(false)
-        })
-    })
-  }
-
-  async fetchIndex(): Promise<object> {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return {}
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    const next = await bytesStream.next()
-    const value = next.value
-    const index = JSON.parse(Buffer.from(value).toString())
-    return index
-  }
-
-  async pushFile(
-    file: File,
-    path: string,
-    progress?: CallableFunction,
-  ): Promise<PushPathResult> {
-    return new Promise((resolve, reject) => {
-      const reader = new FileReader()
-      reader.onabort = () => reject(new Error('file reading was aborted'))
-      reader.onerror = () => reject(new Error('file reading has failed'))
-      reader.onload = () => {
-        if (!this.buckets || !this.bucketKey) {
-          reject(new Error('Please init first'))
-          return
-        }
-        const binaryStr = reader.result
-        this.buckets
-          .pushPath(this.bucketKey, `${path}`, binaryStr, {
-            progress: (num) => {
-              if (progress && num) progress(this.progressParse(num, file.size))
-            },
-          })
-          .then((raw) => {
-            resolve(raw)
-          })
-          .catch((error) => {
-            throw error
-          })
-      }
-      reader.readAsArrayBuffer(file)
-    })
-  }
-
-  async getBucket(): Promise<Root | undefined> {
-    if (!this.buckets) return undefined
-    const roots = await this.buckets.list()
-    return roots.find((bucket) => bucket.name === this.bucketName)
-  }
-
-  async getLinks(): Promise<Links | undefined> {
-    if (!this.buckets || !this.bucketKey) return undefined
-    const links = await this.buckets.links(this.bucketKey)
-    return links
-  }
-}
diff --git a/libraries/Textile/TextileManager.ts b/libraries/Textile/TextileManager.ts
index e7a336fb3c..136144b9ad 100644
--- a/libraries/Textile/TextileManager.ts
+++ b/libraries/Textile/TextileManager.ts
@@ -1,24 +1,24 @@
-import { Bucket } from '../Files/remote/textile/Bucket'
 import { MetadataManager } from './MetadataManager'
 import { UserInfoManager } from './UserManager'
 import { Config } from '~/config'
-import BucketManager from '~/libraries/Textile/BucketManager'
+import { PersonalBucket } from '~/libraries/Files/remote/textile/PersonalBucket'
+import { SharedBucket } from '~/libraries/Files/remote/textile/SharedBucket'
 import { GroupChatManager } from '~/libraries/Textile/GroupChatManager'
 import IdentityManager from '~/libraries/Textile/IdentityManager'
 import { MailboxManager } from '~/libraries/Textile/MailboxManager'
+import { NotificationManager } from '~/libraries/Textile/NotificationManager'
 import {
   Creds,
   TextileConfig,
   TextileInitializationData,
 } from '~/types/textile/manager'
-import { NotificationManager } from '~/libraries/Textile/NotificationManager'
 
 export default class TextileManager {
   creds?: Creds
   identityManager: IdentityManager
   mailboxManager?: MailboxManager
-  bucketManager?: BucketManager
-  bucket?: Bucket
+  personalBucket?: PersonalBucket
+  sharedBucket?: SharedBucket
   groupChatManager?: GroupChatManager
   metadataManager?: MetadataManager
   userInfoManager?: UserInfoManager
@@ -70,36 +70,35 @@ export default class TextileManager {
     }
 
     this.mailboxManager = new MailboxManager(textile, textile.wallet.address)
-    await this.mailboxManager.init()
-
-    this.bucketManager = new BucketManager(
-      textile,
-      textile.identity,
-      textile.wallet.address,
-    )
-    await this.bucketManager.init().catch((e) => console.log(e))
-
-    // Initialize bucket
-    this.bucket = new Bucket(textile)
-    await this.bucket.init(Config.textile.bucketName)
-
+    this.sharedBucket = new SharedBucket(textile)
+    this.personalBucket = new PersonalBucket(textile)
     // GroupChatManager initializes itself during the creation
     this.groupChatManager = new GroupChatManager(
       textile,
       textile.wallet.address,
       textile.identity,
     )
-    await this.groupChatManager.init()
     // MetadataManager initializes itself during the creation
     this.metadataManager = new MetadataManager(textile)
-    await this.metadataManager.init()
-
     // UserInfoManager initializes itself during the creation
     this.userInfoManager = new UserInfoManager(textile)
-    await this.userInfoManager.init()
-
     this.notificationManager = new NotificationManager(textile)
-    await this.notificationManager.init()
+
+    // await all the managers to be initialized
+    await Promise.all([
+      this.mailboxManager.init(),
+      this.sharedBucket.init({
+        name: Config.textile.sharedBucket,
+      }),
+      this.personalBucket.init({
+        name: Config.textile.personalBucket,
+        encrypted: true,
+      }),
+      this.groupChatManager.init(),
+      this.metadataManager.init(),
+      this.userInfoManager.init(),
+      this.notificationManager.init(),
+    ])
   }
 
   /**
diff --git a/libraries/Textile/__snapshots__/BucketManager.test.ts.snap b/libraries/Textile/__snapshots__/BucketManager.test.ts.snap
deleted file mode 100644
index 97887160ee..0000000000
--- a/libraries/Textile/__snapshots__/BucketManager.test.ts.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BucketManager.default.progressParse 0 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 1 1`] = `0.6666666666666667`;
-
-exports[`BucketManager.default.progressParse 2 1`] = `0.16`;
-
-exports[`BucketManager.default.progressParse 3 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 4 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 5 1`] = `NaN`;
diff --git a/libraries/Textile/__snapshots__/encoders.test.ts.snap b/libraries/Textile/__snapshots__/encoders.test.ts.snap
index 57260e8665..07a160b281 100644
--- a/libraries/Textile/__snapshots__/encoders.test.ts.snap
+++ b/libraries/Textile/__snapshots__/encoders.test.ts.snap
@@ -99,7 +99,7 @@ IntersectionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" })",
+  "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" })",
   "types": Array [
     IntersectionType {
       "_tag": "IntersectionType",
@@ -212,15 +212,23 @@ IntersectionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+      "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
       "props": Object {
         "payload": InterfaceType {
           "_tag": "InterfaceType",
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ url: string, name: string, size: number, type: string }",
+          "name": "{ url: string, name: string, size: number, type: string, id: string }",
           "props": Object {
+            "id": StringType {
+              "_tag": "StringType",
+              "decode": [Function],
+              "encode": [Function],
+              "is": [Function],
+              "name": "string",
+              "validate": [Function],
+            },
             "name": StringType {
               "_tag": "StringType",
               "decode": [Function],
@@ -613,14 +621,14 @@ UnionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "(((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"text\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"media\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, pack: string } & { type: \\"glyph\\" }))",
+  "name": "(((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"text\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"media\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, pack: string } & { type: \\"glyph\\" }))",
   "types": Array [
     TaggedUnionType {
       "_tag": "UnionType",
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
+      "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
       "tag": "replyType",
       "types": Array [
         IntersectionType {
@@ -798,7 +806,7 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
+          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
           "types": Array [
             IntersectionType {
               "_tag": "IntersectionType",
@@ -911,15 +919,23 @@ UnionType {
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+              "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
               "props": Object {
                 "payload": InterfaceType {
                   "_tag": "InterfaceType",
                   "decode": [Function],
                   "encode": [Function],
                   "is": [Function],
-                  "name": "{ url: string, name: string, size: number, type: string }",
+                  "name": "{ url: string, name: string, size: number, type: string, id: string }",
                   "props": Object {
+                    "id": StringType {
+                      "_tag": "StringType",
+                      "decode": [Function],
+                      "encode": [Function],
+                      "is": [Function],
+                      "name": "string",
+                      "validate": [Function],
+                    },
                     "name": StringType {
                       "_tag": "StringType",
                       "decode": [Function],
@@ -1326,7 +1342,7 @@ UnionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" })",
+      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" })",
       "types": Array [
         IntersectionType {
           "_tag": "IntersectionType",
@@ -1439,15 +1455,23 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+          "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
           "props": Object {
             "payload": InterfaceType {
               "_tag": "InterfaceType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
+              "name": "{ url: string, name: string, size: number, type: string, id: string }",
               "props": Object {
+                "id": StringType {
+                  "_tag": "StringType",
+                  "decode": [Function],
+                  "encode": [Function],
+                  "is": [Function],
+                  "name": "string",
+                  "validate": [Function],
+                },
                 "name": StringType {
                   "_tag": "StringType",
                   "decode": [Function],
@@ -2329,7 +2353,7 @@ TaggedUnionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
+  "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
   "tag": "replyType",
   "types": Array [
     IntersectionType {
@@ -2507,7 +2531,7 @@ TaggedUnionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
+      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
       "types": Array [
         IntersectionType {
           "_tag": "IntersectionType",
@@ -2620,15 +2644,23 @@ TaggedUnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+          "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
           "props": Object {
             "payload": InterfaceType {
               "_tag": "InterfaceType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
+              "name": "{ url: string, name: string, size: number, type: string, id: string }",
               "props": Object {
+                "id": StringType {
+                  "_tag": "StringType",
+                  "decode": [Function],
+                  "encode": [Function],
+                  "is": [Function],
+                  "name": "string",
+                  "validate": [Function],
+                },
                 "name": StringType {
                   "_tag": "StringType",
                   "decode": [Function],
diff --git a/libraries/Textile/encoders.ts b/libraries/Textile/encoders.ts
index dc1060a3eb..1c4ae0e532 100644
--- a/libraries/Textile/encoders.ts
+++ b/libraries/Textile/encoders.ts
@@ -77,6 +77,7 @@ const fileMessagePayload = t.type({
     name: t.string,
     size: t.number,
     type: t.string,
+    id: t.string,
   }),
 })
 
diff --git a/plugins/local/classLoader.ts b/plugins/local/classLoader.ts
index b59f0bbdc7..6652f036ed 100644
--- a/plugins/local/classLoader.ts
+++ b/plugins/local/classLoader.ts
@@ -13,7 +13,6 @@ import { RootStore } from '~/types/store/store'
 import TextileManager from '~/libraries/Textile/TextileManager'
 import { TextileFileSystem } from '~/libraries/Files/TextileFileSystem'
 // Utils
-import BucketManager from '~/libraries/Textile/BucketManager'
 import Logger from '~/utilities/Logger'
 
 declare module 'vue/types/vue' {
@@ -25,7 +24,6 @@ declare module 'vue/types/vue' {
     $Security: Security
     $typedStore: RootStore
     $TextileManager: TextileManager
-    $BucketManager: BucketManager
     $Logger: Logger
     $FileSystem: TextileFileSystem
   }
@@ -40,7 +38,6 @@ declare module '@nuxt/types' {
     $Security: Security
     $typedStore: RootStore
     $TextileManager: TextileManager
-    $BucketManager: BucketManager
     $Logger: Logger
     $FileSystem: TextileFileSystem
   }
diff --git a/store/accounts/actions.ts b/store/accounts/actions.ts
index 4000f784f1..2ed504b2ff 100644
--- a/store/accounts/actions.ts
+++ b/store/accounts/actions.ts
@@ -406,13 +406,13 @@ async function uploadPicture(image: string) {
     })
 
   const $TextileManager: TextileManager = Vue.prototype.$TextileManager
-  $TextileManager.bucketManager?.getBucket()
-  const result = await $TextileManager.bucketManager?.pushFile(
+  const res = await $TextileManager.sharedBucket?.pushFile(
     imageFile,
     imageFile.name,
+    () => {},
   )
 
-  return result?.path.root.toString() ?? ''
+  return res?.path.root.toString() ?? ''
 }
 
 export const exportForTesting = {
diff --git a/store/textile/actions.ts b/store/textile/actions.ts
index 84e793a67a..d9248a5a7c 100644
--- a/store/textile/actions.ts
+++ b/store/textile/actions.ts
@@ -64,12 +64,6 @@ export default {
 
     commit('accounts/updateTextilePubkey', textilePublicKey, { root: true })
 
-    const fsExport = $TextileManager.bucket?.index
-
-    if (fsExport) {
-      const $FileSystem: FilSystem = Vue.prototype.$FileSystem
-      await $FileSystem.import(fsExport)
-    }
     const record = await $TextileManager.userInfoManager?.getUserRecord()
     if (!record) {
       await dispatch('updateUserThreadData', {
@@ -328,21 +322,19 @@ export default {
     commit('setMessageLoading', { loading: true })
     document.body.style.cursor = PropCommonEnum.WAIT
     const $TextileManager: TextileManager = Vue.prototype.$TextileManager
-    const path = `/${file.file.name}`
-    $TextileManager.bucketManager?.getBucket()
-    const result = await $TextileManager.bucketManager?.pushFile(
+    const id = uuidv4()
+    const res = await $TextileManager.sharedBucket?.pushFile(
       file.file,
-      path,
+      id,
       (progress: number) => {
         commit('setUploadingFileProgress', {
-          progress,
+          progress: Math.floor((progress / file.file.size) * 100),
           name: file.file.name,
         })
       },
     )
     /* If already canceled */
     if (!rootState.textile.messageLoading) return
-    const fileURL = `${Config.textile.browser}${result?.root}${path}`
     const friend = rootState.friends.all.find((fr) => fr.textilePubkey === to)
 
     if (!friend) {
@@ -354,7 +346,8 @@ export default {
         {
           to: friend.textilePubkey,
           payload: {
-            url: fileURL,
+            id,
+            url: Config.textile.browser + res?.path.path,
             name: file.file.name,
             size: file.file.size,
             type: file.file.type,
@@ -872,25 +865,24 @@ export default {
     document.body.style.cursor = PropCommonEnum.WAIT
     const $TextileManager: TextileManager = Vue.prototype.$TextileManager
     const group = getGroup(rootState, groupID)
-    const path = `/${file.file.name}`
-    $TextileManager.bucketManager?.getBucket()
-    const result = await $TextileManager.bucketManager?.pushFile(
+    const id = uuidv4()
+    const res = await $TextileManager.sharedBucket?.pushFile(
       file.file,
-      path,
+      id,
       (progress: number) => {
         commit('setUploadingFileProgress', {
-          progress,
+          progress: Math.floor((progress / file.file.size) * 100),
           name: file.file.name,
         })
       },
     )
-    const fileURL = `${Config.textile.browser}${result?.root}${path}`
 
     const sendFileResult =
       await $TextileManager.groupChatManager?.sendMessage<'file'>(group, {
         to: groupID,
         payload: {
-          url: fileURL,
+          id,
+          url: Config.textile.browser + res?.path.path,
           name: file.file.name,
           size: file.file.size,
           type: file.file.type,
@@ -1065,11 +1057,11 @@ export default {
     const $TextileManager: TextileManager = Vue.prototype.$TextileManager
     const $FileSystem: FilSystem = Vue.prototype.$FileSystem
 
-    if (!$TextileManager.bucket) {
+    if (!$TextileManager.personalBucket) {
       throw new Error(TextileError.BUCKET_NOT_INITIALIZED)
     }
 
-    await $TextileManager.bucket.updateIndex($FileSystem.export)
+    await $TextileManager.personalBucket.updateIndex($FileSystem.export)
     dispatch('updateUserThreadData', {
       filesVersion: $FileSystem.version,
     })
diff --git a/store/textile/mutations.test.ts b/store/textile/mutations.test.ts
index e9a0c5bcc9..bbb4139395 100644
--- a/store/textile/mutations.test.ts
+++ b/store/textile/mutations.test.ts
@@ -52,7 +52,6 @@ describe('init', () => {
           replyMessage: 'text0',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
@@ -61,7 +60,6 @@ describe('init', () => {
           replyMessage: 'text1',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',