Module templating support + moved extra_modules to separate package and git repo