moved Entity to util, and changed the docs a little