Cleaned up separation between program and module.

[#58959194]