I hadn't considered sub organization directories. Smart. I may implment that.