Turn Entity class hierarchy into real taxonomy. Put all Entity classes into a single file again to avoid mutual imports