Implement refactor in photo source classes