move tribler-mod/ to instrumentation/

diff --git a/tribler-mod/Tribler/Category/Category.py b/instrumentation/tribler-mod/Tribler/Category/Category.py
similarity index 100%
rename from tribler-mod/Tribler/Category/Category.py
rename to instrumentation/tribler-mod/Tribler/Category/Category.py

diff --git a/tribler-mod/Tribler/Category/Category.py.bak b/instrumentation/tribler-mod/Tribler/Category/Category.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Category/Category.py.bak
rename to instrumentation/tribler-mod/Tribler/Category/Category.py.bak

diff --git a/tribler-mod/Tribler/Category/FamilyFilter.py b/instrumentation/tribler-mod/Tribler/Category/FamilyFilter.py
similarity index 100%
rename from tribler-mod/Tribler/Category/FamilyFilter.py
rename to instrumentation/tribler-mod/Tribler/Category/FamilyFilter.py

diff --git a/tribler-mod/Tribler/Category/FamilyFilter.py.bak b/instrumentation/tribler-mod/Tribler/Category/FamilyFilter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Category/FamilyFilter.py.bak
rename to instrumentation/tribler-mod/Tribler/Category/FamilyFilter.py.bak

diff --git a/tribler-mod/Tribler/Category/TestCategory.py b/instrumentation/tribler-mod/Tribler/Category/TestCategory.py
similarity index 100%
rename from tribler-mod/Tribler/Category/TestCategory.py
rename to instrumentation/tribler-mod/Tribler/Category/TestCategory.py

diff --git a/tribler-mod/Tribler/Category/TestCategory.py.bak b/instrumentation/tribler-mod/Tribler/Category/TestCategory.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Category/TestCategory.py.bak
rename to instrumentation/tribler-mod/Tribler/Category/TestCategory.py.bak

diff --git a/tribler-mod/Tribler/Category/__init__.py b/instrumentation/tribler-mod/Tribler/Category/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Category/__init__.py
rename to instrumentation/tribler-mod/Tribler/Category/__init__.py

diff --git a/tribler-mod/Tribler/Category/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Category/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Category/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Category/__init__.py.bak

diff --git a/tribler-mod/Tribler/Category/category.conf b/instrumentation/tribler-mod/Tribler/Category/category.conf
similarity index 100%
rename from tribler-mod/Tribler/Category/category.conf
rename to instrumentation/tribler-mod/Tribler/Category/category.conf

diff --git a/tribler-mod/Tribler/Category/filter_terms.filter b/instrumentation/tribler-mod/Tribler/Category/filter_terms.filter
similarity index 100%
rename from tribler-mod/Tribler/Category/filter_terms.filter
rename to instrumentation/tribler-mod/Tribler/Category/filter_terms.filter

diff --git a/tribler-mod/Tribler/Category/init_category.py b/instrumentation/tribler-mod/Tribler/Category/init_category.py
similarity index 100%
rename from tribler-mod/Tribler/Category/init_category.py
rename to instrumentation/tribler-mod/Tribler/Category/init_category.py

diff --git a/tribler-mod/Tribler/Category/init_category.py.bak b/instrumentation/tribler-mod/Tribler/Category/init_category.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Category/init_category.py.bak
rename to instrumentation/tribler-mod/Tribler/Category/init_category.py.bak

diff --git a/tribler-mod/Tribler/Category/porncat.txt b/instrumentation/tribler-mod/Tribler/Category/porncat.txt
similarity index 100%
rename from tribler-mod/Tribler/Category/porncat.txt
rename to instrumentation/tribler-mod/Tribler/Category/porncat.txt

diff --git a/tribler-mod/Tribler/Core/API.py b/instrumentation/tribler-mod/Tribler/Core/API.py
similarity index 100%
rename from tribler-mod/Tribler/Core/API.py
rename to instrumentation/tribler-mod/Tribler/Core/API.py

diff --git a/tribler-mod/Tribler/Core/API.py.bak b/instrumentation/tribler-mod/Tribler/Core/API.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/API.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/API.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadImpl.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/DownloadRuntimeConfig.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/LaunchManyCore.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/SessionRuntimeConfig.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/SingleDownload.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/ThreadPool.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/UserCallbackHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/__init__.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/__init__.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/maketorrent.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/maketorrent.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/maketorrent.py.bak

diff --git a/tribler-mod/Tribler/Core/APIImplementation/miscutils.py b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/miscutils.py
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/miscutils.py
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/miscutils.py

diff --git a/tribler-mod/Tribler/Core/APIImplementation/miscutils.py.bak b/instrumentation/tribler-mod/Tribler/Core/APIImplementation/miscutils.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/APIImplementation/miscutils.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/APIImplementation/miscutils.py.bak

diff --git a/tribler-mod/Tribler/Core/Base.py b/instrumentation/tribler-mod/Tribler/Core/Base.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Base.py
rename to instrumentation/tribler-mod/Tribler/Core/Base.py

diff --git a/tribler-mod/Tribler/Core/Base.py.bak b/instrumentation/tribler-mod/Tribler/Core/Base.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Base.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Base.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Choker.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Connecter.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Downloader.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/DownloaderFeedback.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Encrypter.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/FileSelector.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Filter.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/HTTPDownloader.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/MessageID.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/NatCheck.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/PiecePicker.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Rerequester.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Statistics.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Storage.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/StorageWrapper.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/T2T.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/Uploader.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/btformats.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/convert.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/convert.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/convert.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/fakeopen.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/track.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/track.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/track.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/track.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/BT1/track.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/track.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/BT1/track.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/BT1/track.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/CurrentRateMeasure.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/HTTPHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/PSYCO.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/PSYCO.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/PSYCO.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/PSYCO.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/PSYCO.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/PSYCO.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/PSYCO.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/PSYCO.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RateLimiter.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RateLimiter.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RateLimiter.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RateMeasure.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RateMeasure.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RateMeasure.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/RawServer.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RawServer.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RawServer.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RawServer.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/RawServer.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/RawServer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/RawServer.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/RawServer.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/ServerPortHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/SocketHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/SocketHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/SocketHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/__init__.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/__init__.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/bencode.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/bencode.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/bencode.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/bencode.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/bencode.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/bencode.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/bencode.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/bencode.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/bitfield.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/bitfield.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/bitfield.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/bitfield.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/bitfield.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/bitfield.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/bitfield.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/bitfield.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/clock.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/clock.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/clock.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/clock.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/clock.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/clock.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/clock.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/clock.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/download_bt1.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/download_bt1.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/download_bt1.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/download_bt1.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/download_bt1.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/download_bt1.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/download_bt1.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/download_bt1.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/inifile.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/inifile.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/inifile.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/inifile.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/inifile.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/inifile.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/inifile.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/inifile.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/iprangeparse.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/iprangeparse.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/iprangeparse.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/natpunch.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/natpunch.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/natpunch.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/natpunch.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/natpunch.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/natpunch.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/natpunch.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/natpunch.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/parseargs.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/parseargs.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/parseargs.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/parseargs.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/parseargs.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/parseargs.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/parseargs.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/parseargs.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/parsedir.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/parsedir.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/parsedir.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/parsedir.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/parsedir.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/parsedir.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/parsedir.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/parsedir.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/piecebuffer.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/piecebuffer.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/piecebuffer.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/selectpoll.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/selectpoll.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/selectpoll.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/selectpoll.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/selectpoll.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/selectpoll.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/selectpoll.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/selectpoll.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/subnetparse.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/subnetparse.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/subnetparse.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/subnetparse.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/subnetparse.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/subnetparse.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/subnetparse.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/subnetparse.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/torrentlistparse.py.bak

diff --git a/tribler-mod/Tribler/Core/BitTornado/zurllib.py b/instrumentation/tribler-mod/Tribler/Core/BitTornado/zurllib.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/zurllib.py
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/zurllib.py

diff --git a/tribler-mod/Tribler/Core/BitTornado/zurllib.py.bak b/instrumentation/tribler-mod/Tribler/Core/BitTornado/zurllib.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BitTornado/zurllib.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BitTornado/zurllib.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/TorrentCollecting.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/__init__.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/__init__.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/bartercast.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/bartercast.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/bartercast.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/bartercast.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/bartercast.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/bartercast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/bartercast.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/bartercast.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/buddycast.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/buddycast.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/buddycast.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/buddycast.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/buddycast.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/buddycast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/buddycast.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/buddycast.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/moderationcast.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/moderationcast.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/moderationcast_util.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/similarity.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/similarity.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/similarity.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/similarity.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/similarity.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/similarity.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/similarity.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/similarity.py.bak

diff --git a/tribler-mod/Tribler/Core/BuddyCast/votecast.py b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/votecast.py
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/votecast.py
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/votecast.py

diff --git a/tribler-mod/Tribler/Core/BuddyCast/votecast.py.bak b/instrumentation/tribler-mod/Tribler/Core/BuddyCast/votecast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/BuddyCast/votecast.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/BuddyCast/votecast.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/BsdCacheDBHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/CacheDBHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/EditDist.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/EditDist.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/EditDist.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/EditDist.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/EditDist.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/EditDist.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/EditDist.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/EditDist.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/Notifier.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/Notifier.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/Notifier.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/Notifier.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/Notifier.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/Notifier.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/Notifier.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/Notifier.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteCacheDBHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteFriendshipStatsCacheDB.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteSeedingStatsCacheDB.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/SqliteVideoPlaybackStatsCacheDB.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/__init__.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/__init__.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/bsdcachedb.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/bsddb2sqlite.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/cachedb.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/cachedb.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/cachedb.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/cachedb.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/cachedb.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/cachedb.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/cachedb.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/cachedb.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/friends.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/friends.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/friends.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/friends.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/friends.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/friends.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/friends.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/friends.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/maxflow.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/maxflow.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/maxflow.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/maxflow.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/maxflow.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/maxflow.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/maxflow.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/maxflow.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/read_db.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/read_db.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/read_db.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/read_db.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/read_db.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/read_db.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/read_db.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/read_db.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/sqlitecachedb.py.bak

diff --git a/tribler-mod/Tribler/Core/CacheDB/unicode.py b/instrumentation/tribler-mod/Tribler/Core/CacheDB/unicode.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/unicode.py
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/unicode.py

diff --git a/tribler-mod/Tribler/Core/CacheDB/unicode.py.bak b/instrumentation/tribler-mod/Tribler/Core/CacheDB/unicode.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CacheDB/unicode.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CacheDB/unicode.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Coordinator.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Coordinator.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Coordinator.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/CoordinatorMessageHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Helper.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Helper.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Helper.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Helper.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Helper.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Helper.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Helper.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Helper.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/HelperMessageHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Logger.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Logger.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Logger.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Logger.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/Logger.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/Logger.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/Logger.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/Logger.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/RatePredictor.py.bak

diff --git a/tribler-mod/Tribler/Core/CoopDownload/__init__.py b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/__init__.py

diff --git a/tribler-mod/Tribler/Core/CoopDownload/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/CoopDownload/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/CoopDownload/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/CoopDownload/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py.bak b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHT.py.bak

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py.bak b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/mainlineDHTChecker.py.bak

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py.bak b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/rsconvert.py.bak

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py

diff --git a/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py.bak b/instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DecentralizedTracking/ut_pex.py.bak

diff --git a/tribler-mod/Tribler/Core/Download.py b/instrumentation/tribler-mod/Tribler/Core/Download.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Download.py
rename to instrumentation/tribler-mod/Tribler/Core/Download.py

diff --git a/tribler-mod/Tribler/Core/Download.py.bak b/instrumentation/tribler-mod/Tribler/Core/Download.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Download.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Download.py.bak

diff --git a/tribler-mod/Tribler/Core/DownloadConfig.py b/instrumentation/tribler-mod/Tribler/Core/DownloadConfig.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DownloadConfig.py
rename to instrumentation/tribler-mod/Tribler/Core/DownloadConfig.py

diff --git a/tribler-mod/Tribler/Core/DownloadConfig.py.bak b/instrumentation/tribler-mod/Tribler/Core/DownloadConfig.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DownloadConfig.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DownloadConfig.py.bak

diff --git a/tribler-mod/Tribler/Core/DownloadState.py b/instrumentation/tribler-mod/Tribler/Core/DownloadState.py
similarity index 100%
rename from tribler-mod/Tribler/Core/DownloadState.py
rename to instrumentation/tribler-mod/Tribler/Core/DownloadState.py

diff --git a/tribler-mod/Tribler/Core/DownloadState.py.bak b/instrumentation/tribler-mod/Tribler/Core/DownloadState.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/DownloadState.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/DownloadState.py.bak

diff --git a/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py b/instrumentation/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py
similarity index 100%
rename from tribler-mod/Tribler/Core/LiveSourceAuthConfig.py
rename to instrumentation/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py

diff --git a/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py.bak b/instrumentation/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/LiveSourceAuthConfig.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/LiveSourceAuthConfig.py.bak

diff --git a/tribler-mod/Tribler/Core/Merkle/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Merkle/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Merkle/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Merkle/__init__.py

diff --git a/tribler-mod/Tribler/Core/Merkle/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Merkle/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Merkle/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Merkle/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Merkle/merkle.py b/instrumentation/tribler-mod/Tribler/Core/Merkle/merkle.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Merkle/merkle.py
rename to instrumentation/tribler-mod/Tribler/Core/Merkle/merkle.py

diff --git a/tribler-mod/Tribler/Core/Merkle/merkle.py.bak b/instrumentation/tribler-mod/Tribler/Core/Merkle/merkle.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Merkle/merkle.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Merkle/merkle.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/ConnectionCheck.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/DialbackMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatCheck.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatCheck.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheck.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatCheckMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/NatTraversal.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/ReturnConnHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/TimeoutCheck.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/UPnPThread.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/__init__.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/__init__.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/guessip.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/guessip.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/guessip.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/guessip.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/guessip.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/guessip.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/guessip.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/guessip.py.bak

diff --git a/tribler-mod/Tribler/Core/NATFirewall/upnp.py b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/upnp.py
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/upnp.py
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/upnp.py

diff --git a/tribler-mod/Tribler/Core/NATFirewall/upnp.py.bak b/instrumentation/tribler-mod/Tribler/Core/NATFirewall/upnp.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/NATFirewall/upnp.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/NATFirewall/upnp.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/MetadataHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py

diff --git a/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/MetadataHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/MetadataHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/OverlayApps.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayApps.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/OverlayApps.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayApps.py

diff --git a/tribler-mod/Tribler/Core/Overlay/OverlayApps.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayApps.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/OverlayApps.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayApps.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py

diff --git a/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/OverlayThreadingBridge.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/SecureOverlay.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py

diff --git a/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/SecureOverlay.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/SecureOverlay.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/__init__.py

diff --git a/tribler-mod/Tribler/Core/Overlay/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Overlay/permid.py b/instrumentation/tribler-mod/Tribler/Core/Overlay/permid.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/permid.py
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/permid.py

diff --git a/tribler-mod/Tribler/Core/Overlay/permid.py.bak b/instrumentation/tribler-mod/Tribler/Core/Overlay/permid.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Overlay/permid.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Overlay/permid.py.bak

diff --git a/tribler-mod/Tribler/Core/RequestPolicy.py b/instrumentation/tribler-mod/Tribler/Core/RequestPolicy.py
similarity index 100%
rename from tribler-mod/Tribler/Core/RequestPolicy.py
rename to instrumentation/tribler-mod/Tribler/Core/RequestPolicy.py

diff --git a/tribler-mod/Tribler/Core/RequestPolicy.py.bak b/instrumentation/tribler-mod/Tribler/Core/RequestPolicy.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/RequestPolicy.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/RequestPolicy.py.bak

diff --git a/tribler-mod/Tribler/Core/Search/KeywordSearch.py b/instrumentation/tribler-mod/Tribler/Core/Search/KeywordSearch.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/KeywordSearch.py
rename to instrumentation/tribler-mod/Tribler/Core/Search/KeywordSearch.py

diff --git a/tribler-mod/Tribler/Core/Search/KeywordSearch.py.bak b/instrumentation/tribler-mod/Tribler/Core/Search/KeywordSearch.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/KeywordSearch.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Search/KeywordSearch.py.bak

