Bring Mods.D2k in line with our new folder/namespace structure