Reshuffled namespaces in preparation for adding Beautifier classes