[*] change the folder structure