diff --git a/tribler-mod/Tribler/Core/Search/Reranking.py b/instrumentation/tribler-mod/Tribler/Core/Search/Reranking.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/Reranking.py
rename to instrumentation/tribler-mod/Tribler/Core/Search/Reranking.py

diff --git a/tribler-mod/Tribler/Core/Search/Reranking.py.bak b/instrumentation/tribler-mod/Tribler/Core/Search/Reranking.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/Reranking.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Search/Reranking.py.bak

diff --git a/tribler-mod/Tribler/Core/Search/SearchManager.py b/instrumentation/tribler-mod/Tribler/Core/Search/SearchManager.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/SearchManager.py
rename to instrumentation/tribler-mod/Tribler/Core/Search/SearchManager.py

diff --git a/tribler-mod/Tribler/Core/Search/SearchManager.py.bak b/instrumentation/tribler-mod/Tribler/Core/Search/SearchManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/SearchManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Search/SearchManager.py.bak

diff --git a/tribler-mod/Tribler/Core/Search/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Search/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Search/__init__.py

diff --git a/tribler-mod/Tribler/Core/Search/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Search/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Search/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Search/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Session.py b/instrumentation/tribler-mod/Tribler/Core/Session.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Session.py
rename to instrumentation/tribler-mod/Tribler/Core/Session.py

diff --git a/tribler-mod/Tribler/Core/Session.py.bak b/instrumentation/tribler-mod/Tribler/Core/Session.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Session.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Session.py.bak

diff --git a/tribler-mod/Tribler/Core/SessionConfig.py b/instrumentation/tribler-mod/Tribler/Core/SessionConfig.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SessionConfig.py
rename to instrumentation/tribler-mod/Tribler/Core/SessionConfig.py

diff --git a/tribler-mod/Tribler/Core/SessionConfig.py.bak b/instrumentation/tribler-mod/Tribler/Core/SessionConfig.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SessionConfig.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SessionConfig.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/FriendshipMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/OverlapMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteQueryMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/RemoteTorrentHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/SocialNetworkMsgHandler.py.bak

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/__init__.py b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/__init__.py

diff --git a/tribler-mod/Tribler/Core/SocialNetwork/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/SocialNetwork/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/SocialNetwork/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/SocialNetwork/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/Crawler.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/Crawler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/Crawler.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/Crawler.py

diff --git a/tribler-mod/Tribler/Core/Statistics/Crawler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/Crawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/Crawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/Crawler.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py

diff --git a/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/DatabaseCrawler.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py

diff --git a/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/FriendshipCrawler.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/Logger.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/Logger.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/Logger.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/Logger.py

diff --git a/tribler-mod/Tribler/Core/Statistics/Logger.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/Logger.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/Logger.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/Logger.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py

diff --git a/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/SeedingStatsCrawler.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py

diff --git a/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/VideoPlaybackCrawler.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Statistics/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/__init__.py

diff --git a/tribler-mod/Tribler/Core/Statistics/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Statistics/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Statistics/crawler.txt b/instrumentation/tribler-mod/Tribler/Core/Statistics/crawler.txt
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/crawler.txt
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/crawler.txt

diff --git a/tribler-mod/Tribler/Core/Statistics/tribler_friendship_stats_sdb.sql b/instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_friendship_stats_sdb.sql
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/tribler_friendship_stats_sdb.sql
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_friendship_stats_sdb.sql

diff --git a/tribler-mod/Tribler/Core/Statistics/tribler_seedingstats_sdb.sql b/instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_seedingstats_sdb.sql
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/tribler_seedingstats_sdb.sql
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_seedingstats_sdb.sql

diff --git a/tribler-mod/Tribler/Core/Statistics/tribler_videoplayback_stats.sql b/instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_videoplayback_stats.sql
similarity index 100%
rename from tribler-mod/Tribler/Core/Statistics/tribler_videoplayback_stats.sql
rename to instrumentation/tribler-mod/Tribler/Core/Statistics/tribler_videoplayback_stats.sql

diff --git a/tribler-mod/Tribler/Core/TorrentDef.py b/instrumentation/tribler-mod/Tribler/Core/TorrentDef.py
similarity index 100%
rename from tribler-mod/Tribler/Core/TorrentDef.py
rename to instrumentation/tribler-mod/Tribler/Core/TorrentDef.py

diff --git a/tribler-mod/Tribler/Core/TorrentDef.py.bak b/instrumentation/tribler-mod/Tribler/Core/TorrentDef.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/TorrentDef.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/TorrentDef.py.bak

diff --git a/tribler-mod/Tribler/Core/Utilities/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Utilities/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/__init__.py

diff --git a/tribler-mod/Tribler/Core/Utilities/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Utilities/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py b/instrumentation/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/timeouturlopen.py
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py

diff --git a/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py.bak b/instrumentation/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/timeouturlopen.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/timeouturlopen.py.bak

diff --git a/tribler-mod/Tribler/Core/Utilities/unicode.py b/instrumentation/tribler-mod/Tribler/Core/Utilities/unicode.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/unicode.py
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/unicode.py

diff --git a/tribler-mod/Tribler/Core/Utilities/unicode.py.bak b/instrumentation/tribler-mod/Tribler/Core/Utilities/unicode.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/unicode.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/unicode.py.bak

diff --git a/tribler-mod/Tribler/Core/Utilities/utilities.py b/instrumentation/tribler-mod/Tribler/Core/Utilities/utilities.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/utilities.py
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/utilities.py

diff --git a/tribler-mod/Tribler/Core/Utilities/utilities.py.bak b/instrumentation/tribler-mod/Tribler/Core/Utilities/utilities.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/utilities.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/utilities.py.bak

diff --git a/tribler-mod/Tribler/Core/Utilities/win32regchecker.py b/instrumentation/tribler-mod/Tribler/Core/Utilities/win32regchecker.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/win32regchecker.py
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/win32regchecker.py

diff --git a/tribler-mod/Tribler/Core/Utilities/win32regchecker.py.bak b/instrumentation/tribler-mod/Tribler/Core/Utilities/win32regchecker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Utilities/win32regchecker.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Utilities/win32regchecker.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py b/instrumentation/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/LiveSourceAuth.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py

diff --git a/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/LiveSourceAuth.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/LiveSourceAuth.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/MovieTransport.py b/instrumentation/tribler-mod/Tribler/Core/Video/MovieTransport.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/MovieTransport.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/MovieTransport.py

diff --git a/tribler-mod/Tribler/Core/Video/MovieTransport.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/MovieTransport.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/MovieTransport.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/MovieTransport.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py b/instrumentation/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py

diff --git a/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/PiecePickerStreaming.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/VideoOnDemand.py b/instrumentation/tribler-mod/Tribler/Core/Video/VideoOnDemand.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoOnDemand.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoOnDemand.py

diff --git a/tribler-mod/Tribler/Core/Video/VideoOnDemand.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/VideoOnDemand.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoOnDemand.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoOnDemand.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/VideoSource.py b/instrumentation/tribler-mod/Tribler/Core/Video/VideoSource.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoSource.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoSource.py

diff --git a/tribler-mod/Tribler/Core/Video/VideoSource.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/VideoSource.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoSource.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoSource.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/VideoStatus.py b/instrumentation/tribler-mod/Tribler/Core/Video/VideoStatus.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoStatus.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoStatus.py

diff --git a/tribler-mod/Tribler/Core/Video/VideoStatus.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/VideoStatus.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/VideoStatus.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/VideoStatus.py.bak

diff --git a/tribler-mod/Tribler/Core/Video/__init__.py b/instrumentation/tribler-mod/Tribler/Core/Video/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/Video/__init__.py

diff --git a/tribler-mod/Tribler/Core/Video/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/Video/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/Video/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/Video/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/__init__.py b/instrumentation/tribler-mod/Tribler/Core/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Core/__init__.py
rename to instrumentation/tribler-mod/Tribler/Core/__init__.py

diff --git a/tribler-mod/Tribler/Core/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Core/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/__init__.py.bak

diff --git a/tribler-mod/Tribler/Core/defaults.py b/instrumentation/tribler-mod/Tribler/Core/defaults.py
similarity index 100%
rename from tribler-mod/Tribler/Core/defaults.py
rename to instrumentation/tribler-mod/Tribler/Core/defaults.py

diff --git a/tribler-mod/Tribler/Core/defaults.py.bak b/instrumentation/tribler-mod/Tribler/Core/defaults.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/defaults.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/defaults.py.bak

diff --git a/tribler-mod/Tribler/Core/exceptions.py b/instrumentation/tribler-mod/Tribler/Core/exceptions.py
similarity index 100%
rename from tribler-mod/Tribler/Core/exceptions.py
rename to instrumentation/tribler-mod/Tribler/Core/exceptions.py

diff --git a/tribler-mod/Tribler/Core/exceptions.py.bak b/instrumentation/tribler-mod/Tribler/Core/exceptions.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/exceptions.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/exceptions.py.bak

diff --git a/tribler-mod/Tribler/Core/osutils.py b/instrumentation/tribler-mod/Tribler/Core/osutils.py
similarity index 100%
rename from tribler-mod/Tribler/Core/osutils.py
rename to instrumentation/tribler-mod/Tribler/Core/osutils.py

diff --git a/tribler-mod/Tribler/Core/osutils.py.bak b/instrumentation/tribler-mod/Tribler/Core/osutils.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/osutils.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/osutils.py.bak

diff --git a/tribler-mod/Tribler/Core/simpledefs.py b/instrumentation/tribler-mod/Tribler/Core/simpledefs.py
similarity index 100%
rename from tribler-mod/Tribler/Core/simpledefs.py
rename to instrumentation/tribler-mod/Tribler/Core/simpledefs.py

diff --git a/tribler-mod/Tribler/Core/simpledefs.py.bak b/instrumentation/tribler-mod/Tribler/Core/simpledefs.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Core/simpledefs.py.bak
rename to instrumentation/tribler-mod/Tribler/Core/simpledefs.py.bak

diff --git a/tribler-mod/Tribler/Core/superpeer.txt b/instrumentation/tribler-mod/Tribler/Core/superpeer.txt
similarity index 100%
rename from tribler-mod/Tribler/Core/superpeer.txt
rename to instrumentation/tribler-mod/Tribler/Core/superpeer.txt

diff --git a/tribler-mod/Tribler/Debug/__init__.py b/instrumentation/tribler-mod/Tribler/Debug/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Debug/__init__.py
rename to instrumentation/tribler-mod/Tribler/Debug/__init__.py

diff --git a/tribler-mod/Tribler/Debug/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Debug/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Debug/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Debug/__init__.py.bak

diff --git a/tribler-mod/Tribler/Debug/console.py b/instrumentation/tribler-mod/Tribler/Debug/console.py
similarity index 100%
rename from tribler-mod/Tribler/Debug/console.py
rename to instrumentation/tribler-mod/Tribler/Debug/console.py

diff --git a/tribler-mod/Tribler/Debug/console.py.bak b/instrumentation/tribler-mod/Tribler/Debug/console.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Debug/console.py.bak
rename to instrumentation/tribler-mod/Tribler/Debug/console.py.bak

diff --git a/tribler-mod/Tribler/Images/SwarmPlayerIcon.ico b/instrumentation/tribler-mod/Tribler/Images/SwarmPlayerIcon.ico
similarity index 100%
rename from tribler-mod/Tribler/Images/SwarmPlayerIcon.ico
rename to instrumentation/tribler-mod/Tribler/Images/SwarmPlayerIcon.ico

diff --git a/tribler-mod/Tribler/Images/SwarmPlayerLogo.png b/instrumentation/tribler-mod/Tribler/Images/SwarmPlayerLogo.png
similarity index 100%
rename from tribler-mod/Tribler/Images/SwarmPlayerLogo.png
rename to instrumentation/tribler-mod/Tribler/Images/SwarmPlayerLogo.png

diff --git a/tribler-mod/Tribler/Images/SwarmPluginIcon.ico b/instrumentation/tribler-mod/Tribler/Images/SwarmPluginIcon.ico
similarity index 100%
rename from tribler-mod/Tribler/Images/SwarmPluginIcon.ico
rename to instrumentation/tribler-mod/Tribler/Images/SwarmPluginIcon.ico

diff --git a/tribler-mod/Tribler/Images/SwarmPluginLogo.png b/instrumentation/tribler-mod/Tribler/Images/SwarmPluginLogo.png
similarity index 100%
rename from tribler-mod/Tribler/Images/SwarmPluginLogo.png
rename to instrumentation/tribler-mod/Tribler/Images/SwarmPluginLogo.png

diff --git a/tribler-mod/Tribler/Images/background.png b/instrumentation/tribler-mod/Tribler/Images/background.png
similarity index 100%
rename from tribler-mod/Tribler/Images/background.png
rename to instrumentation/tribler-mod/Tribler/Images/background.png

diff --git a/tribler-mod/Tribler/Images/fullScreen.png b/instrumentation/tribler-mod/Tribler/Images/fullScreen.png
similarity index 100%
rename from tribler-mod/Tribler/Images/fullScreen.png
rename to instrumentation/tribler-mod/Tribler/Images/fullScreen.png

diff --git a/tribler-mod/Tribler/Images/fullScreen_hover.png b/instrumentation/tribler-mod/Tribler/Images/fullScreen_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/fullScreen_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/fullScreen_hover.png

diff --git a/tribler-mod/Tribler/Images/logoTribler.png b/instrumentation/tribler-mod/Tribler/Images/logoTribler.png
similarity index 100%
rename from tribler-mod/Tribler/Images/logoTribler.png
rename to instrumentation/tribler-mod/Tribler/Images/logoTribler.png

diff --git a/tribler-mod/Tribler/Images/logoTribler_small.png b/instrumentation/tribler-mod/Tribler/Images/logoTribler_small.png
similarity index 100%
rename from tribler-mod/Tribler/Images/logoTribler_small.png
rename to instrumentation/tribler-mod/Tribler/Images/logoTribler_small.png

diff --git a/tribler-mod/Tribler/Images/mute.png b/instrumentation/tribler-mod/Tribler/Images/mute.png
similarity index 100%
rename from tribler-mod/Tribler/Images/mute.png
rename to instrumentation/tribler-mod/Tribler/Images/mute.png

diff --git a/tribler-mod/Tribler/Images/mute_hover.png b/instrumentation/tribler-mod/Tribler/Images/mute_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/mute_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/mute_hover.png

diff --git a/tribler-mod/Tribler/Images/pause.png b/instrumentation/tribler-mod/Tribler/Images/pause.png
similarity index 100%
rename from tribler-mod/Tribler/Images/pause.png
rename to instrumentation/tribler-mod/Tribler/Images/pause.png

diff --git a/tribler-mod/Tribler/Images/pause_hover.png b/instrumentation/tribler-mod/Tribler/Images/pause_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/pause_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/pause_hover.png

diff --git a/tribler-mod/Tribler/Images/play.png b/instrumentation/tribler-mod/Tribler/Images/play.png
similarity index 100%
rename from tribler-mod/Tribler/Images/play.png
rename to instrumentation/tribler-mod/Tribler/Images/play.png

diff --git a/tribler-mod/Tribler/Images/play_hover.png b/instrumentation/tribler-mod/Tribler/Images/play_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/play_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/play_hover.png

diff --git a/tribler-mod/Tribler/Images/save.png b/instrumentation/tribler-mod/Tribler/Images/save.png
similarity index 100%
rename from tribler-mod/Tribler/Images/save.png
rename to instrumentation/tribler-mod/Tribler/Images/save.png

diff --git a/tribler-mod/Tribler/Images/saveDisabled.png b/instrumentation/tribler-mod/Tribler/Images/saveDisabled.png
similarity index 100%
rename from tribler-mod/Tribler/Images/saveDisabled.png
rename to instrumentation/tribler-mod/Tribler/Images/saveDisabled.png

diff --git a/tribler-mod/Tribler/Images/saveDisabled_hover.png b/instrumentation/tribler-mod/Tribler/Images/saveDisabled_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/saveDisabled_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/saveDisabled_hover.png

diff --git a/tribler-mod/Tribler/Images/save_hover.png b/instrumentation/tribler-mod/Tribler/Images/save_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/save_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/save_hover.png

diff --git a/tribler-mod/Tribler/Images/sliderDot.png b/instrumentation/tribler-mod/Tribler/Images/sliderDot.png
similarity index 100%
rename from tribler-mod/Tribler/Images/sliderDot.png
rename to instrumentation/tribler-mod/Tribler/Images/sliderDot.png

