SQL 2000 Restore To Different Location

OK. I have a good one. I have the following setup:

ServerA
Data on: C:\Data
Log on: C:\Logs

ServerB
System Databases on: D:\SysData
Data on: E:\Data
Indexes on : D:\Indexes
Log on: F:\Logs

So, what I want to do is restore a database from ServerA to ServerB. Placing the files and data in the correct locations. I want the data in a filegroup called DatabaseName_Data. Problem is when I restore to ServerB, the data always goes to PRIMARY filegroup during restore. The only thing I can find is to manually change the location of the data for each table in Enterprise Manager (YUCK!)

Barring that option, is there a way to move the data from the PRIMARY filegroup to a newly created DatabaseName_Data filegroup?

Isn't there an easier way?

Thanks for the help

Darrell