new folder structure in 4.6.1 version