Refactoring & remove bitTorrentAPIOld