Update to v7.0.1 & re-organize structure