Rearranging the file structure