Reorganise Mods.D2k, more reorganisation for Mods.RA