restructure file structure