UPDATED added all setting changes for the folder new structure.