Fix make-snaphot to fit new layout