Packaging (2 the return) in mavin modules.

Signed-off-by: salomao.marcos <salomao.marcos@gmail.com>