Refactor build aux files a bit