Refactored reporter namespaces & minor fixes