Reorganized the board templates