Refactored namespaces to get passing travis build