Removed Obstacle classes, which were renamed to Entity classes