Fix format variable names
Update modules with mls-module-define
Refactor modules
Merge mls-common and mls-module