Refactoring entities and creating basic collision