Minor File System Layout changes.