PackageServers overhaul

refactrored PackageServer ..