Large cleanup of container heirarchies. This moves everything that once descended from [general container] to [zen container]