Reorganized namespaces/directories such that interfaces are the the same namespace as concrete implementations.