269 build improvements

Finally pulling in the big changes to the filesystem. There will be more work on this branch, but it should be less disruptive.