Restructure file tree