Refactoring the files