Refactor Namespaces :pray: