Begin rearranging Wikipedia parser(s)