Reorganizing the file structure