2.22.0 Folder structure changed