Re-factor in order for Yard to understand namespaces