Create new branch named "v1.6569-refactor-archive-structure-change"