Restructure file structure