fixing some download links, and reorganizing a little bit