Moving global variables into globals module