Refactored and deleted files.