Big file move that adds structure and allows the example to work