Rearrange schema, routes, etc