Move those variables to the right module.