diff --git a/tribler-mod/Tribler/Images/sliderVolume.png b/instrumentation/tribler-mod/Tribler/Images/sliderVolume.png
similarity index 100%
rename from tribler-mod/Tribler/Images/sliderVolume.png
rename to instrumentation/tribler-mod/Tribler/Images/sliderVolume.png

diff --git a/tribler-mod/Tribler/Images/splash.jpg b/instrumentation/tribler-mod/Tribler/Images/splash.jpg
similarity index 100%
rename from tribler-mod/Tribler/Images/splash.jpg
rename to instrumentation/tribler-mod/Tribler/Images/splash.jpg

diff --git a/tribler-mod/Tribler/Images/torrenticon.ico b/instrumentation/tribler-mod/Tribler/Images/torrenticon.ico
similarity index 100%
rename from tribler-mod/Tribler/Images/torrenticon.ico
rename to instrumentation/tribler-mod/Tribler/Images/torrenticon.ico

diff --git a/tribler-mod/Tribler/Images/tribler.ico b/instrumentation/tribler-mod/Tribler/Images/tribler.ico
similarity index 100%
rename from tribler-mod/Tribler/Images/tribler.ico
rename to instrumentation/tribler-mod/Tribler/Images/tribler.ico

diff --git a/tribler-mod/Tribler/Images/volume.png b/instrumentation/tribler-mod/Tribler/Images/volume.png
similarity index 100%
rename from tribler-mod/Tribler/Images/volume.png
rename to instrumentation/tribler-mod/Tribler/Images/volume.png

diff --git a/tribler-mod/Tribler/Images/volume_hover.png b/instrumentation/tribler-mod/Tribler/Images/volume_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Images/volume_hover.png
rename to instrumentation/tribler-mod/Tribler/Images/volume_hover.png

diff --git a/tribler-mod/Tribler/LICENSE.txt b/instrumentation/tribler-mod/Tribler/LICENSE.txt
similarity index 100%
rename from tribler-mod/Tribler/LICENSE.txt
rename to instrumentation/tribler-mod/Tribler/LICENSE.txt

diff --git a/tribler-mod/Tribler/Lang/__init__.py b/instrumentation/tribler-mod/Tribler/Lang/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Lang/__init__.py
rename to instrumentation/tribler-mod/Tribler/Lang/__init__.py

diff --git a/tribler-mod/Tribler/Lang/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Lang/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Lang/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Lang/__init__.py.bak

diff --git a/tribler-mod/Tribler/Lang/english.lang b/instrumentation/tribler-mod/Tribler/Lang/english.lang
similarity index 100%
rename from tribler-mod/Tribler/Lang/english.lang
rename to instrumentation/tribler-mod/Tribler/Lang/english.lang

diff --git a/tribler-mod/Tribler/Lang/lang.py b/instrumentation/tribler-mod/Tribler/Lang/lang.py
similarity index 100%
rename from tribler-mod/Tribler/Lang/lang.py
rename to instrumentation/tribler-mod/Tribler/Lang/lang.py

diff --git a/tribler-mod/Tribler/Lang/lang.py.bak b/instrumentation/tribler-mod/Tribler/Lang/lang.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Lang/lang.py.bak
rename to instrumentation/tribler-mod/Tribler/Lang/lang.py.bak

diff --git a/tribler-mod/Tribler/Main/Build/Mac/Info.plist b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/Info.plist
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/Info.plist
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/Info.plist

diff --git a/tribler-mod/Tribler/Main/Build/Mac/Makefile b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/Makefile
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/Makefile
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/Makefile

diff --git a/tribler-mod/Tribler/Main/Build/Mac/SLAResources.rsrc b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/SLAResources.rsrc
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/SLAResources.rsrc
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/SLAResources.rsrc

diff --git a/tribler-mod/Tribler/Main/Build/Mac/TriblerDoc.icns b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/TriblerDoc.icns
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/TriblerDoc.icns
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/TriblerDoc.icns

diff --git a/tribler-mod/Tribler/Main/Build/Mac/VolumeIcon.icns b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/VolumeIcon.icns
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/VolumeIcon.icns
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/VolumeIcon.icns

diff --git a/tribler-mod/Tribler/Main/Build/Mac/background.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/background.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/background.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/background.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.psd b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.psd
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/appicon.psd

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_document.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_document.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_document.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_document.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_volumeicon.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_volumeicon.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_volumeicon.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/default_volumeicon.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.psd b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.psd
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/dmgicon.psd

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.png b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.png
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.png
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.png

diff --git a/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.psd b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.psd
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/icon_sources/docicon.psd

diff --git a/tribler-mod/Tribler/Main/Build/Mac/mkinstalldirs b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/mkinstalldirs
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/mkinstalldirs
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/mkinstalldirs

diff --git a/tribler-mod/Tribler/Main/Build/Mac/process_libs b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/process_libs
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/process_libs
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/process_libs

diff --git a/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py

diff --git a/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py.bak b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/setuptriblermac.py.bak

diff --git a/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_merge b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_merge
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/smart_lipo_merge
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_merge

diff --git a/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_thin b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_thin
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/smart_lipo_thin
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/smart_lipo_thin

diff --git a/tribler-mod/Tribler/Main/Build/Mac/tribler.icns b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/tribler.icns
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/tribler.icns
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/tribler.icns

diff --git a/tribler-mod/Tribler/Main/Build/Mac/triblermac.command b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/triblermac.command
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/triblermac.command
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/triblermac.command

diff --git a/tribler-mod/Tribler/Main/Build/Mac/vlc-macosx-compile.patch b/instrumentation/tribler-mod/Tribler/Main/Build/Mac/vlc-macosx-compile.patch
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Mac/vlc-macosx-compile.patch
rename to instrumentation/tribler-mod/Tribler/Main/Build/Mac/vlc-macosx-compile.patch

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/changelog b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/changelog
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/changelog
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/changelog

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/compat b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/compat
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/compat
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/compat

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/control b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/control
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/control
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/control

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/copyright b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/copyright
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/copyright
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/copyright

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/files b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/files
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/files
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/files

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/prerm b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/prerm
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/prerm
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/prerm

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/pycompat b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/pycompat
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/pycompat
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/pycompat

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/rules b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/rules
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/rules
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/rules

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.1 b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.1
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.1
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.1

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.desktop b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.desktop
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.desktop
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.desktop

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.manpages b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.manpages
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.manpages
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.manpages

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.menu b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.menu
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.menu
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.menu

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postinst.debhelper b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postinst.debhelper
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postinst.debhelper
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postinst.debhelper

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postrm.debhelper b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postrm.debhelper
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postrm.debhelper
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.postrm.debhelper

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.prerm.debhelper b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.prerm.debhelper
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.prerm.debhelper
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.prerm.debhelper

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.sh b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.sh
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.sh
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.sh

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.substvars b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.substvars
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.substvars
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.substvars

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.xpm b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.xpm
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler.xpm
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler.xpm

diff --git a/tribler-mod/Tribler/Main/Build/Ubuntu/tribler_big.xpm b/instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler_big.xpm
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Ubuntu/tribler_big.xpm
rename to instrumentation/tribler-mod/Tribler/Main/Build/Ubuntu/tribler_big.xpm

diff --git a/tribler-mod/Tribler/Main/Build/Win32/heading.bmp b/instrumentation/tribler-mod/Tribler/Main/Build/Win32/heading.bmp
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Win32/heading.bmp
rename to instrumentation/tribler-mod/Tribler/Main/Build/Win32/heading.bmp

diff --git a/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py b/instrumentation/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Win32/setuptribler.py
rename to instrumentation/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py

diff --git a/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py.bak b/instrumentation/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Win32/setuptribler.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Build/Win32/setuptribler.py.bak

diff --git a/tribler-mod/Tribler/Main/Build/Win32/tribler.exe.manifest b/instrumentation/tribler-mod/Tribler/Main/Build/Win32/tribler.exe.manifest
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Win32/tribler.exe.manifest
rename to instrumentation/tribler-mod/Tribler/Main/Build/Win32/tribler.exe.manifest

diff --git a/tribler-mod/Tribler/Main/Build/Win32/tribler.nsi b/instrumentation/tribler-mod/Tribler/Main/Build/Win32/tribler.nsi
similarity index 100%
rename from tribler-mod/Tribler/Main/Build/Win32/tribler.nsi
rename to instrumentation/tribler-mod/Tribler/Main/Build/Win32/tribler.nsi

diff --git a/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/BandwidthSelector.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/GUITaskQueue.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/TorrentMaker.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/__init__.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/__init__.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/__init__.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/__init__.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/abcoption.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/abcoption.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/abcoption.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/abcoption.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/abcoption.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/abcoption.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/abcoption.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/abcoption.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/aboutme.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/aboutme.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/aboutme.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/aboutme.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/aboutme.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/aboutme.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/aboutme.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/aboutme.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/common.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/common.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/common.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/common.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/common.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/common.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/common.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/common.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/dlhelperframe.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/makefriends.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/makefriends.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/makefriends.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/makefriends.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/makefriends.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/makefriends.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/makefriends.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/makefriends.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/regdialog.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/regdialog.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/regdialog.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/regdialog.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/regdialog.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/regdialog.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/regdialog.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/regdialog.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/socnetmyinfo.py.bak

diff --git a/tribler-mod/Tribler/Main/Dialogs/systray.py b/instrumentation/tribler-mod/Tribler/Main/Dialogs/systray.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/systray.py
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/systray.py

diff --git a/tribler-mod/Tribler/Main/Dialogs/systray.py.bak b/instrumentation/tribler-mod/Tribler/Main/Dialogs/systray.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Dialogs/systray.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Dialogs/systray.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/__init__.py b/instrumentation/tribler-mod/Tribler/Main/Utility/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/__init__.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/__init__.py

diff --git a/tribler-mod/Tribler/Main/Utility/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/__init__.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/compat.py b/instrumentation/tribler-mod/Tribler/Main/Utility/compat.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/compat.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/compat.py

diff --git a/tribler-mod/Tribler/Main/Utility/compat.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/compat.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/compat.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/compat.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/constants.py b/instrumentation/tribler-mod/Tribler/Main/Utility/constants.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/constants.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/constants.py

diff --git a/tribler-mod/Tribler/Main/Utility/constants.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/constants.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/constants.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/constants.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/getscrapedata.py b/instrumentation/tribler-mod/Tribler/Main/Utility/getscrapedata.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/getscrapedata.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/getscrapedata.py

diff --git a/tribler-mod/Tribler/Main/Utility/getscrapedata.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/getscrapedata.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/getscrapedata.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/getscrapedata.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/helpers.py b/instrumentation/tribler-mod/Tribler/Main/Utility/helpers.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/helpers.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/helpers.py

diff --git a/tribler-mod/Tribler/Main/Utility/helpers.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/helpers.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/helpers.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/helpers.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/regchecker.py b/instrumentation/tribler-mod/Tribler/Main/Utility/regchecker.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/regchecker.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/regchecker.py

diff --git a/tribler-mod/Tribler/Main/Utility/regchecker.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/regchecker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/regchecker.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/regchecker.py.bak

diff --git a/tribler-mod/Tribler/Main/Utility/utility.py b/instrumentation/tribler-mod/Tribler/Main/Utility/utility.py
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/utility.py
rename to instrumentation/tribler-mod/Tribler/Main/Utility/utility.py

diff --git a/tribler-mod/Tribler/Main/Utility/utility.py.bak b/instrumentation/tribler-mod/Tribler/Main/Utility/utility.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/Utility/utility.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/Utility/utility.py.bak

diff --git a/tribler-mod/Tribler/Main/__init__.py b/instrumentation/tribler-mod/Tribler/Main/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Main/__init__.py
rename to instrumentation/tribler-mod/Tribler/Main/__init__.py

diff --git a/tribler-mod/Tribler/Main/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Main/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/__init__.py.bak

diff --git a/tribler-mod/Tribler/Main/crawler.py b/instrumentation/tribler-mod/Tribler/Main/crawler.py
similarity index 100%
rename from tribler-mod/Tribler/Main/crawler.py
rename to instrumentation/tribler-mod/Tribler/Main/crawler.py

diff --git a/tribler-mod/Tribler/Main/crawler.py.bak b/instrumentation/tribler-mod/Tribler/Main/crawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/crawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/crawler.py.bak

diff --git a/tribler-mod/Tribler/Main/globals.py b/instrumentation/tribler-mod/Tribler/Main/globals.py
similarity index 100%
rename from tribler-mod/Tribler/Main/globals.py
rename to instrumentation/tribler-mod/Tribler/Main/globals.py

diff --git a/tribler-mod/Tribler/Main/globals.py.bak b/instrumentation/tribler-mod/Tribler/Main/globals.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/globals.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/globals.py.bak

diff --git a/tribler-mod/Tribler/Main/metadata-injector.py b/instrumentation/tribler-mod/Tribler/Main/metadata-injector.py
similarity index 100%
rename from tribler-mod/Tribler/Main/metadata-injector.py
rename to instrumentation/tribler-mod/Tribler/Main/metadata-injector.py

diff --git a/tribler-mod/Tribler/Main/metadata-injector.py.bak b/instrumentation/tribler-mod/Tribler/Main/metadata-injector.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/metadata-injector.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/metadata-injector.py.bak

diff --git a/tribler-mod/Tribler/Main/notification.py b/instrumentation/tribler-mod/Tribler/Main/notification.py
similarity index 100%
rename from tribler-mod/Tribler/Main/notification.py
rename to instrumentation/tribler-mod/Tribler/Main/notification.py

diff --git a/tribler-mod/Tribler/Main/notification.py.bak b/instrumentation/tribler-mod/Tribler/Main/notification.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/notification.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/notification.py.bak

diff --git a/tribler-mod/Tribler/Main/tribler.py b/instrumentation/tribler-mod/Tribler/Main/tribler.py
similarity index 100%
rename from tribler-mod/Tribler/Main/tribler.py
rename to instrumentation/tribler-mod/Tribler/Main/tribler.py

