Rename one file and start refactoring the includer