Change namespace and use PSR-4