Changed feature marshaler again

Moved to featset package