Revised the package layout and finished the bookstore CC