Organizing iPhone Apps

I've loaded my iPhone up with a decent number of applications now and found it difficult to find things quickly. I've started organizing the Springboard panels: main, info, media, games, other. This is working well but it bugs me when you update an app and it loses it's location and has to be put back manually. I hope Apple is working on something to make this more managable.