Revert "Revert "BUG-994: reorganize SchemaPath into a tree""