Reorganized board class