Moved WFS client code to WFS modile