xboard: reorganize features