Generalised Entitys to the common package. Re-did most everything.