wip fix collision width wall and reorganize entities