Fix breakage from move to module and move to plot.py