Added Book XML + Refactoring