SmallAlbum and reorder logic refactoring started