Refactored into books module