[File Info] - Refactor the folder structure