Frenchy,
I put my food and water in plastic milk crates. That way they can be shifted easily. A pantry, a bug in stash and a bug out stash all in one simple system.

Cardboard goes on the bottom of the crates with the name of whatever goes there written on it. Then when something is taken, we know what is missing when it is time to make up the weekly grocery list. There is a missing item and a name at the bottom... makes it real easy and fast to make up the grocery list

Each item gets the month/year purchased written on it in marker where it is easy to see.
Every few months I check for old items and use/replace them.

I have used this system for years and it works well for me.

Jeff
Too organized