Removed class Wall, added class Entity and some fix