Bugs in the Kitchen!

I spent today doing something that I rarely do. I emptied my entire pantry and scrubbed it top to bottom. Ever since I got home from my long summer vacation I have been seeing little tiny brown bugs in my kitchen. Of course the source of them was in the pantry. They were in the rice, the cereal, the beans, pretty much anything in a box. It is disgusting. I am not quite sure what they are, but I am just going with some kindof pantry beetle. I looked it up online and found some ideas for getting rid of them for good. Here's what I am going to do, and I'll let you know if it works out:
1. Toss all infected food
2. Scrub pantry
3. Spray an insecticide in pantry
4. Organize all remaining food into plastic containers, especially having a sealable plastic container for open items (like cereal and rice and mixes).
5. Re-spray the outside of my house. (I usually treat the outside of my house every few months and it has done pretty well at keeping bugs out, but I have been gone all summer so it has been neglected.)
We'll see if this improves the situation, and I've decided that I really ought to scrub my pantry at least as often as I scrub the fridge. It is not an area that gets as much attention as it should.