restructure file paths