restructured and updated URLs