Better foldering to follow book structure