Restructure file and folder