Restructure file layout