Added option for namespacing modules
Added option to redefine the module name
Adding basename as second parameter