Restructure file hierarchy