Moved and renamed some player and grid methods