Folders & Files reorganisation