Rearrange code, fix route names to use all plural.