Move files to follow documented convention