File system - Integrate review comments from ChrisM and clarifications from Alon. Also Building Projects updates from ChrisM