Move for 1.7.2 file structure