working on namespaces.
preparing for subtree splits.
swap components to dev-master temporarily while splitting.