Refactor and rename files.