folder restruct

set new folder structure