URI redesign

As described in #63. Will require updates to live website when deployed.