cleanup namespaces to hopefully make it easier to understand underlying API