Changed urls and removed more old imports