D6 module upgrades in prep for D7 upgrade.
Upgraded EDA code base from D6 to D7.