Mali: Refacorting Part 1 commons
Mali and UMP: Refactoring Part 2
Reverting: Mali and UMP Headers Locations.

This commit revert the following commits:
04cda9a93f14839888e2d08b3b193a3a18161ae5
9852dcbc4addae7f6196a2065a4740c8bfdeb84a
1a89e2b45a588515995ac941f5e0d4d958b3228c
afbdc58ce8d764033969b27495976043853305b8