Restructuring of file structure