diff --git a/tribler-mod/Tribler/Main/tribler.py.bak b/instrumentation/tribler-mod/Tribler/Main/tribler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/tribler.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/tribler.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/ColumnHeader.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FilesItemDetailsSummary.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendsItemPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/FriendshipManager.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/GridState.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/GridState.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/GridState.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/GridState.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/GridState.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/GridState.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/GridState.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/GridState.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/GuiUtility.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/IconsManager.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/IconsManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/IconsManager.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/LibraryItemPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/LoadingDetails.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MainFrame.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MainFrame.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MainFrame.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MyFrame.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyFrame.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MyFrame.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyFrame.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MyPlayer.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyPlayer.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MyPlayer.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyPlayer.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MyText.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyText.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MyText.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyText.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/MyText.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyText.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/MyText.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/MyText.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/NewStaticText.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemDetailsSummary.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/PersonsItemPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchDetails.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SearchGridManager.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/SubscriptionsItemPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/Tab_graphs.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/Tab_graphs.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/Tab_graphs.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/Tab_graphs.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TextButton.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextButton.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TextButton.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextButton.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TextButton.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextButton.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TextButton.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextButton.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TextEdit.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TextEdit.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TextEdit.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TopSearchPanel.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerProgressbar.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/TriblerStyles.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/__init__.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/__init__.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/__init__.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/__init__.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/bgPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/bgPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/bgPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/btn_DetailsHeader.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/deleteTorrent.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/deleteTorrent.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/deleteTorrent.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/deleteTorrent.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/dummy.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/dummy.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/dummy.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/dummy.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesDetails.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesDetails.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesDetails.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesDetails.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesItemPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filesTab_files.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filesTab_files.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filterStandard.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/filterStandard.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/filterStandard.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/font.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/font.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/font.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/font.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/font.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/font.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/font.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/font.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/None.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/None.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/None.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/None.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRgradient_new_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRind2_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_left.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_left.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_left.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_left.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_right.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_right.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_right.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/SRindicator_right.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/advanced_filtering.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/advanced_filtering.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/advanced_filtering.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/advanced_filtering.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/average_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/average_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/average_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/average_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/black_spacer.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/black_spacer.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/black_spacer.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/black_spacer.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/files_friends.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/files_friends.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/files_friends.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/files_friends.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/go.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/go.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/go.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/go.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/good_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/good_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/good_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/good_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/help.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/help_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/help_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/iconSaved.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/iconSaved.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/iconSaved.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/iconSaved.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/left.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/left.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/left.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/left.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/line3.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/line3.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/line3.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/line3.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/poor_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/poor_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/poor_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/poor_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/right.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/right.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/right.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/right.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_files.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_files.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_files.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_files.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new.gif b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new.gif
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new.gif
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new.gif

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new_windows.gif b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new_windows.gif
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new_windows.gif
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/search_new_windows.gif

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/seperator_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/sharing_reputation_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/top_image.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/top_image.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/top_image.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/top_image.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/video.gif b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/video.gif
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/video.gif
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/video.gif

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/welcome.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/welcome.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/welcome.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/welcome.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBL.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBL.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBL.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBL.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBR.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBR.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBR.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorBR.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTL.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTL.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTL.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTL.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTR.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTR.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTR.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/5.0/wrapCorTR.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Save.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Save.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Save.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Save.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Save_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Save_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Save_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Save_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Search_new.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Search_new.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Search_new_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/Search_new_win_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/basic.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basic.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/basic.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basic.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basicEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/basic_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basic_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/basic_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/basic_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/bcicon.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/bcicon.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/bcicon.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/bcicon.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/black_top_left.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/black_top_left.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/black_top_left.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/black_top_left.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/black_top_right.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/black_top_right.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/black_top_right.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/black_top_right.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/blue_long.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/blue_long.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/blue_long.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/blue_long.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/browse.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/browse.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/browse.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/browse.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/browse_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/browse_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/browse_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/browse_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbFriends.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbFriends.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbFriends.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbFriends.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_audio.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_audio.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_audio.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_audio.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_compressed.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_compressed.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_compressed.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_compressed.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_hidden.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_hidden.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_hidden.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_hidden.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_other.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_other.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_other.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_other.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_video.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_video.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_video.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_video.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_xxx.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_xxx.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_xxx.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbL_xxx.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbLibrary.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbLibrary.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbLibrary.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbLibrary.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeer.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeer.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeer.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeer.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeerS.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeerS.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeerS.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbPeerS.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_audio.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_audio.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_audio.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_audio.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_compressed.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_compressed.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_compressed.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_compressed.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_hidden.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_hidden.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_hidden.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_hidden.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_other.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_other.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_other.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_other.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_video.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_video.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_video.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_video.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_xxx.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_xxx.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_xxx.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumbS_xxx.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_audio.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_audio.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_audio.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_audio.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_compressed.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_compressed.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_compressed.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_compressed.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_hidden.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_hidden.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_hidden.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_hidden.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_other.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_other.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_other.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_other.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_video.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_video.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_video.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_video.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_xxx.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_xxx.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_xxx.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/defaultThumb_xxx.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/download.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/download.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/download.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/download.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/download_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/download_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/download_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/download_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/edit.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/edit.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked_old.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked_old.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked_old.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_clicked_old.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/edit_old.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_old.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/edit_old.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/edit_old.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/fake.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fake.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/fake.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fake.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/fake_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fake_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/fake_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fake_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilterEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_winEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/familyfilter_win_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/fiftyUp_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state1.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state1.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state1.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state1.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state3.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state3.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state3.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/firewallStatus_state3.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/go.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/go.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/goEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/goEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/goEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/goEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/go_backup.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go_backup.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/go_backup.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go_backup.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/go_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/go_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/go_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/hline.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hline.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/hline.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hline.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/hundredUp.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/hundredUp_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/hundredUp_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/iconSaved_state3.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/iconSaved_state3.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/iconSaved_state3.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/iconSaved_state3.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/library_play.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/library_play.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/library_play.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/library_play.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/library_play_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/library_play_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/library_play_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/library_play_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/line.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/line.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/line2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/line2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/line3.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line3.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/line3.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line3.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/line4.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line4.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/line4.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/line4.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/logo4video.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/logo4video.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/logo4video2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/logo4video2_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/logo4video2_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mainBG.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mainBG.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mainBG.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mainBG.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mt.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mt.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mt.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mt.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mtEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mt_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mt_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mt_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mt_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mute.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mute.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mute.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mute.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/mute_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mute_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/mute_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/mute_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_filesEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winBlank.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winBlank.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_winBlank.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winBlank.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_winEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/my_files_win_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/my_files_win_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/nextpage.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/nextpage.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/nextpage2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/nextpage2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpageEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/nextpage_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/nextpage_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/nextpage_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/play_button.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/play_button.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/play_button.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/play_button.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/play_button_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/play_button_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/play_button_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/play_button_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playbig.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbig.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playbig.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbig.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbigEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playbig_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbig_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playbig_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playbig_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/playsmallEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity1.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity1.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity1.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity1.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity10.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity10.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity10.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity10.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity3.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity3.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity3.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity3.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity4.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity4.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity4.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity4.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity5.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity5.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity5.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity5.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity6.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity6.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity6.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity6.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity7.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity7.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity7.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity7.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity8.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity8.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity8.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity8.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/popularity9.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity9.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/popularity9.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/popularity9.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/prevpage.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/prevpage.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/prevpage2.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage2.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/prevpage2.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage2.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpageEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/prevpage_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/prevpage_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/prevpage_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/real.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/real.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/real.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/real.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/real_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/real_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/real_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/real_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/remove.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/remove.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/remove.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/remove.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/remove_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/remove_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/remove_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/remove_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/results_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/results_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/results_winBlank.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_winBlank.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/results_winBlank.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_winBlank.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/results_winEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_winEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/results_winEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/results_winEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/search.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/search.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/search.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/search.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/search_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/search_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/search_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/search_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/select_files.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/select_files.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/select_files.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/select_files.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/select_files_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/select_files_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/select_files_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/select_files_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settingsEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_win.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_win.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_win.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_win.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_winBlank.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winBlank.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_winBlank.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winBlank.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_winEnabled_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/settings_win_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_win_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/settings_win_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/settings_win_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/seventyfiveDown_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sixhundreddDown_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/sr_average.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_average.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/sr_average.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_average.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/sr_good.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_good.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/sr_good.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_good.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/sr_poor.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_poor.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/sr_poor.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/sr_poor.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/tenUp.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/tenUp.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/tenUp.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/tenUp.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/tenUp_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/tenUp_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/tenUp_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/tenUp_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/threehundredDown_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/thumb.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/thumb.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/thumb.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/thumb.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/thumbField.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/thumbField.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/thumbField.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/thumbField.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/topBG.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/topBG.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/topBG.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/topBG.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/top_bg.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_bg.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/top_bg.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_bg.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/top_search.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_search.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/top_search.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_search.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/top_search_grey.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_search_grey.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/top_search_grey.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/top_search_grey.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedDown_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/unlimitedUp_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/zeroDown.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/zeroDown_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroDown_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/zeroUp.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp_clicked.png b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/images/zeroUp_clicked.png
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/images/zeroUp_clicked.png

diff --git a/tribler-mod/Tribler/Main/vwxGUI/libraryDetails.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/libraryDetails.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/libraryDetails.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/libraryDetails.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/personsDetails.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsDetails.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/personsDetails.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsDetails.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/personsItem.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsItem.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/personsItem.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsItem.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/personsTab_advanced.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsTab_advanced.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/personsTab_advanced.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/personsTab_advanced.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Download.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Download.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails_Download.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Download.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Files.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Files.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails_Files.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Files.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Persons.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Persons.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails_Persons.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Persons.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Presence.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Presence.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails_Presence.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Presence.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Quality.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Quality.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/profileDetails_Quality.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/profileDetails_Quality.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/settingsOverview.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverview.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/settingsOverview.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverview.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/settingsOverviewPanel.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardDetails.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardDetails.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardDetails.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardFilter.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardFilter.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardFilter.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardGrid.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardGrid.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardGrid.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardOverview.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardOverview.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardOverview.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardPager.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardPager.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardPager.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardPager.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/standardPager.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardPager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/standardPager.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/standardPager.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/statusDownloads.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/statusDownloads.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/statusDownloads.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/statusDownloads.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/subscriptionsDetails.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/subscriptionsDetails.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/subscriptionsDetails.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/subscriptionsDetails.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/tribler_List.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/tribler_List.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_List.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/tribler_topButton.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/uploadTab_details.xrc b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/uploadTab_details.xrc
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/uploadTab_details.xrc
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/uploadTab_details.xrc

diff --git a/tribler-mod/Tribler/Main/vwxGUI/web2.py b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/web2.py
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/web2.py
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/web2.py

diff --git a/tribler-mod/Tribler/Main/vwxGUI/web2.py.bak b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/web2.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/web2.py.bak
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/web2.py.bak

diff --git a/tribler-mod/Tribler/Main/vwxGUI/zudeo_torrent_description.txt b/instrumentation/tribler-mod/Tribler/Main/vwxGUI/zudeo_torrent_description.txt
similarity index 100%
rename from tribler-mod/Tribler/Main/vwxGUI/zudeo_torrent_description.txt
rename to instrumentation/tribler-mod/Tribler/Main/vwxGUI/zudeo_torrent_description.txt

diff --git a/tribler-mod/Tribler/Player/BaseApp.py b/instrumentation/tribler-mod/Tribler/Player/BaseApp.py
similarity index 100%
rename from tribler-mod/Tribler/Player/BaseApp.py
rename to instrumentation/tribler-mod/Tribler/Player/BaseApp.py

diff --git a/tribler-mod/Tribler/Player/BaseApp.py.bak b/instrumentation/tribler-mod/Tribler/Player/BaseApp.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/BaseApp.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/BaseApp.py.bak

diff --git a/tribler-mod/Tribler/Player/Build/Mac/Info.plist b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/Info.plist
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/Info.plist
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/Info.plist

diff --git a/tribler-mod/Tribler/Player/Build/Mac/Makefile b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/Makefile
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/Makefile
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/Makefile

diff --git a/tribler-mod/Tribler/Player/Build/Mac/SLAResources.rsrc b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/SLAResources.rsrc
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/SLAResources.rsrc
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/SLAResources.rsrc

diff --git a/tribler-mod/Tribler/Player/Build/Mac/TriblerDoc.icns b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/TriblerDoc.icns
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/TriblerDoc.icns
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/TriblerDoc.icns

diff --git a/tribler-mod/Tribler/Player/Build/Mac/VolumeIcon.icns b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/VolumeIcon.icns
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/VolumeIcon.icns
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/VolumeIcon.icns

diff --git a/tribler-mod/Tribler/Player/Build/Mac/background.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/background.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/background.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/background.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.psd b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.psd
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/appicon.psd

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_document.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_document.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_document.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_document.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_volumeicon.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_volumeicon.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_volumeicon.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/default_volumeicon.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.psd b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.psd
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/dmgicon.psd

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.png b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.png
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.png
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.png

diff --git a/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.psd b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.psd
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.psd
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/icon_sources/docicon.psd

diff --git a/tribler-mod/Tribler/Player/Build/Mac/mkinstalldirs b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/mkinstalldirs
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/mkinstalldirs
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/mkinstalldirs

diff --git a/tribler-mod/Tribler/Player/Build/Mac/process_libs b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/process_libs
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/process_libs
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/process_libs

diff --git a/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py

diff --git a/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py.bak b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/setuptriblermac.py.bak

diff --git a/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_merge b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_merge
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/smart_lipo_merge
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_merge

diff --git a/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_thin b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_thin
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/smart_lipo_thin
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/smart_lipo_thin

diff --git a/tribler-mod/Tribler/Player/Build/Mac/tribler.icns b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/tribler.icns
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/tribler.icns
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/tribler.icns

diff --git a/tribler-mod/Tribler/Player/Build/Mac/vlc-macosx-compile.patch b/instrumentation/tribler-mod/Tribler/Player/Build/Mac/vlc-macosx-compile.patch
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Mac/vlc-macosx-compile.patch
rename to instrumentation/tribler-mod/Tribler/Player/Build/Mac/vlc-macosx-compile.patch

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/changelog b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/changelog
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/changelog
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/changelog

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/compat b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/compat
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/compat
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/compat

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/control b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/control
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/control
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/control

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/copyright b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/copyright
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/copyright
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/copyright

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/files b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/files
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/files
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/files

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/prerm b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/prerm
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/prerm
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/prerm

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/pycompat b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/pycompat
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/pycompat
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/pycompat

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/rules b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/rules
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/rules
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/rules

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.1 b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.1
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.1
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.1

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.desktop b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.desktop
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.desktop
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.desktop

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.manpages b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.manpages
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.manpages
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.manpages

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.menu b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.menu
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.menu
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.menu

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postinst.debhelper b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postinst.debhelper
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postinst.debhelper
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postinst.debhelper

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postrm.debhelper b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postrm.debhelper
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postrm.debhelper
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.postrm.debhelper

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.sh b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.sh
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.sh
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.sh

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.xpm b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.xpm
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.xpm
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer.xpm

diff --git a/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer_big.xpm b/instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer_big.xpm
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer_big.xpm
rename to instrumentation/tribler-mod/Tribler/Player/Build/Ubuntu/swarmplayer_big.xpm

diff --git a/tribler-mod/Tribler/Player/Build/Win32/heading.bmp b/instrumentation/tribler-mod/Tribler/Player/Build/Win32/heading.bmp
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Win32/heading.bmp
rename to instrumentation/tribler-mod/Tribler/Player/Build/Win32/heading.bmp

diff --git a/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py b/instrumentation/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py
rename to instrumentation/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py

diff --git a/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py.bak b/instrumentation/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/Build/Win32/setuptriblerplay.py.bak

diff --git a/tribler-mod/Tribler/Player/Build/Win32/swarmplayer.exe.manifest b/instrumentation/tribler-mod/Tribler/Player/Build/Win32/swarmplayer.exe.manifest
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Win32/swarmplayer.exe.manifest
rename to instrumentation/tribler-mod/Tribler/Player/Build/Win32/swarmplayer.exe.manifest

diff --git a/tribler-mod/Tribler/Player/Build/Win32/triblerplay.nsi b/instrumentation/tribler-mod/Tribler/Player/Build/Win32/triblerplay.nsi
similarity index 100%
rename from tribler-mod/Tribler/Player/Build/Win32/triblerplay.nsi
rename to instrumentation/tribler-mod/Tribler/Player/Build/Win32/triblerplay.nsi

diff --git a/tribler-mod/Tribler/Player/Reporter.py b/instrumentation/tribler-mod/Tribler/Player/Reporter.py
similarity index 100%
rename from tribler-mod/Tribler/Player/Reporter.py
rename to instrumentation/tribler-mod/Tribler/Player/Reporter.py

diff --git a/tribler-mod/Tribler/Player/Reporter.py.bak b/instrumentation/tribler-mod/Tribler/Player/Reporter.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/Reporter.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/Reporter.py.bak

diff --git a/tribler-mod/Tribler/Player/UtilityStub.py b/instrumentation/tribler-mod/Tribler/Player/UtilityStub.py
similarity index 100%
rename from tribler-mod/Tribler/Player/UtilityStub.py
rename to instrumentation/tribler-mod/Tribler/Player/UtilityStub.py

diff --git a/tribler-mod/Tribler/Player/UtilityStub.py.bak b/instrumentation/tribler-mod/Tribler/Player/UtilityStub.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/UtilityStub.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/UtilityStub.py.bak

diff --git a/tribler-mod/Tribler/Player/__init__.py b/instrumentation/tribler-mod/Tribler/Player/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Player/__init__.py
rename to instrumentation/tribler-mod/Tribler/Player/__init__.py

diff --git a/tribler-mod/Tribler/Player/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Player/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/__init__.py.bak

diff --git a/tribler-mod/Tribler/Player/swarmplayer.py b/instrumentation/tribler-mod/Tribler/Player/swarmplayer.py
similarity index 100%
rename from tribler-mod/Tribler/Player/swarmplayer.py
rename to instrumentation/tribler-mod/Tribler/Player/swarmplayer.py

diff --git a/tribler-mod/Tribler/Player/swarmplayer.py.bak b/instrumentation/tribler-mod/Tribler/Player/swarmplayer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/swarmplayer.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/swarmplayer.py.bak

