Prepare for major metadata reorganization, not able to compile until next commit and still not working for perhaps yet another after