updated file structure for 7.0.0