Refactor files and renaming.