Revert "Restructing a little"

This reverts commit 20e763b66715dba49b7c26b416c4444c5fb391b1.
This didn't work and messed up other routing, removing....

Revert "adding workspace maps vs. data tabs linking"

This reverts commit 03167eb6857740fe2153b4206eb48b23de070af3.