Fix excessively deep namespace, more compatible with PSR's namespace rules