Add declarations / remove old namespacing