IPad Application Space

I love my iPad. Works great! Have had zero problems with it and use it several hours each day. However, I am running out of room for application icon space or the desktop. I can visualize using up all 11 pages in a couple of months as I add more stuff. I have heard that Apple may add folders and sub folders or additional pages to the next OS release. Anybody know what their plans "really are?" Is it just to be OS 4 that is in the new iPhone release or are they going to add stuff that is iPad unique as well?