Some reordering for better ePub2/ePub3 differentiation and ePub3 navigation support. Added a fix for Project Gutenberg ePubs