Moved CollidableEntity to entity directory