diff --git a/tribler-mod/Tribler/Player/systray.py b/instrumentation/tribler-mod/Tribler/Player/systray.py
similarity index 100%
rename from tribler-mod/Tribler/Player/systray.py
rename to instrumentation/tribler-mod/Tribler/Player/systray.py

diff --git a/tribler-mod/Tribler/Player/systray.py.bak b/instrumentation/tribler-mod/Tribler/Player/systray.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Player/systray.py.bak
rename to instrumentation/tribler-mod/Tribler/Player/systray.py.bak

diff --git a/tribler-mod/Tribler/Plugin/BackgroundProcess.py b/instrumentation/tribler-mod/Tribler/Plugin/BackgroundProcess.py
similarity index 100%
rename from tribler-mod/Tribler/Plugin/BackgroundProcess.py
rename to instrumentation/tribler-mod/Tribler/Plugin/BackgroundProcess.py

diff --git a/tribler-mod/Tribler/Plugin/BackgroundProcess.py.bak b/instrumentation/tribler-mod/Tribler/Plugin/BackgroundProcess.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Plugin/BackgroundProcess.py.bak
rename to instrumentation/tribler-mod/Tribler/Plugin/BackgroundProcess.py.bak

diff --git a/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py b/instrumentation/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py
similarity index 100%
rename from tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py
rename to instrumentation/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py

diff --git a/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py.bak b/instrumentation/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py.bak
rename to instrumentation/tribler-mod/Tribler/Plugin/Build/Win32/setupBGexe.py.bak

diff --git a/tribler-mod/Tribler/Plugin/pluginemulator-http.py b/instrumentation/tribler-mod/Tribler/Plugin/pluginemulator-http.py
similarity index 100%
rename from tribler-mod/Tribler/Plugin/pluginemulator-http.py
rename to instrumentation/tribler-mod/Tribler/Plugin/pluginemulator-http.py

diff --git a/tribler-mod/Tribler/Plugin/pluginemulator-http.py.bak b/instrumentation/tribler-mod/Tribler/Plugin/pluginemulator-http.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Plugin/pluginemulator-http.py.bak
rename to instrumentation/tribler-mod/Tribler/Plugin/pluginemulator-http.py.bak

diff --git a/tribler-mod/Tribler/Plugin/pluginemulator.py b/instrumentation/tribler-mod/Tribler/Plugin/pluginemulator.py
similarity index 100%
rename from tribler-mod/Tribler/Plugin/pluginemulator.py
rename to instrumentation/tribler-mod/Tribler/Plugin/pluginemulator.py

diff --git a/tribler-mod/Tribler/Plugin/pluginemulator.py.bak b/instrumentation/tribler-mod/Tribler/Plugin/pluginemulator.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Plugin/pluginemulator.py.bak
rename to instrumentation/tribler-mod/Tribler/Plugin/pluginemulator.py.bak

diff --git a/tribler-mod/Tribler/Policies/RateManager.py b/instrumentation/tribler-mod/Tribler/Policies/RateManager.py
similarity index 100%
rename from tribler-mod/Tribler/Policies/RateManager.py
rename to instrumentation/tribler-mod/Tribler/Policies/RateManager.py

diff --git a/tribler-mod/Tribler/Policies/RateManager.py.bak b/instrumentation/tribler-mod/Tribler/Policies/RateManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Policies/RateManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Policies/RateManager.py.bak

diff --git a/tribler-mod/Tribler/Policies/SeedingManager.py b/instrumentation/tribler-mod/Tribler/Policies/SeedingManager.py
similarity index 100%
rename from tribler-mod/Tribler/Policies/SeedingManager.py
rename to instrumentation/tribler-mod/Tribler/Policies/SeedingManager.py

diff --git a/tribler-mod/Tribler/Policies/SeedingManager.py.bak b/instrumentation/tribler-mod/Tribler/Policies/SeedingManager.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Policies/SeedingManager.py.bak
rename to instrumentation/tribler-mod/Tribler/Policies/SeedingManager.py.bak

diff --git a/tribler-mod/Tribler/Policies/UploadLimitation.py b/instrumentation/tribler-mod/Tribler/Policies/UploadLimitation.py
similarity index 100%
rename from tribler-mod/Tribler/Policies/UploadLimitation.py
rename to instrumentation/tribler-mod/Tribler/Policies/UploadLimitation.py

diff --git a/tribler-mod/Tribler/Policies/UploadLimitation.py.bak b/instrumentation/tribler-mod/Tribler/Policies/UploadLimitation.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Policies/UploadLimitation.py.bak
rename to instrumentation/tribler-mod/Tribler/Policies/UploadLimitation.py.bak

diff --git a/tribler-mod/Tribler/Policies/__init__.py b/instrumentation/tribler-mod/Tribler/Policies/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Policies/__init__.py
rename to instrumentation/tribler-mod/Tribler/Policies/__init__.py

diff --git a/tribler-mod/Tribler/Policies/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Policies/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Policies/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Policies/__init__.py.bak

diff --git a/tribler-mod/Tribler/Subscriptions/__init__.py b/instrumentation/tribler-mod/Tribler/Subscriptions/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Subscriptions/__init__.py
rename to instrumentation/tribler-mod/Tribler/Subscriptions/__init__.py

diff --git a/tribler-mod/Tribler/Subscriptions/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Subscriptions/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Subscriptions/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Subscriptions/__init__.py.bak

diff --git a/tribler-mod/Tribler/Subscriptions/rss_client.py b/instrumentation/tribler-mod/Tribler/Subscriptions/rss_client.py
similarity index 100%
rename from tribler-mod/Tribler/Subscriptions/rss_client.py
rename to instrumentation/tribler-mod/Tribler/Subscriptions/rss_client.py

diff --git a/tribler-mod/Tribler/Subscriptions/rss_client.py.bak b/instrumentation/tribler-mod/Tribler/Subscriptions/rss_client.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Subscriptions/rss_client.py.bak
rename to instrumentation/tribler-mod/Tribler/Subscriptions/rss_client.py.bak

diff --git a/tribler-mod/Tribler/Test/API/contentdir/file.txt b/instrumentation/tribler-mod/Tribler/Test/API/contentdir/file.txt
similarity index 100%
rename from tribler-mod/Tribler/Test/API/contentdir/file.txt
rename to instrumentation/tribler-mod/Tribler/Test/API/contentdir/file.txt

diff --git a/tribler-mod/Tribler/Test/API/ec.pem b/instrumentation/tribler-mod/Tribler/Test/API/ec.pem
similarity index 100%
rename from tribler-mod/Tribler/Test/API/ec.pem
rename to instrumentation/tribler-mod/Tribler/Test/API/ec.pem

diff --git a/tribler-mod/Tribler/Test/API/ecpub.pem b/instrumentation/tribler-mod/Tribler/Test/API/ecpub.pem
similarity index 100%
rename from tribler-mod/Tribler/Test/API/ecpub.pem
rename to instrumentation/tribler-mod/Tribler/Test/API/ecpub.pem

diff --git a/tribler-mod/Tribler/Test/API/test_api.bat b/instrumentation/tribler-mod/Tribler/Test/API/test_api.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_api.bat
rename to instrumentation/tribler-mod/Tribler/Test/API/test_api.bat

diff --git a/tribler-mod/Tribler/Test/API/test_api.sh b/instrumentation/tribler-mod/Tribler/Test/API/test_api.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_api.sh
rename to instrumentation/tribler-mod/Tribler/Test/API/test_api.sh

diff --git a/tribler-mod/Tribler/Test/API/test_remote_torrent.py b/instrumentation/tribler-mod/Tribler/Test/API/test_remote_torrent.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_remote_torrent.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_remote_torrent.py

diff --git a/tribler-mod/Tribler/Test/API/test_remote_torrent.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_remote_torrent.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_remote_torrent.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_remote_torrent.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_seeding.py b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding.py

diff --git a/tribler-mod/Tribler/Test/API/test_seeding.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_seeding_live.py b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding_live.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding_live.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding_live.py

diff --git a/tribler-mod/Tribler/Test/API/test_seeding_live.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding_live.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding_live.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding_live.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_seeding_vod.py b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding_vod.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding_vod.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding_vod.py

diff --git a/tribler-mod/Tribler/Test/API/test_seeding_vod.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_seeding_vod.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_seeding_vod.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_seeding_vod.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_tdef.py b/instrumentation/tribler-mod/Tribler/Test/API/test_tdef.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_tdef.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_tdef.py

diff --git a/tribler-mod/Tribler/Test/API/test_tdef.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_tdef.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_tdef.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_tdef.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_tracking.py b/instrumentation/tribler-mod/Tribler/Test/API/test_tracking.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_tracking.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_tracking.py

diff --git a/tribler-mod/Tribler/Test/API/test_tracking.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_tracking.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_tracking.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_tracking.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_upload_limit.py b/instrumentation/tribler-mod/Tribler/Test/API/test_upload_limit.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_upload_limit.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_upload_limit.py

diff --git a/tribler-mod/Tribler/Test/API/test_upload_limit.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_upload_limit.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_upload_limit.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_upload_limit.py.bak

diff --git a/tribler-mod/Tribler/Test/API/test_vod.py b/instrumentation/tribler-mod/Tribler/Test/API/test_vod.py
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_vod.py
rename to instrumentation/tribler-mod/Tribler/Test/API/test_vod.py

diff --git a/tribler-mod/Tribler/Test/API/test_vod.py.bak b/instrumentation/tribler-mod/Tribler/Test/API/test_vod.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/API/test_vod.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/API/test_vod.py.bak

diff --git a/tribler-mod/Tribler/Test/API/thumb.jpg b/instrumentation/tribler-mod/Tribler/Test/API/thumb.jpg
similarity index 100%
rename from tribler-mod/Tribler/Test/API/thumb.jpg
rename to instrumentation/tribler-mod/Tribler/Test/API/thumb.jpg

diff --git a/tribler-mod/Tribler/Test/TESTSUITE.txt b/instrumentation/tribler-mod/Tribler/Test/TESTSUITE.txt
similarity index 100%
rename from tribler-mod/Tribler/Test/TESTSUITE.txt
rename to instrumentation/tribler-mod/Tribler/Test/TESTSUITE.txt

diff --git a/tribler-mod/Tribler/Test/__init__.py b/instrumentation/tribler-mod/Tribler/Test/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Test/__init__.py
rename to instrumentation/tribler-mod/Tribler/Test/__init__.py

diff --git a/tribler-mod/Tribler/Test/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Test/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/__init__.py.bak

diff --git a/tribler-mod/Tribler/Test/bencode.py b/instrumentation/tribler-mod/Tribler/Test/bencode.py
similarity index 100%
rename from tribler-mod/Tribler/Test/bencode.py
rename to instrumentation/tribler-mod/Tribler/Test/bencode.py

diff --git a/tribler-mod/Tribler/Test/bencode.py.bak b/instrumentation/tribler-mod/Tribler/Test/bencode.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/bencode.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/bencode.py.bak

diff --git a/tribler-mod/Tribler/Test/btconn.py b/instrumentation/tribler-mod/Tribler/Test/btconn.py
similarity index 100%
rename from tribler-mod/Tribler/Test/btconn.py
rename to instrumentation/tribler-mod/Tribler/Test/btconn.py

diff --git a/tribler-mod/Tribler/Test/btconn.py.bak b/instrumentation/tribler-mod/Tribler/Test/btconn.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/btconn.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/btconn.py.bak

diff --git a/tribler-mod/Tribler/Test/buddycast_data.py b/instrumentation/tribler-mod/Tribler/Test/buddycast_data.py
similarity index 100%
rename from tribler-mod/Tribler/Test/buddycast_data.py
rename to instrumentation/tribler-mod/Tribler/Test/buddycast_data.py

diff --git a/tribler-mod/Tribler/Test/buddycast_data.py.bak b/instrumentation/tribler-mod/Tribler/Test/buddycast_data.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/buddycast_data.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/buddycast_data.py.bak

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/bak_multiple.torrent b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_multiple.torrent
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/bak_multiple.torrent
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_multiple.torrent

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/bak_single.torrent b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_single.torrent
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/bak_single.torrent
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_single.torrent

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/bak_tribler.tar.gz b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_tribler.tar.gz
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/bak_tribler.tar.gz
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bak_tribler.tar.gz

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/bsddb.tar.gz b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bsddb.tar.gz
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/bsddb.tar.gz
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/bsddb.tar.gz

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/superpeer120070902sp7001.log b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/superpeer120070902sp7001.log
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/superpeer120070902sp7001.log
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/superpeer120070902sp7001.log

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/url_to_bsddb.txt b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/url_to_bsddb.txt
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/url_to_bsddb.txt
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/url_to_bsddb.txt

diff --git a/tribler-mod/Tribler/Test/extend_db_dir/url_to_tribler.sdb.txt b/instrumentation/tribler-mod/Tribler/Test/extend_db_dir/url_to_tribler.sdb.txt
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_db_dir/url_to_tribler.sdb.txt
rename to instrumentation/tribler-mod/Tribler/Test/extend_db_dir/url_to_tribler.sdb.txt

diff --git a/tribler-mod/Tribler/Test/extend_hs_dir/dummydata.merkle.torrent b/instrumentation/tribler-mod/Tribler/Test/extend_hs_dir/dummydata.merkle.torrent
similarity index 100%
rename from tribler-mod/Tribler/Test/extend_hs_dir/dummydata.merkle.torrent
rename to instrumentation/tribler-mod/Tribler/Test/extend_hs_dir/dummydata.merkle.torrent

diff --git a/tribler-mod/Tribler/Test/log_parser.py b/instrumentation/tribler-mod/Tribler/Test/log_parser.py
similarity index 100%
rename from tribler-mod/Tribler/Test/log_parser.py
rename to instrumentation/tribler-mod/Tribler/Test/log_parser.py

diff --git a/tribler-mod/Tribler/Test/log_parser.py.bak b/instrumentation/tribler-mod/Tribler/Test/log_parser.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/log_parser.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/log_parser.py.bak

diff --git a/tribler-mod/Tribler/Test/olconn.py b/instrumentation/tribler-mod/Tribler/Test/olconn.py
similarity index 100%
rename from tribler-mod/Tribler/Test/olconn.py
rename to instrumentation/tribler-mod/Tribler/Test/olconn.py

diff --git a/tribler-mod/Tribler/Test/olconn.py.bak b/instrumentation/tribler-mod/Tribler/Test/olconn.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/olconn.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/olconn.py.bak

diff --git a/tribler-mod/Tribler/Test/test.bat b/instrumentation/tribler-mod/Tribler/Test/test.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test.bat
rename to instrumentation/tribler-mod/Tribler/Test/test.bat

diff --git a/tribler-mod/Tribler/Test/test.sh b/instrumentation/tribler-mod/Tribler/Test/test.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test.sh
rename to instrumentation/tribler-mod/Tribler/Test/test.sh

diff --git a/tribler-mod/Tribler/Test/test_TimedTaskQueue.py b/instrumentation/tribler-mod/Tribler/Test/test_TimedTaskQueue.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_TimedTaskQueue.py
rename to instrumentation/tribler-mod/Tribler/Test/test_TimedTaskQueue.py

diff --git a/tribler-mod/Tribler/Test/test_TimedTaskQueue.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_TimedTaskQueue.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_TimedTaskQueue.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_TimedTaskQueue.py.bak

diff --git a/tribler-mod/Tribler/Test/test_as_server.py b/instrumentation/tribler-mod/Tribler/Test/test_as_server.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_as_server.py
rename to instrumentation/tribler-mod/Tribler/Test/test_as_server.py

diff --git a/tribler-mod/Tribler/Test/test_as_server.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_as_server.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_as_server.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_as_server.py.bak

diff --git a/tribler-mod/Tribler/Test/test_bartercast.py b/instrumentation/tribler-mod/Tribler/Test/test_bartercast.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_bartercast.py
rename to instrumentation/tribler-mod/Tribler/Test/test_bartercast.py

diff --git a/tribler-mod/Tribler/Test/test_bartercast.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_bartercast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_bartercast.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_bartercast.py.bak

