More cleaning for the router function. | Added getModule() function to the global space