comfy_extras should not be its own toplevel package

comfy/comfy_extras/nodes/nodes_clip_sdxl.py

@@ -1,5 +1,5 @@
 import torch
-from ...comfy.nodes.common import MAX_RESOLUTION
+from ...nodes.common import MAX_RESOLUTION
 
 
 class CLIPTextEncodeSDXLRefiner:

comfy/comfy_extras/nodes/nodes_hypernetwork.py

@@ -1,5 +1,5 @@
-from ...comfy import utils
+from ... import utils
-from ...comfy.cmd import folder_paths
+from ...cmd import folder_paths
 import torch
 
 def load_hypernetwork_patch(path, strength):

comfy/comfy_extras/nodes/nodes_mask.py

@@ -2,7 +2,7 @@ import numpy as np
 from scipy.ndimage import grey_dilation
 import torch
 
-from ...comfy.nodes.common import MAX_RESOLUTION
+from ...nodes.common import MAX_RESOLUTION
 
 
 def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False):

comfy/comfy_extras/nodes/nodes_model_merging.py

@@ -1,11 +1,11 @@
-from ...comfy import sd
+from ... import sd
-from ...comfy import model_base
+from ... import model_base
 
-from ...comfy.cmd import folder_paths
+from ...cmd import folder_paths
 import json
 import os
 
-from ...comfy.cli_args import args
+from ...cli_args import args
 
 class ModelMergeSimple:
     @classmethod

comfy/comfy_extras/nodes/nodes_post_processing.py

@@ -4,7 +4,7 @@ import torch.nn.functional as F
 from PIL import Image
 import math
 
-from ...comfy import utils
+from ... import utils
 
 
 class Blend:

comfy/comfy_extras/nodes/nodes_upscale_model.py

@@ -1,8 +1,8 @@
 from ..chainner_models import model_loading
-from ...comfy import model_management
+from ... import model_management
 import torch
-from ...comfy import utils
+from ... import utils
-from ...comfy.cmd import folder_paths
+from ...cmd import folder_paths
 
 
 class UpscaleModelLoader:

comfy/nodes/package.py

@@ -7,7 +7,7 @@ import time
 import types
 
 from . import base_nodes
-from ...comfy_extras import nodes as comfy_extras_nodes
+from ..comfy_extras import nodes as comfy_extras_nodes
 
 try:
     import custom_nodes

setup.py

@@ -17,7 +17,7 @@ from setuptools import setup, find_packages
 """
 The name of the package.
 """
-package_name = "comfyui"
+package_name = "comfy"
 
 """
 The current version.
@@ -156,7 +156,7 @@ package_data = ['sd1_tokenizer/*', '**/*.json', '**/*.yaml']
 if not is_editable:
     package_data.append('web/**/*')
 setup(
-    # "comfyui"
+    # "comfy"
     name=package_name,
     description="",
     author="",