Some files have been refactored.