Reformatting Yang's folder