Refactor token board data structures for easier use