move to feature package and add dependency