Restructure of file system