move functions back to their old home