Make file refactor.