re-organize gadget stuff in board file