Namespaced tools. Refactored logical units