restructure file layout