Clean up and re-org to better do paper updates
Further tests to look for file updates to happen properly.