rename some stuff, add a couple of experimental redirect pages