If you’ve got something you want to find a place for, ask yourself, “If I was looking for this, where is the first place I would look?” I’ve ended up changing where I keep things because sure, it might havd been in a logical place, but it wasn’t where I would think to look. It’s not foolproof, but it helps.
You don’t need reclassification to lose a lake; you just need a drought.
Edit: I may have misunderstood you. It’s pretty late, and I should be sleeping…