diff --git a/tribler-mod/Tribler/Test/test_bsddb2sqlite.py b/instrumentation/tribler-mod/Tribler/Test/test_bsddb2sqlite.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_bsddb2sqlite.py
rename to instrumentation/tribler-mod/Tribler/Test/test_bsddb2sqlite.py

diff --git a/tribler-mod/Tribler/Test/test_bsddb2sqlite.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_bsddb2sqlite.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_bsddb2sqlite.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_bsddb2sqlite.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast.py b/instrumentation/tribler-mod/Tribler/Test/test_buddycast.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast.py
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast.py

diff --git a/tribler-mod/Tribler/Test/test_buddycast.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_buddycast.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast2_datahandler.bat b/instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast2_datahandler.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.bat

diff --git a/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py b/instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast2_datahandler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py

diff --git a/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast2_datahandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast2_datahandler.sh b/instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast2_datahandler.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast2_datahandler.sh

diff --git a/tribler-mod/Tribler/Test/test_buddycast4.py b/instrumentation/tribler-mod/Tribler/Test/test_buddycast4.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast4.py
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast4.py

diff --git a/tribler-mod/Tribler/Test/test_buddycast4.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_buddycast4.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast4.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast4.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py b/instrumentation/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast4_stresstest.py
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py

diff --git a/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast4_stresstest.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast4_stresstest.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast_msg.bat b/instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast_msg.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.bat

diff --git a/tribler-mod/Tribler/Test/test_buddycast_msg.py b/instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast_msg.py
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.py

diff --git a/tribler-mod/Tribler/Test/test_buddycast_msg.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast_msg.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.py.bak

diff --git a/tribler-mod/Tribler/Test/test_buddycast_msg.sh b/instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_buddycast_msg.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_buddycast_msg.sh

diff --git a/tribler-mod/Tribler/Test/test_cachedb.py b/instrumentation/tribler-mod/Tribler/Test/test_cachedb.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_cachedb.py
rename to instrumentation/tribler-mod/Tribler/Test/test_cachedb.py

diff --git a/tribler-mod/Tribler/Test/test_cachedb.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_cachedb.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_cachedb.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_cachedb.py.bak

diff --git a/tribler-mod/Tribler/Test/test_cachedbhandler.py b/instrumentation/tribler-mod/Tribler/Test/test_cachedbhandler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_cachedbhandler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_cachedbhandler.py

diff --git a/tribler-mod/Tribler/Test/test_cachedbhandler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_cachedbhandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_cachedbhandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_cachedbhandler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_connect_overlay.py b/instrumentation/tribler-mod/Tribler/Test/test_connect_overlay.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_connect_overlay.py
rename to instrumentation/tribler-mod/Tribler/Test/test_connect_overlay.py

diff --git a/tribler-mod/Tribler/Test/test_connect_overlay.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_connect_overlay.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_connect_overlay.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_connect_overlay.py.bak

diff --git a/tribler-mod/Tribler/Test/test_crawler.py b/instrumentation/tribler-mod/Tribler/Test/test_crawler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_crawler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_crawler.py

diff --git a/tribler-mod/Tribler/Test/test_crawler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_crawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_crawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_crawler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dialback_conn_handler.bat b/instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_conn_handler.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.bat

diff --git a/tribler-mod/Tribler/Test/test_dialback_conn_handler.py b/instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_conn_handler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.py

diff --git a/tribler-mod/Tribler/Test/test_dialback_conn_handler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_conn_handler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dialback_conn_handler.sh b/instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_conn_handler.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_conn_handler.sh

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active.bat b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.bat

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active.py b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active.py
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.py

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active.sh b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active.sh

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active2.py b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active2.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active2.py
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active2.py

diff --git a/tribler-mod/Tribler/Test/test_dialback_reply_active2.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active2.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_reply_active2.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_reply_active2.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dialback_request.py b/instrumentation/tribler-mod/Tribler/Test/test_dialback_request.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_request.py
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_request.py

diff --git a/tribler-mod/Tribler/Test/test_dialback_request.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_dialback_request.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dialback_request.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_dialback_request.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dlhelp.bat b/instrumentation/tribler-mod/Tribler/Test/test_dlhelp.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dlhelp.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_dlhelp.bat

diff --git a/tribler-mod/Tribler/Test/test_dlhelp.py b/instrumentation/tribler-mod/Tribler/Test/test_dlhelp.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dlhelp.py
rename to instrumentation/tribler-mod/Tribler/Test/test_dlhelp.py

diff --git a/tribler-mod/Tribler/Test/test_dlhelp.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_dlhelp.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dlhelp.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_dlhelp.py.bak

diff --git a/tribler-mod/Tribler/Test/test_dlhelp.sh b/instrumentation/tribler-mod/Tribler/Test/test_dlhelp.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_dlhelp.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_dlhelp.sh

diff --git a/tribler-mod/Tribler/Test/test_extend_hs.py b/instrumentation/tribler-mod/Tribler/Test/test_extend_hs.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_extend_hs.py
rename to instrumentation/tribler-mod/Tribler/Test/test_extend_hs.py

diff --git a/tribler-mod/Tribler/Test/test_extend_hs.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_extend_hs.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_extend_hs.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_extend_hs.py.bak

diff --git a/tribler-mod/Tribler/Test/test_extend_hs_t350.py b/instrumentation/tribler-mod/Tribler/Test/test_extend_hs_t350.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_extend_hs_t350.py
rename to instrumentation/tribler-mod/Tribler/Test/test_extend_hs_t350.py

diff --git a/tribler-mod/Tribler/Test/test_extend_hs_t350.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_extend_hs_t350.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_extend_hs_t350.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_extend_hs_t350.py.bak

diff --git a/tribler-mod/Tribler/Test/test_friend.py b/instrumentation/tribler-mod/Tribler/Test/test_friend.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friend.py
rename to instrumentation/tribler-mod/Tribler/Test/test_friend.py

diff --git a/tribler-mod/Tribler/Test/test_friend.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_friend.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friend.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_friend.py.bak

diff --git a/tribler-mod/Tribler/Test/test_friendship.bat b/instrumentation/tribler-mod/Tribler/Test/test_friendship.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship.bat

diff --git a/tribler-mod/Tribler/Test/test_friendship.py b/instrumentation/tribler-mod/Tribler/Test/test_friendship.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship.py
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship.py

diff --git a/tribler-mod/Tribler/Test/test_friendship.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_friendship.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship.py.bak

diff --git a/tribler-mod/Tribler/Test/test_friendship.sh b/instrumentation/tribler-mod/Tribler/Test/test_friendship.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship.sh

diff --git a/tribler-mod/Tribler/Test/test_friendship_crawler.py b/instrumentation/tribler-mod/Tribler/Test/test_friendship_crawler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship_crawler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship_crawler.py

diff --git a/tribler-mod/Tribler/Test/test_friendship_crawler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_friendship_crawler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_friendship_crawler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_friendship_crawler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_g2g.py b/instrumentation/tribler-mod/Tribler/Test/test_g2g.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_g2g.py
rename to instrumentation/tribler-mod/Tribler/Test/test_g2g.py

diff --git a/tribler-mod/Tribler/Test/test_g2g.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_g2g.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_g2g.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_g2g.py.bak

diff --git a/tribler-mod/Tribler/Test/test_gui_server.py b/instrumentation/tribler-mod/Tribler/Test/test_gui_server.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_gui_server.py
rename to instrumentation/tribler-mod/Tribler/Test/test_gui_server.py

diff --git a/tribler-mod/Tribler/Test/test_gui_server.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_gui_server.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_gui_server.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_gui_server.py.bak

diff --git a/tribler-mod/Tribler/Test/test_merkle.py b/instrumentation/tribler-mod/Tribler/Test/test_merkle.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_merkle.py
rename to instrumentation/tribler-mod/Tribler/Test/test_merkle.py

diff --git a/tribler-mod/Tribler/Test/test_merkle.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_merkle.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_merkle.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_merkle.py.bak

diff --git a/tribler-mod/Tribler/Test/test_na_extend_hs.py b/instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_na_extend_hs.py
rename to instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.py

diff --git a/tribler-mod/Tribler/Test/test_na_extend_hs.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_na_extend_hs.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.py.bak

diff --git a/tribler-mod/Tribler/Test/test_na_extend_hs.sh b/instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_na_extend_hs.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_na_extend_hs.sh

diff --git a/tribler-mod/Tribler/Test/test_natcheck.py b/instrumentation/tribler-mod/Tribler/Test/test_natcheck.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_natcheck.py
rename to instrumentation/tribler-mod/Tribler/Test/test_natcheck.py

diff --git a/tribler-mod/Tribler/Test/test_natcheck.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_natcheck.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_natcheck.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_natcheck.py.bak

diff --git a/tribler-mod/Tribler/Test/test_osutils.py b/instrumentation/tribler-mod/Tribler/Test/test_osutils.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_osutils.py
rename to instrumentation/tribler-mod/Tribler/Test/test_osutils.py

diff --git a/tribler-mod/Tribler/Test/test_osutils.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_osutils.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_osutils.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_osutils.py.bak

diff --git a/tribler-mod/Tribler/Test/test_overlay_bridge.py b/instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_overlay_bridge.py
rename to instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.py

diff --git a/tribler-mod/Tribler/Test/test_overlay_bridge.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_overlay_bridge.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.py.bak

diff --git a/tribler-mod/Tribler/Test/test_overlay_bridge.sh b/instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_overlay_bridge.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_overlay_bridge.sh

diff --git a/tribler-mod/Tribler/Test/test_permid.py b/instrumentation/tribler-mod/Tribler/Test/test_permid.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_permid.py
rename to instrumentation/tribler-mod/Tribler/Test/test_permid.py

diff --git a/tribler-mod/Tribler/Test/test_permid.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_permid.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_permid.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_permid.py.bak

diff --git a/tribler-mod/Tribler/Test/test_permid_response1.py b/instrumentation/tribler-mod/Tribler/Test/test_permid_response1.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_permid_response1.py
rename to instrumentation/tribler-mod/Tribler/Test/test_permid_response1.py

diff --git a/tribler-mod/Tribler/Test/test_permid_response1.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_permid_response1.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_permid_response1.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_permid_response1.py.bak

diff --git a/tribler-mod/Tribler/Test/test_remote_query.py b/instrumentation/tribler-mod/Tribler/Test/test_remote_query.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_remote_query.py
rename to instrumentation/tribler-mod/Tribler/Test/test_remote_query.py

diff --git a/tribler-mod/Tribler/Test/test_remote_query.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_remote_query.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_remote_query.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_remote_query.py.bak

diff --git a/tribler-mod/Tribler/Test/test_rquery_reply_active.bat b/instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_rquery_reply_active.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.bat

diff --git a/tribler-mod/Tribler/Test/test_rquery_reply_active.py b/instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_rquery_reply_active.py
rename to instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.py

diff --git a/tribler-mod/Tribler/Test/test_rquery_reply_active.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_rquery_reply_active.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.py.bak

diff --git a/tribler-mod/Tribler/Test/test_rquery_reply_active.sh b/instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_rquery_reply_active.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_rquery_reply_active.sh

diff --git a/tribler-mod/Tribler/Test/test_secure_overlay.bat b/instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.bat
similarity index 100%
rename from tribler-mod/Tribler/Test/test_secure_overlay.bat
rename to instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.bat

diff --git a/tribler-mod/Tribler/Test/test_secure_overlay.py b/instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_secure_overlay.py
rename to instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.py

diff --git a/tribler-mod/Tribler/Test/test_secure_overlay.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_secure_overlay.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.py.bak

diff --git a/tribler-mod/Tribler/Test/test_secure_overlay.sh b/instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_secure_overlay.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_secure_overlay.sh

diff --git a/tribler-mod/Tribler/Test/test_seeding_stats.py b/instrumentation/tribler-mod/Tribler/Test/test_seeding_stats.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_seeding_stats.py
rename to instrumentation/tribler-mod/Tribler/Test/test_seeding_stats.py

diff --git a/tribler-mod/Tribler/Test/test_seeding_stats.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_seeding_stats.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_seeding_stats.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_seeding_stats.py.bak

diff --git a/tribler-mod/Tribler/Test/test_sim.py b/instrumentation/tribler-mod/Tribler/Test/test_sim.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sim.py
rename to instrumentation/tribler-mod/Tribler/Test/test_sim.py

diff --git a/tribler-mod/Tribler/Test/test_sim.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_sim.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sim.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_sim.py.bak

diff --git a/tribler-mod/Tribler/Test/test_social_overlap.py b/instrumentation/tribler-mod/Tribler/Test/test_social_overlap.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_social_overlap.py
rename to instrumentation/tribler-mod/Tribler/Test/test_social_overlap.py

diff --git a/tribler-mod/Tribler/Test/test_social_overlap.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_social_overlap.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_social_overlap.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_social_overlap.py.bak

diff --git a/tribler-mod/Tribler/Test/test_sqlitecachedb.py b/instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedb.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sqlitecachedb.py
rename to instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedb.py

diff --git a/tribler-mod/Tribler/Test/test_sqlitecachedb.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedb.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sqlitecachedb.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedb.py.bak

diff --git a/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py b/instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py
rename to instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py

diff --git a/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.py.bak

diff --git a/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.sh b/instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.sh
similarity index 100%
rename from tribler-mod/Tribler/Test/test_sqlitecachedbhandler.sh
rename to instrumentation/tribler-mod/Tribler/Test/test_sqlitecachedbhandler.sh

diff --git a/tribler-mod/Tribler/Test/test_superpeers.py b/instrumentation/tribler-mod/Tribler/Test/test_superpeers.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_superpeers.py
rename to instrumentation/tribler-mod/Tribler/Test/test_superpeers.py

diff --git a/tribler-mod/Tribler/Test/test_superpeers.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_superpeers.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_superpeers.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_superpeers.py.bak

diff --git a/tribler-mod/Tribler/Test/test_torrentcollecting.py b/instrumentation/tribler-mod/Tribler/Test/test_torrentcollecting.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_torrentcollecting.py
rename to instrumentation/tribler-mod/Tribler/Test/test_torrentcollecting.py

diff --git a/tribler-mod/Tribler/Test/test_torrentcollecting.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_torrentcollecting.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_torrentcollecting.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_torrentcollecting.py.bak

diff --git a/tribler-mod/Tribler/Test/test_tracker_checking.py b/instrumentation/tribler-mod/Tribler/Test/test_tracker_checking.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_tracker_checking.py
rename to instrumentation/tribler-mod/Tribler/Test/test_tracker_checking.py

diff --git a/tribler-mod/Tribler/Test/test_tracker_checking.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_tracker_checking.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_tracker_checking.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_tracker_checking.py.bak

diff --git a/tribler-mod/Tribler/Test/test_ut_pex.py b/instrumentation/tribler-mod/Tribler/Test/test_ut_pex.py
similarity index 100%
rename from tribler-mod/Tribler/Test/test_ut_pex.py
rename to instrumentation/tribler-mod/Tribler/Test/test_ut_pex.py

diff --git a/tribler-mod/Tribler/Test/test_ut_pex.py.bak b/instrumentation/tribler-mod/Tribler/Test/test_ut_pex.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Test/test_ut_pex.py.bak
rename to instrumentation/tribler-mod/Tribler/Test/test_ut_pex.py.bak

diff --git a/tribler-mod/Tribler/Test/testdata.txt b/instrumentation/tribler-mod/Tribler/Test/testdata.txt
similarity index 100%
rename from tribler-mod/Tribler/Test/testdata.txt
rename to instrumentation/tribler-mod/Tribler/Test/testdata.txt

diff --git a/tribler-mod/Tribler/Test/usericon-ok.jpg b/instrumentation/tribler-mod/Tribler/Test/usericon-ok.jpg
similarity index 100%
rename from tribler-mod/Tribler/Test/usericon-ok.jpg
rename to instrumentation/tribler-mod/Tribler/Test/usericon-ok.jpg

diff --git a/tribler-mod/Tribler/Tools/__init__.py b/instrumentation/tribler-mod/Tribler/Tools/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/__init__.py
rename to instrumentation/tribler-mod/Tribler/Tools/__init__.py

diff --git a/tribler-mod/Tribler/Tools/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Tools/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/__init__.py.bak

