Limited number of communications files

Our new system tops out at 1 million files per directory. In our current system, we have several million xml files from communications, so we need some way to subdivide the files so they don't overwhelm the system. We're thinking in terms of subdirectories, perhaps by year. Has anyone else dealt with an issue like this? If so, what solution/workaround did you use?