refactored stuff

Players are now Entities. Working on decorators