I prefer the pile-o-classes to a pile-o-directories. All of the files in /includes are intelligently named and I have never had difficulties locating anything. (That's what grep is for)
I agree. Just sort the files by filename and it's very easy to find what you need.