Revert "Revert "structure.db to my structure""

This reverts commit 7c61c3d69971bd145cd9fd8b31fa161573e6f522.
Revert "Something here is messed up Revert "message bus fixes and diagnostics""

This reverts commit f3c6144e3b66cadce9a0970c7d8437091b895117.
add prefix so keys stop clashing