* Segment lexicons into more specific namespaces and tighten up some naming conventions * Update API to use new lexicons * Update pds and dev-env to use new lexicons