Merged Mob class and Entity class into Entity class