more organization!

Seems more readable this way, but I also fixed some links not using http.debian.net for it's ability to automatically select the best mirror.