[m] Updated file layouts slightly to match other cores