BVTCK-53 Some restructuring of bookinfo and preface