diff --git a/tribler-mod/Tribler/Tools/addplaytime.py b/instrumentation/tribler-mod/Tribler/Tools/addplaytime.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/addplaytime.py
rename to instrumentation/tribler-mod/Tribler/Tools/addplaytime.py

diff --git a/tribler-mod/Tribler/Tools/addplaytime.py.bak b/instrumentation/tribler-mod/Tribler/Tools/addplaytime.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/addplaytime.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/addplaytime.py.bak

diff --git a/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py b/instrumentation/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/bitbucket-live-noauth.py
rename to instrumentation/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py

diff --git a/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py.bak b/instrumentation/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/bitbucket-live-noauth.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/bitbucket-live-noauth.py.bak

diff --git a/tribler-mod/Tribler/Tools/bitbucket-live.py b/instrumentation/tribler-mod/Tribler/Tools/bitbucket-live.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/bitbucket-live.py
rename to instrumentation/tribler-mod/Tribler/Tools/bitbucket-live.py

diff --git a/tribler-mod/Tribler/Tools/bitbucket-live.py.bak b/instrumentation/tribler-mod/Tribler/Tools/bitbucket-live.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/bitbucket-live.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/bitbucket-live.py.bak

diff --git a/tribler-mod/Tribler/Tools/btshowmetainfo.py b/instrumentation/tribler-mod/Tribler/Tools/btshowmetainfo.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/btshowmetainfo.py
rename to instrumentation/tribler-mod/Tribler/Tools/btshowmetainfo.py

diff --git a/tribler-mod/Tribler/Tools/btshowmetainfo.py.bak b/instrumentation/tribler-mod/Tribler/Tools/btshowmetainfo.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/btshowmetainfo.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/btshowmetainfo.py.bak

diff --git a/tribler-mod/Tribler/Tools/cmdlinedl.py b/instrumentation/tribler-mod/Tribler/Tools/cmdlinedl.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/cmdlinedl.py
rename to instrumentation/tribler-mod/Tribler/Tools/cmdlinedl.py

diff --git a/tribler-mod/Tribler/Tools/cmdlinedl.py.bak b/instrumentation/tribler-mod/Tribler/Tools/cmdlinedl.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/cmdlinedl.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/cmdlinedl.py.bak

diff --git a/tribler-mod/Tribler/Tools/createlivestream-noauth.py b/instrumentation/tribler-mod/Tribler/Tools/createlivestream-noauth.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/createlivestream-noauth.py
rename to instrumentation/tribler-mod/Tribler/Tools/createlivestream-noauth.py

diff --git a/tribler-mod/Tribler/Tools/createlivestream-noauth.py.bak b/instrumentation/tribler-mod/Tribler/Tools/createlivestream-noauth.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/createlivestream-noauth.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/createlivestream-noauth.py.bak

diff --git a/tribler-mod/Tribler/Tools/createlivestream.py b/instrumentation/tribler-mod/Tribler/Tools/createlivestream.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/createlivestream.py
rename to instrumentation/tribler-mod/Tribler/Tools/createlivestream.py

diff --git a/tribler-mod/Tribler/Tools/createlivestream.py.bak b/instrumentation/tribler-mod/Tribler/Tools/createlivestream.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/createlivestream.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/createlivestream.py.bak

diff --git a/tribler-mod/Tribler/Tools/dirtrackerseeder.py b/instrumentation/tribler-mod/Tribler/Tools/dirtrackerseeder.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/dirtrackerseeder.py
rename to instrumentation/tribler-mod/Tribler/Tools/dirtrackerseeder.py

diff --git a/tribler-mod/Tribler/Tools/dirtrackerseeder.py.bak b/instrumentation/tribler-mod/Tribler/Tools/dirtrackerseeder.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/dirtrackerseeder.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/dirtrackerseeder.py.bak

diff --git a/tribler-mod/Tribler/Tools/pipe-arnocam-home.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-arnocam-home.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-arnocam-home.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-arnocam-home.sh

diff --git a/tribler-mod/Tribler/Tools/pipe-arnocam-jip.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-arnocam-jip.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-arnocam-jip.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-arnocam-jip.sh

diff --git a/tribler-mod/Tribler/Tools/pipe-babscam-h264-aac-gop-sync.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-aac-gop-sync.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-babscam-h264-aac-gop-sync.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-aac-gop-sync.sh

diff --git a/tribler-mod/Tribler/Tools/pipe-babscam-h264-mp3.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-mp3.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-babscam-h264-mp3.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-mp3.sh

diff --git a/tribler-mod/Tribler/Tools/pipe-babscam-h264-nosound-mencoder.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-nosound-mencoder.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-babscam-h264-nosound-mencoder.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-h264-nosound-mencoder.sh

diff --git a/tribler-mod/Tribler/Tools/pipe-babscam-mpeg4-mp3-sync.sh b/instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-mpeg4-mp3-sync.sh
similarity index 100%
rename from tribler-mod/Tribler/Tools/pipe-babscam-mpeg4-mp3-sync.sh
rename to instrumentation/tribler-mod/Tribler/Tools/pipe-babscam-mpeg4-mp3-sync.sh

diff --git a/tribler-mod/Tribler/Tools/superpeer.py b/instrumentation/tribler-mod/Tribler/Tools/superpeer.py
similarity index 100%
rename from tribler-mod/Tribler/Tools/superpeer.py
rename to instrumentation/tribler-mod/Tribler/Tools/superpeer.py

diff --git a/tribler-mod/Tribler/Tools/superpeer.py.bak b/instrumentation/tribler-mod/Tribler/Tools/superpeer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Tools/superpeer.py.bak
rename to instrumentation/tribler-mod/Tribler/Tools/superpeer.py.bak

diff --git a/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py b/instrumentation/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/TorrentChecking.py
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py

diff --git a/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py.bak b/instrumentation/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py.bak
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/TorrentChecking.py.bak
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/TorrentChecking.py.bak

diff --git a/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py b/instrumentation/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/TrackerChecking.py
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py

diff --git a/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py.bak b/instrumentation/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py.bak
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/TrackerChecking.py.bak
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/TrackerChecking.py.bak

diff --git a/tribler-mod/Tribler/TrackerChecking/__init__.py b/instrumentation/tribler-mod/Tribler/TrackerChecking/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/__init__.py
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/__init__.py

diff --git a/tribler-mod/Tribler/TrackerChecking/__init__.py.bak b/instrumentation/tribler-mod/Tribler/TrackerChecking/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/TrackerChecking/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/TrackerChecking/__init__.py.bak

diff --git a/tribler-mod/Tribler/Utilities/Instance2Instance.py b/instrumentation/tribler-mod/Tribler/Utilities/Instance2Instance.py
similarity index 100%
rename from tribler-mod/Tribler/Utilities/Instance2Instance.py
rename to instrumentation/tribler-mod/Tribler/Utilities/Instance2Instance.py

diff --git a/tribler-mod/Tribler/Utilities/Instance2Instance.py.bak b/instrumentation/tribler-mod/Tribler/Utilities/Instance2Instance.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Utilities/Instance2Instance.py.bak
rename to instrumentation/tribler-mod/Tribler/Utilities/Instance2Instance.py.bak

diff --git a/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py b/instrumentation/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py
similarity index 100%
rename from tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py
rename to instrumentation/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py

diff --git a/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py.bak b/instrumentation/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py.bak
rename to instrumentation/tribler-mod/Tribler/Utilities/LinuxSingleInstanceChecker.py.bak

diff --git a/tribler-mod/Tribler/Utilities/TimedTaskQueue.py b/instrumentation/tribler-mod/Tribler/Utilities/TimedTaskQueue.py
similarity index 100%
rename from tribler-mod/Tribler/Utilities/TimedTaskQueue.py
rename to instrumentation/tribler-mod/Tribler/Utilities/TimedTaskQueue.py

diff --git a/tribler-mod/Tribler/Utilities/TimedTaskQueue.py.bak b/instrumentation/tribler-mod/Tribler/Utilities/TimedTaskQueue.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Utilities/TimedTaskQueue.py.bak
rename to instrumentation/tribler-mod/Tribler/Utilities/TimedTaskQueue.py.bak

diff --git a/tribler-mod/Tribler/Utilities/__init__.py b/instrumentation/tribler-mod/Tribler/Utilities/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Utilities/__init__.py
rename to instrumentation/tribler-mod/Tribler/Utilities/__init__.py

diff --git a/tribler-mod/Tribler/Utilities/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Utilities/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Utilities/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Utilities/__init__.py.bak

diff --git a/tribler-mod/Tribler/Utilities/configreader.py b/instrumentation/tribler-mod/Tribler/Utilities/configreader.py
similarity index 100%
rename from tribler-mod/Tribler/Utilities/configreader.py
rename to instrumentation/tribler-mod/Tribler/Utilities/configreader.py

diff --git a/tribler-mod/Tribler/Utilities/configreader.py.bak b/instrumentation/tribler-mod/Tribler/Utilities/configreader.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Utilities/configreader.py.bak
rename to instrumentation/tribler-mod/Tribler/Utilities/configreader.py.bak

diff --git a/tribler-mod/Tribler/Video/Buttons.py b/instrumentation/tribler-mod/Tribler/Video/Buttons.py
similarity index 100%
rename from tribler-mod/Tribler/Video/Buttons.py
rename to instrumentation/tribler-mod/Tribler/Video/Buttons.py

diff --git a/tribler-mod/Tribler/Video/Buttons.py.bak b/instrumentation/tribler-mod/Tribler/Video/Buttons.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/Buttons.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/Buttons.py.bak

diff --git a/tribler-mod/Tribler/Video/EmbeddedPlayer.py b/instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer.py
similarity index 100%
rename from tribler-mod/Tribler/Video/EmbeddedPlayer.py
rename to instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer.py

diff --git a/tribler-mod/Tribler/Video/EmbeddedPlayer.py.bak b/instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/EmbeddedPlayer.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer.py.bak

diff --git a/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py b/instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py
similarity index 100%
rename from tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py
rename to instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py

diff --git a/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py.bak b/instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/EmbeddedPlayer4Frame.py.bak

diff --git a/tribler-mod/Tribler/Video/Images/4framebackground.png b/instrumentation/tribler-mod/Tribler/Video/Images/4framebackground.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/4framebackground.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/4framebackground.png

diff --git a/tribler-mod/Tribler/Video/Images/4framesliderDot.png b/instrumentation/tribler-mod/Tribler/Video/Images/4framesliderDot.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/4framesliderDot.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/4framesliderDot.png

diff --git a/tribler-mod/Tribler/Video/Images/4framesliderDot_dis.png b/instrumentation/tribler-mod/Tribler/Video/Images/4framesliderDot_dis.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/4framesliderDot_dis.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/4framesliderDot_dis.png

diff --git a/tribler-mod/Tribler/Video/Images/4framesliderVolume.png b/instrumentation/tribler-mod/Tribler/Video/Images/4framesliderVolume.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/4framesliderVolume.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/4framesliderVolume.png

diff --git a/tribler-mod/Tribler/Video/Images/background.png b/instrumentation/tribler-mod/Tribler/Video/Images/background.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/background.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/background.png

diff --git a/tribler-mod/Tribler/Video/Images/fullScreen-hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/fullScreen-hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/fullScreen-hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/fullScreen-hover.png

diff --git a/tribler-mod/Tribler/Video/Images/fullScreen.png b/instrumentation/tribler-mod/Tribler/Video/Images/fullScreen.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/fullScreen.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/fullScreen.png

diff --git a/tribler-mod/Tribler/Video/Images/fullScreen_dis.png b/instrumentation/tribler-mod/Tribler/Video/Images/fullScreen_dis.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/fullScreen_dis.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/fullScreen_dis.png

diff --git a/tribler-mod/Tribler/Video/Images/fullScreen_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/fullScreen_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/fullScreen_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/fullScreen_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/pause.png b/instrumentation/tribler-mod/Tribler/Video/Images/pause.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/pause.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/pause.png

diff --git a/tribler-mod/Tribler/Video/Images/pause_dis.png b/instrumentation/tribler-mod/Tribler/Video/Images/pause_dis.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/pause_dis.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/pause_dis.png

diff --git a/tribler-mod/Tribler/Video/Images/pause_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/pause_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/pause_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/pause_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/play.png b/instrumentation/tribler-mod/Tribler/Video/Images/play.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/play.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/play.png

diff --git a/tribler-mod/Tribler/Video/Images/play_dis.png b/instrumentation/tribler-mod/Tribler/Video/Images/play_dis.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/play_dis.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/play_dis.png

diff --git a/tribler-mod/Tribler/Video/Images/play_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/play_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/play_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/play_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/sliderDot.png b/instrumentation/tribler-mod/Tribler/Video/Images/sliderDot.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/sliderDot.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/sliderDot.png

diff --git a/tribler-mod/Tribler/Video/Images/sliderDot_dis.png b/instrumentation/tribler-mod/Tribler/Video/Images/sliderDot_dis.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/sliderDot_dis.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/sliderDot_dis.png

diff --git a/tribler-mod/Tribler/Video/Images/sliderDot_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/sliderDot_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/sliderDot_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/sliderDot_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/sliderVolume.png b/instrumentation/tribler-mod/Tribler/Video/Images/sliderVolume.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/sliderVolume.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/sliderVolume.png

diff --git a/tribler-mod/Tribler/Video/Images/vol0.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol0.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol0.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol0.png

diff --git a/tribler-mod/Tribler/Video/Images/vol0Enabled.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol0Enabled.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol0Enabled.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol0Enabled.png

diff --git a/tribler-mod/Tribler/Video/Images/vol0Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol0Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol0Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol0Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol0_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol0_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol0_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol0_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol1.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol1.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol1.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol1.png

diff --git a/tribler-mod/Tribler/Video/Images/vol1Enabled.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol1Enabled.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol1Enabled.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol1Enabled.png

diff --git a/tribler-mod/Tribler/Video/Images/vol1Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol1Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol1Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol1Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol1_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol1_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol1_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol1_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/vol2.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol2.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol2.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol2.png

diff --git a/tribler-mod/Tribler/Video/Images/vol2Enabled.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol2Enabled.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol2Enabled.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol2Enabled.png

diff --git a/tribler-mod/Tribler/Video/Images/vol2Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol2Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol2Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol2Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol2_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol2_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol2_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol2_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/vol3.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol3.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol3.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol3.png

diff --git a/tribler-mod/Tribler/Video/Images/vol3Enabled.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol3Enabled.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol3Enabled.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol3Enabled.png

diff --git a/tribler-mod/Tribler/Video/Images/vol3Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol3Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol3Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol3Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol3_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol3_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol3_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol3_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/vol4.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol4.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol4.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol4.png

diff --git a/tribler-mod/Tribler/Video/Images/vol4Enabled.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol4Enabled.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol4Enabled.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol4Enabled.png

diff --git a/tribler-mod/Tribler/Video/Images/vol4Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol4Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol4Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol4Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol4_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol4_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol4_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol4_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/vol5.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol5.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol5.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol5.png

diff --git a/tribler-mod/Tribler/Video/Images/vol5Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol5Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol5Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol5Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol5_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol5_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol5_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol5_hover.png

diff --git a/tribler-mod/Tribler/Video/Images/vol6.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol6.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol6.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol6.png

diff --git a/tribler-mod/Tribler/Video/Images/vol6Enabled_clicked.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol6Enabled_clicked.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol6Enabled_clicked.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol6Enabled_clicked.png

diff --git a/tribler-mod/Tribler/Video/Images/vol6_hover.png b/instrumentation/tribler-mod/Tribler/Video/Images/vol6_hover.png
similarity index 100%
rename from tribler-mod/Tribler/Video/Images/vol6_hover.png
rename to instrumentation/tribler-mod/Tribler/Video/Images/vol6_hover.png

diff --git a/tribler-mod/Tribler/Video/Progress.py b/instrumentation/tribler-mod/Tribler/Video/Progress.py
similarity index 100%
rename from tribler-mod/Tribler/Video/Progress.py
rename to instrumentation/tribler-mod/Tribler/Video/Progress.py

diff --git a/tribler-mod/Tribler/Video/Progress.py.bak b/instrumentation/tribler-mod/Tribler/Video/Progress.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/Progress.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/Progress.py.bak

