Place old variables into modules