Integrate content type's Location order w/ Manage Fields

Hello,

I have a content type combining the Location module with CCK. We're using CCK fields to allow inputing an address, and want to use the Location module for a Google Map....

Everything else has been moved into a CCK group, but the location info. is displaying outside, as seen here:
http://www.doitgreen.org/node/823

I'd really like to integrate this Location element with the others on the Manage Fields page. I know it's already been addressed for Drupal 6. However, we're not sure how that solution would apply to Drupal 5, so I thought a new issue would be appropriate.

Many thanks for your help on this too!

Jim