moving features to a separate package