Refctored ENTITY
Added player class