small bugfix

in loader function (module factory) we need Template instead of
Templates
Templates -> Template
cleaning up
Merged Module Manager.