restructure and change some files locations