Move file data around to match user expectations

#1676 

Still a WIP