[TASK] Begin breakout of globals to separate modules.