relayout dir hirachey & update rsid_gen