moved files around, refactored some code. Entity disappearing on collision for some reason.