PackageServers overhaul
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Merge pull request #360 from eurich/package_servers

PackageServers overhaul