restructure file locations