Refactoring to some files.