Moved some module related utility functions to their own class in common