25514 Move all features into a features dir