Move generic files used in both soap and mm