Cleanup
Changed how our urls were named, I think this is a more coherent organization