Improve modularity
Merge branch 'master' of github.com:glic3rinu/rtorrent-feeder