Merge "Refactor apex data file types."