Add Player and Controller. Refactor Board