diff --git a/opt/ahenk/base/file/file_transfer_manager.py b/opt/ahenk/base/file/file_transfer_manager.py
new file mode 100644
index 0000000..e69de29
diff --git a/opt/ahenk/base/file/http_file_transfer.py b/opt/ahenk/base/file/http_file_transfer.py
new file mode 100644
index 0000000..e69de29
diff --git a/opt/ahenk/base/messaging/ssh_file_transfer.py b/opt/ahenk/base/file/ssh_file_transfer.py
similarity index 100%
rename from opt/ahenk/base/messaging/ssh_file_transfer.py
rename to opt/ahenk/base/file/ssh_file_transfer.py
diff --git a/opt/ahenk/base/messaging/FileTransfer.py b/opt/ahenk/base/messaging/FileTransfer.py
deleted file mode 100644
index 38d6b98..0000000
--- a/opt/ahenk/base/messaging/FileTransfer.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Author: Volkan Şahin <volkansah.in> <bm.volkansahin@gmail.com>
-
-import asyncio
-import time
-
-import slixmpp
-
-from base.Scope import Scope
-
-
-class FileTransfer(slixmpp.ClientXMPP):
-    def __init__(self, file_path):
-
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-
-        scope = Scope().getInstance()
-
-        self.logger = scope.getLogger()
-        self.configuration_manager = scope.getConfigurationManager()
-
-        self.file = open(file_path, 'rb')
-        self.my_jid = str(self.configuration_manager.get('CONNECTION', 'uid') + '@' + self.configuration_manager.get('CONNECTION', 'servicename') + '/sender')
-        self.my_pass = str(self.configuration_manager.get('CONNECTION', 'password'))
-        self.receiver = self.configuration_manager.get('CONNECTION', 'receiverjid') + '@' + self.configuration_manager.get('CONNECTION', 'servicename') + '/Smack'
-        self.logger.debug('[FileTransfer] File transfer client was configured.')
-
-        slixmpp.ClientXMPP.__init__(self, self.my_jid, self.my_pass)
-        self.logger.debug('[FileTransfer] XMPP Client was created for file transfer.')
-
-        self.register_plugin('xep_0030')  # Service Discovery
-        self.register_plugin('xep_0065')
-
-        self.add_event_handler("session_start", self.start)
-
-    @asyncio.coroutine
-    def start(self, event):
-        self.logger.debug('[FileTransfer] Sending file ...')
-
-        try:
-            # Open the S5B stream in which to write to.
-            proxy = yield from self['xep_0065'].handshake(self.receiver)
-
-            # Send the entire file.
-            i = 0
-            while True:
-                data = self.file.read(1000)
-                i += 1
-                print('-->' + str(i) + '--' + str(len(data)))
-                if not data:
-                    break
-                yield from proxy.write(data)
-
-            time.sleep(10)
-            # And finally close the stream.
-            proxy.transport.write_eof()
-
-        except Exception as e:
-            self.logger.debug('[FileTransfer] A problem occurred while file transferring. Error Message: {}'.format(str(e)))
-        else:
-            self.logger.debug('[FileTransfer] File transfer is finished.')
-        finally:
-            self.logger.debug('[FileTransfer] Disconnecting file transfer resource.')
-            self.disconnect()
-            self.file.close()
-            self.logger.debug('[FileTransfer] Disconnected file transfer resource.')
-
-    @staticmethod
-    def run(file_path):
-        xmpp = FileTransfer(file_path)
-        xmpp.connect()
-        xmpp.process(forever=False)