Small fixes to URI, base URI, individual URIs etc to be consistent. Also, removed the individuals we no longer need.