2. Clean URLs

While we're at it, we took the chance to clean some URLs to make everything appear *niiicccceeee*.

Depends on #240