Refactoring book structure