Logged In: YES 
user_id=21627

This must wait until 2.5.1; more likely 2.6.

The Windows distribution was structured that way always, so
it's not a regression.

"Consistency with other platforms" is not a valid argument:
there are no binary distributions for other platforms except
for OSX (whether that includes Tools or Demo, I don't know).
The source distribution for Windows is the very same as the
source distribution for other platforms, and it does include
Tools and Demo, so it's (trivially) consistent.

I don't think the Demo directory should be included. The
equivalent of a binary distribution on Unix (make install)
doesn't install the Demos, either.

As for the Tools directory: this traditionally includes
directories on a per-request basis. If there is an actual
need for another tool, it should be added.