Remove Tests folder
Refactored namespaces