BoardConfig: Cleanup and reorganize