Moved BooksWrapper class into separate file