diff --git a/tribler-mod/Tribler/Video/VLCWrapper.py b/instrumentation/tribler-mod/Tribler/Video/VLCWrapper.py
similarity index 100%
rename from tribler-mod/Tribler/Video/VLCWrapper.py
rename to instrumentation/tribler-mod/Tribler/Video/VLCWrapper.py

diff --git a/tribler-mod/Tribler/Video/VLCWrapper.py.bak b/instrumentation/tribler-mod/Tribler/Video/VLCWrapper.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/VLCWrapper.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/VLCWrapper.py.bak

diff --git a/tribler-mod/Tribler/Video/VideoFrame.py b/instrumentation/tribler-mod/Tribler/Video/VideoFrame.py
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoFrame.py
rename to instrumentation/tribler-mod/Tribler/Video/VideoFrame.py

diff --git a/tribler-mod/Tribler/Video/VideoFrame.py.bak b/instrumentation/tribler-mod/Tribler/Video/VideoFrame.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoFrame.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/VideoFrame.py.bak

diff --git a/tribler-mod/Tribler/Video/VideoPlayer.py b/instrumentation/tribler-mod/Tribler/Video/VideoPlayer.py
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoPlayer.py
rename to instrumentation/tribler-mod/Tribler/Video/VideoPlayer.py

diff --git a/tribler-mod/Tribler/Video/VideoPlayer.py.bak b/instrumentation/tribler-mod/Tribler/Video/VideoPlayer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoPlayer.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/VideoPlayer.py.bak

diff --git a/tribler-mod/Tribler/Video/VideoServer.py b/instrumentation/tribler-mod/Tribler/Video/VideoServer.py
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoServer.py
rename to instrumentation/tribler-mod/Tribler/Video/VideoServer.py

diff --git a/tribler-mod/Tribler/Video/VideoServer.py.bak b/instrumentation/tribler-mod/Tribler/Video/VideoServer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/VideoServer.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/VideoServer.py.bak

diff --git a/tribler-mod/Tribler/Video/__init__.py b/instrumentation/tribler-mod/Tribler/Video/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Video/__init__.py
rename to instrumentation/tribler-mod/Tribler/Video/__init__.py

diff --git a/tribler-mod/Tribler/Video/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Video/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/__init__.py.bak

diff --git a/tribler-mod/Tribler/Video/defs.py b/instrumentation/tribler-mod/Tribler/Video/defs.py
similarity index 100%
rename from tribler-mod/Tribler/Video/defs.py
rename to instrumentation/tribler-mod/Tribler/Video/defs.py

diff --git a/tribler-mod/Tribler/Video/defs.py.bak b/instrumentation/tribler-mod/Tribler/Video/defs.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/defs.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/defs.py.bak

diff --git a/tribler-mod/Tribler/Video/utils.py b/instrumentation/tribler-mod/Tribler/Video/utils.py
similarity index 100%
rename from tribler-mod/Tribler/Video/utils.py
rename to instrumentation/tribler-mod/Tribler/Video/utils.py

diff --git a/tribler-mod/Tribler/Video/utils.py.bak b/instrumentation/tribler-mod/Tribler/Video/utils.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Video/utils.py.bak
rename to instrumentation/tribler-mod/Tribler/Video/utils.py.bak

diff --git a/tribler-mod/Tribler/Web2/__init__.py b/instrumentation/tribler-mod/Tribler/Web2/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/__init__.py
rename to instrumentation/tribler-mod/Tribler/Web2/__init__.py

diff --git a/tribler-mod/Tribler/Web2/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Web2/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/__init__.py.bak

diff --git a/tribler-mod/Tribler/Web2/photo/__init__.py b/instrumentation/tribler-mod/Tribler/Web2/photo/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/__init__.py
rename to instrumentation/tribler-mod/Tribler/Web2/photo/__init__.py

diff --git a/tribler-mod/Tribler/Web2/photo/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Web2/photo/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/photo/__init__.py.bak

diff --git a/tribler-mod/Tribler/Web2/photo/flickr.py b/instrumentation/tribler-mod/Tribler/Web2/photo/flickr.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/flickr.py
rename to instrumentation/tribler-mod/Tribler/Web2/photo/flickr.py

diff --git a/tribler-mod/Tribler/Web2/photo/flickr.py.bak b/instrumentation/tribler-mod/Tribler/Web2/photo/flickr.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/flickr.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/photo/flickr.py.bak

diff --git a/tribler-mod/Tribler/Web2/photo/photo.py b/instrumentation/tribler-mod/Tribler/Web2/photo/photo.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/photo.py
rename to instrumentation/tribler-mod/Tribler/Web2/photo/photo.py

diff --git a/tribler-mod/Tribler/Web2/photo/photo.py.bak b/instrumentation/tribler-mod/Tribler/Web2/photo/photo.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/photo.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/photo/photo.py.bak

diff --git a/tribler-mod/Tribler/Web2/photo/settings.py b/instrumentation/tribler-mod/Tribler/Web2/photo/settings.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/settings.py
rename to instrumentation/tribler-mod/Tribler/Web2/photo/settings.py

diff --git a/tribler-mod/Tribler/Web2/photo/settings.py.bak b/instrumentation/tribler-mod/Tribler/Web2/photo/settings.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/settings.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/photo/settings.py.bak

diff --git a/tribler-mod/Tribler/Web2/photo/zooomr.py b/instrumentation/tribler-mod/Tribler/Web2/photo/zooomr.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/zooomr.py
rename to instrumentation/tribler-mod/Tribler/Web2/photo/zooomr.py

diff --git a/tribler-mod/Tribler/Web2/photo/zooomr.py.bak b/instrumentation/tribler-mod/Tribler/Web2/photo/zooomr.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/photo/zooomr.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/photo/zooomr.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/__init__.py b/instrumentation/tribler-mod/Tribler/Web2/util/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/__init__.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/__init__.py

diff --git a/tribler-mod/Tribler/Web2/util/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/__init__.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/codec.py b/instrumentation/tribler-mod/Tribler/Web2/util/codec.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/codec.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/codec.py

diff --git a/tribler-mod/Tribler/Web2/util/codec.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/codec.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/codec.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/codec.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/config.py b/instrumentation/tribler-mod/Tribler/Web2/util/config.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/config.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/config.py

diff --git a/tribler-mod/Tribler/Web2/util/config.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/config.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/config.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/config.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/db.py b/instrumentation/tribler-mod/Tribler/Web2/util/db.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/db.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/db.py

diff --git a/tribler-mod/Tribler/Web2/util/db.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/db.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/db.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/db.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/download.py b/instrumentation/tribler-mod/Tribler/Web2/util/download.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/download.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/download.py

diff --git a/tribler-mod/Tribler/Web2/util/download.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/download.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/download.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/download.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/history.py b/instrumentation/tribler-mod/Tribler/Web2/util/history.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/history.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/history.py

diff --git a/tribler-mod/Tribler/Web2/util/history.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/history.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/history.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/history.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/log.py b/instrumentation/tribler-mod/Tribler/Web2/util/log.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/log.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/log.py

diff --git a/tribler-mod/Tribler/Web2/util/log.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/log.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/log.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/log.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/mypartial.py b/instrumentation/tribler-mod/Tribler/Web2/util/mypartial.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/mypartial.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/mypartial.py

diff --git a/tribler-mod/Tribler/Web2/util/mypartial.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/mypartial.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/mypartial.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/mypartial.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/observer.py b/instrumentation/tribler-mod/Tribler/Web2/util/observer.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/observer.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/observer.py

diff --git a/tribler-mod/Tribler/Web2/util/observer.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/observer.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/observer.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/observer.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/update.py b/instrumentation/tribler-mod/Tribler/Web2/util/update.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/update.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/update.py

diff --git a/tribler-mod/Tribler/Web2/util/update.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/update.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/update.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/update.py.bak

diff --git a/tribler-mod/Tribler/Web2/util/utilsettings.py b/instrumentation/tribler-mod/Tribler/Web2/util/utilsettings.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/utilsettings.py
rename to instrumentation/tribler-mod/Tribler/Web2/util/utilsettings.py

diff --git a/tribler-mod/Tribler/Web2/util/utilsettings.py.bak b/instrumentation/tribler-mod/Tribler/Web2/util/utilsettings.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/util/utilsettings.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/util/utilsettings.py.bak

diff --git a/tribler-mod/Tribler/Web2/video/__init__.py b/instrumentation/tribler-mod/Tribler/Web2/video/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/__init__.py
rename to instrumentation/tribler-mod/Tribler/Web2/video/__init__.py

diff --git a/tribler-mod/Tribler/Web2/video/__init__.py.bak b/instrumentation/tribler-mod/Tribler/Web2/video/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/video/__init__.py.bak

diff --git a/tribler-mod/Tribler/Web2/video/genericsearch.py b/instrumentation/tribler-mod/Tribler/Web2/video/genericsearch.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/genericsearch.py
rename to instrumentation/tribler-mod/Tribler/Web2/video/genericsearch.py

diff --git a/tribler-mod/Tribler/Web2/video/genericsearch.py.bak b/instrumentation/tribler-mod/Tribler/Web2/video/genericsearch.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/genericsearch.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/video/genericsearch.py.bak

diff --git a/tribler-mod/Tribler/Web2/video/settings.py b/instrumentation/tribler-mod/Tribler/Web2/video/settings.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/settings.py
rename to instrumentation/tribler-mod/Tribler/Web2/video/settings.py

diff --git a/tribler-mod/Tribler/Web2/video/settings.py.bak b/instrumentation/tribler-mod/Tribler/Web2/video/settings.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/settings.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/video/settings.py.bak

diff --git a/tribler-mod/Tribler/Web2/video/video.py b/instrumentation/tribler-mod/Tribler/Web2/video/video.py
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/video.py
rename to instrumentation/tribler-mod/Tribler/Web2/video/video.py

diff --git a/tribler-mod/Tribler/Web2/video/video.py.bak b/instrumentation/tribler-mod/Tribler/Web2/video/video.py.bak
similarity index 100%
rename from tribler-mod/Tribler/Web2/video/video.py.bak
rename to instrumentation/tribler-mod/Tribler/Web2/video/video.py.bak

diff --git a/tribler-mod/Tribler/Web2/web2definitions.conf b/instrumentation/tribler-mod/Tribler/Web2/web2definitions.conf
similarity index 100%
rename from tribler-mod/Tribler/Web2/web2definitions.conf
rename to instrumentation/tribler-mod/Tribler/Web2/web2definitions.conf

diff --git a/tribler-mod/Tribler/__init__.py b/instrumentation/tribler-mod/Tribler/__init__.py
similarity index 100%
rename from tribler-mod/Tribler/__init__.py
rename to instrumentation/tribler-mod/Tribler/__init__.py

diff --git a/tribler-mod/Tribler/__init__.py.bak b/instrumentation/tribler-mod/Tribler/__init__.py.bak
similarity index 100%
rename from tribler-mod/Tribler/__init__.py.bak
rename to instrumentation/tribler-mod/Tribler/__init__.py.bak

diff --git a/tribler-mod/Tribler/binary-LICENSE.txt b/instrumentation/tribler-mod/Tribler/binary-LICENSE.txt
similarity index 100%
rename from tribler-mod/Tribler/binary-LICENSE.txt
rename to instrumentation/tribler-mod/Tribler/binary-LICENSE.txt

diff --git a/tribler-mod/Tribler/readme.txt b/instrumentation/tribler-mod/Tribler/readme.txt
similarity index 100%
rename from tribler-mod/Tribler/readme.txt
rename to instrumentation/tribler-mod/Tribler/readme.txt

diff --git a/tribler-mod/Tribler/tribler_sdb_v2.sql b/instrumentation/tribler-mod/Tribler/tribler_sdb_v2.sql
similarity index 100%
rename from tribler-mod/Tribler/tribler_sdb_v2.sql
rename to instrumentation/tribler-mod/Tribler/tribler_sdb_v2.sql

diff --git a/tribler-mod/doxy.config b/instrumentation/tribler-mod/doxy.config
similarity index 100%
rename from tribler-mod/doxy.config
rename to instrumentation/tribler-mod/doxy.config

diff --git a/tribler-mod/merge_status_msg.sh b/instrumentation/tribler-mod/merge_status_msg.sh
similarity index 100%
rename from tribler-mod/merge_status_msg.sh
rename to instrumentation/tribler-mod/merge_status_msg.sh

diff --git a/tribler-mod/scripts/README b/instrumentation/tribler-mod/scripts/README
similarity index 100%
rename from tribler-mod/scripts/README
rename to instrumentation/tribler-mod/scripts/README

diff --git a/tribler-mod/scripts/make_changes.sh b/instrumentation/tribler-mod/scripts/make_changes.sh
similarity index 100%
rename from tribler-mod/scripts/make_changes.sh
rename to instrumentation/tribler-mod/scripts/make_changes.sh

diff --git a/tribler-mod/scripts/modified_files_DEBUG b/instrumentation/tribler-mod/scripts/modified_files_DEBUG
similarity index 100%
rename from tribler-mod/scripts/modified_files_DEBUG
rename to instrumentation/tribler-mod/scripts/modified_files_DEBUG

diff --git a/tribler-mod/scripts/modified_files_DEBUG_NORMAL b/instrumentation/tribler-mod/scripts/modified_files_DEBUG_NORMAL
similarity index 100%
rename from tribler-mod/scripts/modified_files_DEBUG_NORMAL
rename to instrumentation/tribler-mod/scripts/modified_files_DEBUG_NORMAL

diff --git a/tribler-mod/scripts/modify_Connecter.sh b/instrumentation/tribler-mod/scripts/modify_Connecter.sh
similarity index 100%
rename from tribler-mod/scripts/modify_Connecter.sh
rename to instrumentation/tribler-mod/scripts/modify_Connecter.sh

diff --git a/tribler-mod/scripts/modify_all_print.sh b/instrumentation/tribler-mod/scripts/modify_all_print.sh
similarity index 100%
rename from tribler-mod/scripts/modify_all_print.sh
rename to instrumentation/tribler-mod/scripts/modify_all_print.sh

diff --git a/tribler-mod/scripts/print_timestamp.sh b/instrumentation/tribler-mod/scripts/print_timestamp.sh
similarity index 100%
rename from tribler-mod/scripts/print_timestamp.sh
rename to instrumentation/tribler-mod/scripts/print_timestamp.sh

diff --git a/tribler-mod/scripts/set_DEBUG.sh b/instrumentation/tribler-mod/scripts/set_DEBUG.sh
similarity index 100%
rename from tribler-mod/scripts/set_DEBUG.sh
rename to instrumentation/tribler-mod/scripts/set_DEBUG.sh

diff --git a/tribler-mod/scripts/set_DEBUG_NORMAL.sh b/instrumentation/tribler-mod/scripts/set_DEBUG_NORMAL.sh
similarity index 100%
rename from tribler-mod/scripts/set_DEBUG_NORMAL.sh
rename to instrumentation/tribler-mod/scripts/set_DEBUG_NORMAL.sh

diff --git a/tribler-mod/scripts/undo_changes.sh b/instrumentation/tribler-mod/scripts/undo_changes.sh
similarity index 100%
rename from tribler-mod/scripts/undo_changes.sh
rename to instrumentation/tribler-mod/scripts/undo_changes.sh

diff --git a/tribler-mod/scripts/unmodify_all_print.sh b/instrumentation/tribler-mod/scripts/unmodify_all_print.sh
similarity index 100%
rename from tribler-mod/scripts/unmodify_all_print.sh
rename to instrumentation/tribler-mod/scripts/unmodify_all_print.sh

diff --git a/tribler-mod/start_tribler b/instrumentation/tribler-mod/start_tribler
similarity index 100%
rename from tribler-mod/start_tribler
rename to instrumentation/tribler-mod/start_tribler

diff --git a/tribler-mod/torrents/openSUSE-11.2-DVD-i586-iso.torrent b/instrumentation/tribler-mod/torrents/openSUSE-11.2-DVD-i586-iso.torrent
similarity index 100%
rename from tribler-mod/torrents/openSUSE-11.2-DVD-i586-iso.torrent
rename to instrumentation/tribler-mod/torrents/openSUSE-11.2-DVD-i586-iso.torrent