[-] MO: Fixing some Modules' templates

A cleanup and fixing of some issues with modules.