Change how program-wide modules are used, cleaning up