Added refactored files.