updated baseurl
moved around some stuff