Rename packages and temperary changes to Player class