Finish refactoring of player vs levels mecanism