Restructure file system