Removed EnitySet completely.  Started moving api get methods to a single trait. Some reorganisation of packages and classes.