refactoring: removed collidable class, added collision detection to world class