restructure folders and update some files