lib/klipbook.rb in klipbook-1.0.2 vs lib/klipbook.rb in klipbook-2.0.0

@@ -1,23 +1,26 @@
 # encoding: utf-8
-require 'klipbook/blank'
+require 'klipbook/util/blank'
+require 'klipbook/util/struct_to_json'
 require 'klipbook/version'
 
+require 'klipbook/commands/collate'
+require 'klipbook/commands/list_books'
+require 'klipbook/commands/pretty_print'
+
+require 'klipbook/sources/book_source'
+require 'klipbook/sources/book'
+require 'klipbook/sources/clipping'
+require 'klipbook/sources/invalid_source_error'
+
 require 'klipbook/sources/kindle_device/file_parser'
 require 'klipbook/sources/kindle_device/entry_parser'
 require 'klipbook/sources/kindle_device/entry'
 require 'klipbook/sources/kindle_device/file'
 
 require 'klipbook/sources/amazon_site/site_scraper'
 require 'klipbook/sources/amazon_site/book_scraper'
 
-require 'klipbook/invalid_source_error'
 require 'klipbook/config'
-require 'klipbook/book'
-require 'klipbook/clipping'
 
-require 'klipbook/fetcher'
-require 'klipbook/collator'
-require 'klipbook/printer'
-
-require 'klipbook/output/html_summary_writer'
-require 'klipbook/output/book_helpers'
+require 'klipbook/pretty_print/html_printer'
+require 'klipbook/collate/book_file'