Folder structure reorganized