New estructure to v7.0