Add Module namespace

* the option -T includes Module as well now