Last file structure change, promise.