khanhpham/refactor archive