Move functions back to main module file.