Refactoring namespace to PSR-style.