Refactoring, adding direct download and bittorrent