Added restarting of module and fixed issue with module names clashing