merge "mobility" and "trait" modules