Refactoring common files.