Yet again more file system changes

This is strictly speaking still a mess