I have two books I've pretty much finished for Wandering Heroes of Ogre Gate. The first is an adventure called Ogre Gate Inn, the second is a setting source book called The Strange Wonders of Li Fan. I found in actual play, I keep going back and forth between them in my binder, and that I really need to combine the two into one thing (just in terms of running the game it will be easier). The big issue is there was so much overlap between and both were competing for the same content (i.e. do I put all the fleshed out details for Dragontail Mountain in book A or book B----and both kind of need them). So now my plan is to put them together as a combination adventure/sourcebook. However I wrote the original adventure as a module, so it is going to be a bit tricky to organize.

Both books take place in Li Fan. Ogre Gate Inn is in the south and there is a section on the Inn and its environs that is a bit like a southern gazetteer.

Here is the Chapter Layout for Ogre Gate Inn (the Adventure):

INTRODUCTION
CHAPTER ONE: PREMISE AND BACKGROUND
CHAPTER TWO: THE OGRE GATE INN
This is a basic overview of the inn and the sorts of things that might be going on when the PCs arrive. Also contains some hooks. Importantly there is a section here on exploring the local area that is a bit of a mini-gazetteer with a focus on the area right around the Inn itself.
CHAPTER THREE: THE TOMB OF GENERAL DOU LUN
A secret tomb beneath the inn
CHAPTER FOUR: THE EMERALD EMPIRE OF ZHANG KANG
An even more secret tomb below the inn
CHAPTER FIVE: NPCS, GROUPS AND THREATS
CHAPTER SIX: NEW EQUIPMENT AND OBJECTS OF POWER
CHAPTER SEVEN: NEW KUNG FU TECHNIQUES AND RITUAL

Here is the layout for The Strange Wonders of Li Fan.

CHAPTER ONE: THE STRANGE WONDERS OF LI FAN
Overview of people and government
CHAPTER TWO: GAZETTEER
CHAPTER THREE: NPCS
CHAPTER FOUR: NEW SECTS
CHAPTER FIVE: NEW KUNG FU TECHNIQUES AND RITUALS
CHAPTER SIX: THE OBJECTS OF POWER
CHAPTER SEVEN: NEW MONSTERS AND THREATS

I could just put the Ogre Gate Inn, and the two tombs into the Gazetteer section, but that feels a bit off. I feel like they each need their own chapter. Then I might take the Exploring the immediate area section and add that into the gazetteer chapter itself. But still not sure where to put those three chapters in the overall structure.