METAREST-2 Moves criteria parsers into their own namespace