Merch.Race.Economy.*: Move economics-related modules to new hierarchy.