Getting WQ 4.1 to work on ICME.
Reorganize