Change around files to be cleaner.