Files and folders reorganized