From c4d9338d2eabc0bf1b2dd32e159de157c8dbb4d8 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Thu, 3 Jul 2025 09:18:38 -0400
Subject: [PATCH] major refactoring of modules

Signed-off-by: Vladimir Mandic <mandic00@live.com>
---
 .pylintrc                                     |  56 +-
 .ruff.toml                                    |  57 +-
 CHANGELOG.md                                  |  18 +-
 TODO.md                                       |  22 +-
 extensions-builtin/Lora/networks.py           |   4 +-
 extensions-builtin/sdnext-modernui            |   2 +-
 modules/api/generate.py                       |  14 +-
 modules/api/process.py                        |   4 +-
 modules/api/script.py                         |  10 +-
 modules/control/run.py                        |   6 +-
 modules/extensions.py                         |   4 +-
 modules/face/__init__.py                      |   4 +-
 modules/flash_attn_triton_amd/utils.py        |  20 +-
 modules/gr_hijack.py                          |  26 +-
 modules/hidiffusion/utils.py                  |   5 +-
 modules/img2img.py                            |  13 +-
 modules/ldsr/sd_hijack_autoencoder.py         |   2 +-
 modules/model_quant.py                        |   2 +-
 modules/model_te.py                           |   4 +-
 modules/postprocessing.py                     |   8 +-
 modules/processing.py                         |  24 +-
 modules/processing_class.py                   |   4 +-
 modules/prompt_parser_xhinker.py              |   3 +-
 modules/scripts.py                            | 732 +-----------------
 modules/scripts_auto_postprocessing.py        |  10 +-
 modules/scripts_manager.py                    | 730 +++++++++++++++++
 modules/scripts_postprocessing.py             |   4 +-
 modules/sd_models.py                          |  42 +-
 modules/sd_unet.py                            |   4 +-
 modules/sdnq/__init__.py                      |   2 +-
 modules/shared_items.py                       |   4 +-
 modules/txt2img.py                            |   8 +-
 modules/ui.py                                 |   4 +-
 modules/ui_common.py                          |   8 +-
 modules/ui_control.py                         |   6 +-
 modules/ui_control_helpers.py                 |   6 +-
 modules/ui_img2img.py                         |   8 +-
 modules/ui_javascript.py                      |   8 +-
 modules/ui_postprocessing.py                  |   6 +-
 modules/ui_txt2img.py                         |   8 +-
 package.json                                  |   2 +-
 {modules => pipelines}/flex2/__init__.py      |   0
 .../hidream/pipeline_hidream_image_editing.py |   0
 .../meissonic}/__init__.py                    |   0
 {modules => pipelines}/meissonic/pipeline.py  |   0
 .../meissonic/pipeline_img2img.py             |   0
 .../meissonic/pipeline_inpaint.py             |   0
 {modules => pipelines}/meissonic/scheduler.py |   0
 {modules => pipelines}/meissonic/test.py      |   0
 .../meissonic/transformer.py                  |   0
 {modules => pipelines}/model_auraflow.py      |   0
 {modules => pipelines}/model_chroma.py        |   6 +-
 {modules => pipelines}/model_cogview.py       |   2 +-
 {modules => pipelines}/model_cosmos.py        |   0
 {modules => pipelines}/model_flex.py          |   5 +-
 {modules => pipelines}/model_flux.py          |   6 +-
 {modules => pipelines}/model_flux_nf4.py      |   0
 {modules => pipelines}/model_hidream.py       |   2 +-
 {modules => pipelines}/model_kolors.py        |   0
 {modules => pipelines}/model_lumina.py        |   0
 {modules => pipelines}/model_meissonic.py     |  10 +-
 {modules => pipelines}/model_omnigen.py       |   2 +-
 {modules => pipelines}/model_omnigen2.py      |   2 +-
 {modules => pipelines}/model_pixart.py        |   0
 {modules => pipelines}/model_sana.py          |   0
 {modules => pipelines}/model_sd3.py           |   0
 {modules => pipelines}/model_stablecascade.py |   0
 {modules => pipelines}/omnigen2/__init__.py   |   0
 .../omnigen2/image_processor.py               |   0
 .../omnigen2/models/attention_processor.py    |   0
 .../omnigen2/models/embeddings.py             |   0
 .../omnigen2/models/transformers/__init__.py  |   0
 .../models/transformers/block_lumina2.py      |   0
 .../omnigen2/models/transformers/repo.py      |   0
 .../transformers/transformer_omnigen2.py      |   0
 .../omnigen2/pipeline_omnigen2.py             |   0
 {modules => pipelines}/segmoe/segmoe_model.py |   0
 scripts/allegrovideo.py                       |   4 +-
 scripts/animatediff.py                        |   8 +-
 scripts/apg.py                                |   5 +-
 scripts/automatic_color_inpaint.py            |   4 +-
 scripts/blipdiffusion.py                      |   4 +-
 scripts/cogvideo.py                           |   4 +-
 {modules => scripts}/consistory/__init__.py   |   0
 .../consistory/attention_processor.py         |   0
 .../consistory/consistory_pipeline.py         |   0
 .../consistory/consistory_run.py              |   0
 .../consistory/consistory_unet_sdxl.py        |   0
 .../consistory/consistory_utils.py            |   0
 .../consistory/utils/general_utils.py         |   0
 .../consistory/utils/ptp_utils.py             |   0
 scripts/consistory_ext.py                     |  10 +-
 {modules => scripts}/ctrlx/__init__.py        |   0
 {modules => scripts}/ctrlx/features.py        |   0
 {modules => scripts}/ctrlx/media.py           |   0
 {modules => scripts}/ctrlx/sdxl.py            |   0
 {modules => scripts}/ctrlx/utils.py           |   0
 scripts/{ctrlx.py => ctrlx_ext.py}            |  10 +-
 scripts/custom_code.py                        |  14 +-
 scripts/demofusion.py                         |   4 +-
 scripts/differential_diffusion.py             |   4 +-
 scripts/example.py                            |   4 +-
 scripts/flux_enhance.py                       |   4 +-
 scripts/flux_tools.py                         |   7 +-
 {modules => scripts}/freescale/__init__.py    |   0
 .../freescale/free_lunch_utils.py             |   0
 .../freescale/freescale_pipeline.py           |   0
 .../freescale/freescale_pipeline_img2img.py   |   0
 .../freescale/scale_attention.py              |   0
 scripts/{freescale.py => freescale_ext.py}    |   6 +-
 scripts/hdr.py                                |   7 +-
 scripts/hunyuanvideo.py                       |   4 +-
 scripts/image2video.py                        |  10 +-
 {modules => scripts}/infiniteyou/__init__.py  |   0
 .../infiniteyou/pipeline_flux_infusenet.py    |   0
 .../infiniteyou/pipeline_infu_flux.py         |   0
 {modules => scripts}/infiniteyou/resampler.py |   0
 scripts/infiniteyou_ext.py                    |   6 +-
 scripts/init_latents.py                       |   6 +-
 {modules => scripts}/instantir/__init__.py    |   0
 {modules => scripts}/instantir/aggregator.py  |   0
 .../instantir/ip_adapter}/__init__.py         |   0
 .../ip_adapter/attention_processor.py         |   0
 .../instantir/ip_adapter/ip_adapter.py        |   0
 .../instantir/ip_adapter/resampler.py         |   0
 .../instantir/ip_adapter/utils.py             |   0
 .../instantir/lcm_single_step_scheduler.py    |   0
 .../instantir/sdxl_instantir.py               |   0
 scripts/{instantir.py => instantir_ext.py}    |   6 +-
 scripts/ipadapter.py                          |   6 +-
 scripts/ipinstruct.py                         |   4 +-
 scripts/k_diff.py                             |   5 +-
 scripts/kohya_hires_fix.py                    |   4 +-
 {modules => scripts}/layerdiffuse/__init__.py |   4 +-
 .../layerdiffuse/layerdiffuse_loader.py       |   2 +-
 .../layerdiffuse/layerdiffuse_model.py        |   0
 .../{layerdiffuse.py => layerdiffuse_ext.py}  |   6 +-
 scripts/ledits.py                             |   4 +-
 scripts/legacy_allegrovideo.py                |   4 +-
 scripts/loopback.py                           |   5 +-
 scripts/ltxvideo.py                           |   4 +-
 scripts/lut.py                                |   6 +-
 scripts/mixture_of_diffusers.py               |  10 +-
 scripts/mixture_tiling.py                     |  12 +-
 scripts/mochivideo.py                         |   4 +-
 {modules => scripts}/mod/__init__.py          |   0
 scripts/mulan.py                              |  10 +-
 scripts/outpainting_mk_2.py                   |   5 +-
 {modules => scripts}/pixelsmith/__init__.py   |   0
 .../pixelsmith/autoencoder_kl.py              |   0
 .../pixelsmith/pixelsmith_pipeline.py         |   0
 {modules => scripts}/pixelsmith/vae.py        |   0
 scripts/{pixelsmith.py => pixelsmith_ext.py}  |   6 +-
 scripts/poor_mans_outpainting.py              |   5 +-
 scripts/prompt_enhance.py                     |   7 +-
 scripts/prompt_matrix.py                      |   7 +-
 scripts/prompts_from_file.py                  |   5 +-
 {modules => scripts}/pulid/__init__.py        |   0
 .../pulid/attention_processor.py              |   0
 .../pulid/encoders_transformer.py             |   0
 .../pulid/eva_clip/__init__.py                |   0
 .../eva_clip/bpe_simple_vocab_16e6.txt.gz     | Bin
 .../pulid/eva_clip/constants.py               |   0
 .../pulid/eva_clip/eva_vit_model.py           |   0
 .../pulid/eva_clip/factory.py                 |   0
 .../pulid/eva_clip/hf_configs.py              |   0
 .../pulid/eva_clip/hf_model.py                |   0
 {modules => scripts}/pulid/eva_clip/loss.py   |   0
 {modules => scripts}/pulid/eva_clip/model.py  |   0
 .../model_configs/EVA01-CLIP-B-16.json        |   0
 .../model_configs/EVA01-CLIP-g-14-plus.json   |   0
 .../model_configs/EVA01-CLIP-g-14.json        |   0
 .../model_configs/EVA02-CLIP-B-16.json        |   0
 .../model_configs/EVA02-CLIP-L-14-336.json    |   0
 .../model_configs/EVA02-CLIP-L-14.json        |   0
 .../EVA02-CLIP-bigE-14-plus.json              |   0
 .../model_configs/EVA02-CLIP-bigE-14.json     |   0
 .../pulid/eva_clip/modified_resnet.py         |   0
 {modules => scripts}/pulid/eva_clip/openai.py |   0
 .../pulid/eva_clip/pretrained.py              |   0
 {modules => scripts}/pulid/eva_clip/rope.py   |   0
 .../pulid/eva_clip/timm_model.py              |   0
 .../pulid/eva_clip/tokenizer.py               |   0
 .../pulid/eva_clip/transform.py               |   0
 .../pulid/eva_clip/transformer.py             |   0
 {modules => scripts}/pulid/eva_clip/utils.py  |   0
 {modules => scripts}/pulid/pulid_sampling.py  |   0
 {modules => scripts}/pulid/pulid_sdxl.py      |   2 +-
 {modules => scripts}/pulid/pulid_utils.py     |   0
 scripts/pulid_ext.py                          |   6 +-
 scripts/regional_prompting.py                 |  10 +-
 scripts/resadapter.py                         |   4 +-
 scripts/sd_upscale.py                         |   5 +-
 scripts/skip_layer_guidance.py                |   4 +-
 scripts/softfill.py                           |   4 +-
 scripts/stablevideodiffusion.py               |   6 +-
 .../style_aligned/inversion.py                |   0
 .../style_aligned/sa_handler.py               |   0
 ...{style_aligned.py => style_aligned_ext.py} |  11 +-
 scripts/t_gate.py                             |   4 +-
 scripts/text2video.py                         |  10 +-
 scripts/tiling.py                             |   6 +-
 {modules => scripts}/xadapter/adapter.py      |   0
 .../xadapter/pipeline_sd_xl_adapter.py        |   0
 .../pipeline_sd_xl_adapter_controlnet.py      |   0
 ...peline_sd_xl_adapter_controlnet_img2img.py |   0
 {modules => scripts}/xadapter/unet_adapter.py |   0
 {modules => scripts}/xadapter/utils.py        |   0
 .../xadapter/xadapter_hijacks.py              |   0
 scripts/{x_adapter.py => xadapter_ext.py}     |  12 +-
 scripts/xyz_grid.py                           |   4 +-
 scripts/xyz_grid_classes.py                   |   2 +-
 scripts/xyz_grid_on.py                        |   8 +-
 webui.py                                      |  14 +-
 214 files changed, 1154 insertions(+), 1153 deletions(-)
 create mode 100644 modules/scripts_manager.py
 rename {modules => pipelines}/flex2/__init__.py (100%)
 rename {modules => pipelines}/hidream/pipeline_hidream_image_editing.py (100%)
 rename {modules/instantir/ip_adapter => pipelines/meissonic}/__init__.py (100%)
 rename {modules => pipelines}/meissonic/pipeline.py (100%)
 rename {modules => pipelines}/meissonic/pipeline_img2img.py (100%)
 rename {modules => pipelines}/meissonic/pipeline_inpaint.py (100%)
 rename {modules => pipelines}/meissonic/scheduler.py (100%)
 rename {modules => pipelines}/meissonic/test.py (100%)
 rename {modules => pipelines}/meissonic/transformer.py (100%)
 rename {modules => pipelines}/model_auraflow.py (100%)
 rename {modules => pipelines}/model_chroma.py (98%)
 rename {modules => pipelines}/model_cogview.py (96%)
 rename {modules => pipelines}/model_cosmos.py (100%)
 rename {modules => pipelines}/model_flex.py (94%)
 rename {modules => pipelines}/model_flux.py (99%)
 rename {modules => pipelines}/model_flux_nf4.py (100%)
 rename {modules => pipelines}/model_hidream.py (98%)
 rename {modules => pipelines}/model_kolors.py (100%)
 rename {modules => pipelines}/model_lumina.py (100%)
 rename {modules => pipelines}/model_meissonic.py (80%)
 rename {modules => pipelines}/model_omnigen.py (93%)
 rename {modules => pipelines}/model_omnigen2.py (93%)
 rename {modules => pipelines}/model_pixart.py (100%)
 rename {modules => pipelines}/model_sana.py (100%)
 rename {modules => pipelines}/model_sd3.py (100%)
 rename {modules => pipelines}/model_stablecascade.py (100%)
 rename {modules => pipelines}/omnigen2/__init__.py (100%)
 rename {modules => pipelines}/omnigen2/image_processor.py (100%)
 rename {modules => pipelines}/omnigen2/models/attention_processor.py (100%)
 rename {modules => pipelines}/omnigen2/models/embeddings.py (100%)
 rename {modules => pipelines}/omnigen2/models/transformers/__init__.py (100%)
 rename {modules => pipelines}/omnigen2/models/transformers/block_lumina2.py (100%)
 rename {modules => pipelines}/omnigen2/models/transformers/repo.py (100%)
 rename {modules => pipelines}/omnigen2/models/transformers/transformer_omnigen2.py (100%)
 rename {modules => pipelines}/omnigen2/pipeline_omnigen2.py (100%)
 rename {modules => pipelines}/segmoe/segmoe_model.py (100%)
 rename {modules => scripts}/consistory/__init__.py (100%)
 rename {modules => scripts}/consistory/attention_processor.py (100%)
 rename {modules => scripts}/consistory/consistory_pipeline.py (100%)
 rename {modules => scripts}/consistory/consistory_run.py (100%)
 rename {modules => scripts}/consistory/consistory_unet_sdxl.py (100%)
 rename {modules => scripts}/consistory/consistory_utils.py (100%)
 rename {modules => scripts}/consistory/utils/general_utils.py (100%)
 rename {modules => scripts}/consistory/utils/ptp_utils.py (100%)
 rename {modules => scripts}/ctrlx/__init__.py (100%)
 rename {modules => scripts}/ctrlx/features.py (100%)
 rename {modules => scripts}/ctrlx/media.py (100%)
 rename {modules => scripts}/ctrlx/sdxl.py (100%)
 rename {modules => scripts}/ctrlx/utils.py (100%)
 rename scripts/{ctrlx.py => ctrlx_ext.py} (93%)
 rename {modules => scripts}/freescale/__init__.py (100%)
 rename {modules => scripts}/freescale/free_lunch_utils.py (100%)
 rename {modules => scripts}/freescale/freescale_pipeline.py (100%)
 rename {modules => scripts}/freescale/freescale_pipeline_img2img.py (100%)
 rename {modules => scripts}/freescale/scale_attention.py (100%)
 rename scripts/{freescale.py => freescale_ext.py} (97%)
 rename {modules => scripts}/infiniteyou/__init__.py (100%)
 rename {modules => scripts}/infiniteyou/pipeline_flux_infusenet.py (100%)
 rename {modules => scripts}/infiniteyou/pipeline_infu_flux.py (100%)
 rename {modules => scripts}/infiniteyou/resampler.py (100%)
 rename {modules => scripts}/instantir/__init__.py (100%)
 rename {modules => scripts}/instantir/aggregator.py (100%)
 rename {modules/meissonic => scripts/instantir/ip_adapter}/__init__.py (100%)
 rename {modules => scripts}/instantir/ip_adapter/attention_processor.py (100%)
 rename {modules => scripts}/instantir/ip_adapter/ip_adapter.py (100%)
 rename {modules => scripts}/instantir/ip_adapter/resampler.py (100%)
 rename {modules => scripts}/instantir/ip_adapter/utils.py (100%)
 rename {modules => scripts}/instantir/lcm_single_step_scheduler.py (100%)
 rename {modules => scripts}/instantir/sdxl_instantir.py (100%)
 rename scripts/{instantir.py => instantir_ext.py} (96%)
 rename {modules => scripts}/layerdiffuse/__init__.py (94%)
 rename {modules => scripts}/layerdiffuse/layerdiffuse_loader.py (99%)
 rename {modules => scripts}/layerdiffuse/layerdiffuse_model.py (100%)
 rename scripts/{layerdiffuse.py => layerdiffuse_ext.py} (94%)
 rename {modules => scripts}/mod/__init__.py (100%)
 rename {modules => scripts}/pixelsmith/__init__.py (100%)
 rename {modules => scripts}/pixelsmith/autoencoder_kl.py (100%)
 rename {modules => scripts}/pixelsmith/pixelsmith_pipeline.py (100%)
 rename {modules => scripts}/pixelsmith/vae.py (100%)
 rename scripts/{pixelsmith.py => pixelsmith_ext.py} (95%)
 rename {modules => scripts}/pulid/__init__.py (100%)
 rename {modules => scripts}/pulid/attention_processor.py (100%)
 rename {modules => scripts}/pulid/encoders_transformer.py (100%)
 rename {modules => scripts}/pulid/eva_clip/__init__.py (100%)
 rename {modules => scripts}/pulid/eva_clip/bpe_simple_vocab_16e6.txt.gz (100%)
 rename {modules => scripts}/pulid/eva_clip/constants.py (100%)
 rename {modules => scripts}/pulid/eva_clip/eva_vit_model.py (100%)
 rename {modules => scripts}/pulid/eva_clip/factory.py (100%)
 rename {modules => scripts}/pulid/eva_clip/hf_configs.py (100%)
 rename {modules => scripts}/pulid/eva_clip/hf_model.py (100%)
 rename {modules => scripts}/pulid/eva_clip/loss.py (100%)
 rename {modules => scripts}/pulid/eva_clip/model.py (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA01-CLIP-B-16.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA01-CLIP-g-14-plus.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA01-CLIP-g-14.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA02-CLIP-B-16.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA02-CLIP-L-14-336.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA02-CLIP-L-14.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14-plus.json (100%)
 rename {modules => scripts}/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14.json (100%)
 rename {modules => scripts}/pulid/eva_clip/modified_resnet.py (100%)
 rename {modules => scripts}/pulid/eva_clip/openai.py (100%)
 rename {modules => scripts}/pulid/eva_clip/pretrained.py (100%)
 rename {modules => scripts}/pulid/eva_clip/rope.py (100%)
 rename {modules => scripts}/pulid/eva_clip/timm_model.py (100%)
 rename {modules => scripts}/pulid/eva_clip/tokenizer.py (100%)
 rename {modules => scripts}/pulid/eva_clip/transform.py (100%)
 rename {modules => scripts}/pulid/eva_clip/transformer.py (100%)
 rename {modules => scripts}/pulid/eva_clip/utils.py (100%)
 rename {modules => scripts}/pulid/pulid_sampling.py (100%)
 rename {modules => scripts}/pulid/pulid_sdxl.py (99%)
 rename {modules => scripts}/pulid/pulid_utils.py (100%)
 rename {modules => scripts}/style_aligned/inversion.py (100%)
 rename {modules => scripts}/style_aligned/sa_handler.py (100%)
 rename scripts/{style_aligned.py => style_aligned_ext.py} (96%)
 rename {modules => scripts}/xadapter/adapter.py (100%)
 rename {modules => scripts}/xadapter/pipeline_sd_xl_adapter.py (100%)
 rename {modules => scripts}/xadapter/pipeline_sd_xl_adapter_controlnet.py (100%)
 rename {modules => scripts}/xadapter/pipeline_sd_xl_adapter_controlnet_img2img.py (100%)
 rename {modules => scripts}/xadapter/unet_adapter.py (100%)
 rename {modules => scripts}/xadapter/utils.py (100%)
 rename {modules => scripts}/xadapter/xadapter_hijacks.py (100%)
 rename scripts/{x_adapter.py => xadapter_ext.py} (94%)

diff --git a/.pylintrc b/.pylintrc
index 5ecbbef48..68b004820 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -7,32 +7,27 @@ fail-on=
 fail-under=10
 ignore=CVS
 ignore-paths=/usr/lib/.*$,
+             venv,
+             .git,
+             .ruff_cache,
+             .vscode,
              modules/apg,
-             modules/consistory,
+             modules/cfgzero,
              modules/control/proc,
              modules/control/units,
-             modules/ctrlx,
              modules/dml,
-             modules/freescale,
+             modules/flash_attn_triton_amd,
              modules/ggml,
              modules/hidiffusion,
-             modules/hijack,
-             modules/instantir,
+             modules/hijack/ddpm_edit.py,
+             modules/intel,
              modules/intel/ipex,
-             modules/intel/openvino,
              modules/k-diffusion,
-             modules/flex2,
              modules/ldsr,
-             modules/hidream,
-             modules/meissonic,
-             modules/mod,
-             modules/omnigen,
-             modules/omnigen2,
              modules/onnx_impl,
              modules/pag,
-             modules/pixelsmith,
+             modules/postprocess/aurasr_arch.py,
              modules/prompt_parser_xhinker.py,
-             modules/pulid/eva_clip,
              modules/ras,
              modules/rife,
              modules/schedulers,
@@ -40,15 +35,26 @@ ignore-paths=/usr/lib/.*$,
              modules/teacache,
              modules/todo,
              modules/unipc,
-             modules/xadapter,
-             modules/cfgzero,
-             modules/infiniteyou,
-             modules/flash_attn_triton_amd,
-             scripts/softfill.py,
+             pipelines/flex2,
+             pipelines/hidream,
+             pipelines/meissonic,
+             pipelines/omnigen2,
+             pipelines/segmoe,
+             scripts/consistory,
+             scripts/ctrlx,
+             scripts/demofusion,
+             scripts/freescale,
+             scripts/infiniteyou,
+             scripts/instantir,
+             scripts/mod,
+             scripts/pixelsmith,
+             scripts/differential_diffusion.py,
+             scripts/pulid,
+             scripts/xadapter,
              repositories,
              extensions-builtin/Lora,
-             extensions-builtin/sd-webui-agent-scheduler,
              extensions-builtin/sd-extension-chainner/nodes,
+             extensions-builtin/sd-webui-agent-scheduler,
              extensions-builtin/sdnext-modernui/node_modules,
 ignore-patterns=.*test*.py$,
                 .*_model.py$,
@@ -158,8 +164,8 @@ disable=abstract-method,
         consider-using-generator,
         consider-using-get,
         consider-using-in,
-        consider-using-min-builtin,
         consider-using-max-builtin,
+        consider-using-min-builtin,
         consider-using-sys-exit,
         cyclic-import,
         dangerous-default-value,
@@ -175,6 +181,7 @@ disable=abstract-method,
         missing-class-docstring,
         missing-function-docstring,
         missing-module-docstring,
+        no-else-raise,
         no-else-return,
         not-callable,
         pointless-string-statement,
@@ -185,16 +192,17 @@ disable=abstract-method,
         too-many-instance-attributes,
         too-many-locals,
         too-many-nested-blocks,
-        too-many-statements,
         too-many-positional-arguments,
+        too-many-statements,
         unidiomatic-typecheck,
+        unknown-option-value,
         unnecessary-dict-index-lookup,
         unnecessary-dunder-call,
-        unnecessary-lambda,
         unnecessary-lambda-assigment,
+        unnecessary-lambda,
+        unused-wildcard-import,
         use-dict-literal,
         use-symbolic-message-instead,
-        unknown-option-value,
         useless-suppression,
         wrong-import-position,
 enable=c-extension-no-member
diff --git a/.ruff.toml b/.ruff.toml
index 023678c33..b21563996 100644
--- a/.ruff.toml
+++ b/.ruff.toml
@@ -3,44 +3,33 @@ exclude = [
     ".git",
     ".ruff_cache",
     ".vscode",
-    "modules/apg",
-    "modules/consistory",
+
+    "modules/cfgzero",
+    "modules/flash_attn_triton_amd",
+    "modules/hidiffusion",
+    "modules/intel/ipex",
+    "modules/k-diffusion",
+    "modules/pag",
+    "modules/schedulers",
+    "modules/teacache",
+
     "modules/control/proc",
     "modules/control/units",
-    "modules/freescale",
-    "modules/flex2",
-    "modules/ggml",
-    "modules/hidiffusion",
-    "modules/hijack",
-    "modules/instantir",
-    "modules/intel/ipex",
-    "modules/intel/openvino",
-    "modules/k-diffusion",
-    "modules/ldsr",
-    "modules/meissonic",
-    "modules/mod",
-    "modules/omnigen",
-    "modules/omnigen2",
-    "modules/hidream",
-    "modules/pag",
-    "modules/pixelsmith",
+    "modules/control/units/xs_pipe.py",
     "modules/postprocess/aurasr_arch.py",
-    "modules/prompt_parser_xhinker.py",
-    "modules/pulid/eva_clip",
-    "modules/ras",
-    "modules/rife",
-    "modules/schedulers",
-    "modules/segmoe",
-    "modules/taesd",
-    "modules/teacache",
-    "modules/todo",
-    "modules/unipc",
-    "modules/cfgzero",
-    "modules/xadapter",
-    "modules/infiniteyou",
-    "modules/flash_attn_triton_amd",
-    "scripts/softfill.py",
+
+    "pipelines/meissonic",
+    "pipelines/omnigen2",
+    "pipelines/segmoe",
+
+    "scripts/xadapter",
+    "scripts/pulid",
+    "scripts/instantir",
+    "scripts/freescale",
+    "scripts/consistory",
+
     "repositories",
+
     "extensions-builtin/Lora",
     "extensions-builtin/sd-extension-chainner/nodes",
     "extensions-builtin/sd-webui-agent-scheduler",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba4c3462..eb140b412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log for SD.Next
 
-## Update for 2025-07-02
+## Update for 2025-07-03
 
 - **Models**
   - Add **FLUX.1-Kontext-Dev** inpaint workflow  
@@ -12,16 +12,20 @@
     enable in *settings -> compute settings -> sdp options*  
     *note*: SD.Next will use either SageAttention v1 or v2, depending which one is installed  
     until authors provide pre-build wheels for v2, you need to install it manually or SD.Next will auto-install v1  
-- **Core**  
-  - override `gradio` installer  
-  - major refactoring of requirements and dependencies to unblock `numpy>=2.1.0`  
-  - patch `insightface`  
-  - patch `k-diffusion`  
-  - better handle startup import errors  
 - **Fixes**
   - allow theme type `None` to be set in config  
   - installer dont cache installed state  
   - fix Cosmos-Predict2 retrying TAESD download  
+  - better handle startup import errors  
+- **Refactoring**  
+  - override `gradio` installer  
+  - major refactoring of requirements and dependencies to unblock `numpy>=2.1.0`  
+  - patch `insightface`  
+  - patch `k-diffusion`  
+  - cleanup `/modules`: move pipeline loaders to `/pipelines` root  
+  - cleanup `/modules`: move code folders used by scripts to `/scripts/<script>` folder  
+  - cleanup `/modules`: global rename `modules.scripts` to avoid conflict with `/scripts`  
+  - stronger lint rules  
 
 ## Update for 2025-06-30
 
diff --git a/TODO.md b/TODO.md
index cbecb502e..03667508f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -8,9 +8,14 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma
 
 - Refactor: Move `model_*` stuff into subfolder  
 - Refactor: sampler options  
-- Common repo for `T5` and `CLiP`  
+- Feature: Common repo for `T5` and `CLiP`  
+- Feature: LoRA add OMI format support for SD35/FLUX.1  
+- Feature: Merge FramePack into core  
+- Remove: legacy LoRA loader
+- Remove: Original backend
+- Remove: Agent Scheduler
 - Video: API support  
-- LoRA: add OMI format support for SD35/FLUX.1  
+- ModernUI: Lite vs Expert mode  
 
 ### Blocked items
 
@@ -66,11 +71,13 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma
 
 ## Code TODO
 
-> pnpm lint | grep W0511 | awk -F'TODO ' '{print "- "$NF}' | sed 's/ (fixme)//g'
+> pnpm lint | grep W0511 | awk -F'TODO ' '{print "- "$NF}' | sed 's/ (fixme)//g' | sort
  
 - control: support scripts via api
 - fc: autodetect distilled based on model
 - fc: autodetect tensor format based on model
+- flux transformer from-single-file with quant
+- flux: loader for civitai nf4 models
 - hypertile: vae breaks when using non-standard sizes
 - install: enable ROCm for windows when available
 - loader: load receipe
@@ -78,11 +85,12 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma
 - lora: add other quantization types
 - lora: add t5 key support for sd35/f1
 - lora: maybe force imediate quantization
+- lora: support pre-quantized flux
+- model fix: cogview4: balanced offload does not work for GlmModel
+- model load: add ChromaFillPipeline, ChromaControlPipeline, ChromaImg2ImgPipeline etc when available
+- model load: chroma transformer from-single-file with quant
 - model load: force-reloading entire model as loading transformers only leads to massive memory usage
-- model loader: implement model in-memory caching
+- model load: implement model in-memory caching
 - modernui: monkey-patch for missing tabs.select event
-- modules/lora/lora_extract.py:188:9: W0511: TODO: lora: support pre-quantized flux
-- nunchaku: batch support
-- nunchaku: cache-dir for transformer and t5 loader
 - processing: remove duplicate mask params
 - resize image: enable full VAE mode for resize-latent
diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index 0a4657383..efb1db676 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -17,7 +17,7 @@ import network_overrides
 import lora_convert
 import torch
 import diffusers.models.lora
-from modules import shared, devices, sd_models, sd_models_compile, errors, scripts, files_cache, model_quant
+from modules import shared, devices, sd_models, sd_models_compile, errors, scripts_manager, files_cache, model_quant
 
 
 debug = os.environ.get('SD_LORA_DEBUG', None) is not None
@@ -580,7 +580,7 @@ def list_available_networks():
 
 
 def infotext_pasted(infotext, params): # pylint: disable=W0613
-    if "AddNet Module 1" in [x[1] for x in scripts.scripts_txt2img.infotext_fields]:
+    if "AddNet Module 1" in [x[1] for x in scripts_manager.scripts_txt2img.infotext_fields]:
         return  # if the other extension is active, it will handle those fields, no need to do anything
     added = []
     for k in params:
diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui
index c2c0c2793..c006b67ae 160000
--- a/extensions-builtin/sdnext-modernui
+++ b/extensions-builtin/sdnext-modernui
@@ -1 +1 @@
-Subproject commit c2c0c27939e20303d63c30ea7a5e179697af8eaf
+Subproject commit c006b67aeabd8bd404de41a446e1a4f6ce4a892f
diff --git a/modules/api/generate.py b/modules/api/generate.py
index 9b409a14b..1d589eb52 100644
--- a/modules/api/generate.py
+++ b/modules/api/generate.py
@@ -1,6 +1,6 @@
 from threading import Lock
 from fastapi.responses import JSONResponse
-from modules import errors, shared, scripts, ui
+from modules import errors, shared, scripts_manager, ui
 from modules.api import models, script, helpers
 from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images
 
@@ -85,7 +85,7 @@ class APIGenerate():
 
     def post_text2img(self, txt2imgreq: models.ReqTxt2Img):
         self.prepare_face_module(txt2imgreq)
-        script_runner = scripts.scripts_txt2img
+        script_runner = scripts_manager.scripts_txt2img
         if not script_runner.scripts:
             script_runner.initialize_scripts(False)
             ui.create_ui(None)
@@ -113,10 +113,10 @@ class APIGenerate():
             script_args = script.init_script_args(p, txt2imgreq, self.default_script_arg_txt2img, selectable_scripts, selectable_script_idx, script_runner)
             p.script_args = tuple(script_args) # Need to pass args as tuple here
             if selectable_scripts is not None:
-                processed = scripts.scripts_txt2img.run(p, *script_args) # Need to pass args as list here
+                processed = scripts_manager.scripts_txt2img.run(p, *script_args) # Need to pass args as list here
             else:
                 processed = process_images(p)
-            processed = scripts.scripts_txt2img.after(p, processed, *script_args)
+            processed = scripts_manager.scripts_txt2img.after(p, processed, *script_args)
             p.close()
             shared.state.end(api=False)
         if processed is None or processed.images is None or len(processed.images) == 0:
@@ -135,7 +135,7 @@ class APIGenerate():
         mask = img2imgreq.mask
         if mask:
             mask = helpers.decode_base64_to_image(mask)
-        script_runner = scripts.scripts_img2img
+        script_runner = scripts_manager.scripts_img2img
         if not script_runner.scripts:
             script_runner.initialize_scripts(True)
             ui.create_ui(None)
@@ -165,10 +165,10 @@ class APIGenerate():
             script_args = script.init_script_args(p, img2imgreq, self.default_script_arg_img2img, selectable_scripts, selectable_script_idx, script_runner)
             p.script_args = tuple(script_args) # Need to pass args as tuple here
             if selectable_scripts is not None:
-                processed = scripts.scripts_img2img.run(p, *script_args) # Need to pass args as list here
+                processed = scripts_manager.scripts_img2img.run(p, *script_args) # Need to pass args as list here
             else:
                 processed = process_images(p)
-            processed = scripts.scripts_img2img.after(p, processed, *script_args)
+            processed = scripts_manager.scripts_img2img.after(p, processed, *script_args)
             p.close()
             shared.state.end(api=False)
         if processed is None or processed.images is None or len(processed.images) == 0:
diff --git a/modules/api/process.py b/modules/api/process.py
index 898d4073e..f1b3cd97b 100644
--- a/modules/api/process.py
+++ b/modules/api/process.py
@@ -138,7 +138,7 @@ class APIProcess():
         seed = processing_helpers.get_fixed_seed(seed)
         prompt = ''
         if req.type == 'text':
-            from modules.scripts import scripts_txt2img
+            from modules.scripts_manager import scripts_txt2img
             model = 'google/gemma-3-1b-it' if req.model is None or len(req.model) < 4 else req.model
             instance = [s for s in scripts_txt2img.scripts if 'prompt_enhance.py' in s.filename][0]
             prompt = instance.enhance(
@@ -149,7 +149,7 @@ class APIProcess():
                 nsfw=req.nsfw,
             )
         elif req.type == 'image':
-            from modules.scripts import scripts_txt2img
+            from modules.scripts_manager import scripts_txt2img
             model = 'google/gemma-3-4b-it' if req.model is None or len(req.model) < 4 else req.model
             instance = [s for s in scripts_txt2img.scripts if 'prompt_enhance.py' in s.filename][0]
             prompt = instance.enhance(
diff --git a/modules/api/script.py b/modules/api/script.py
index 4c506005e..064d26143 100644
--- a/modules/api/script.py
+++ b/modules/api/script.py
@@ -2,8 +2,8 @@ from typing import Optional
 from fastapi.exceptions import HTTPException
 import gradio as gr
 from modules.api import models
-from modules import scripts
 from modules.errors import log
+from modules import scripts_manager
 
 
 def script_name_to_index(name, scripts_list):
@@ -30,15 +30,15 @@ def get_selectable_script(script_name, script_runner):
 
 
 def get_scripts_list():
-    t2ilist = [script.name for script in scripts.scripts_txt2img.scripts if script.name is not None]
-    i2ilist = [script.name for script in scripts.scripts_img2img.scripts if script.name is not None]
-    control = [script.name for script in scripts.scripts_control.scripts if script.name is not None]
+    t2ilist = [script.name for script in scripts_manager.scripts_txt2img.scripts if script.name is not None]
+    i2ilist = [script.name for script in scripts_manager.scripts_img2img.scripts if script.name is not None]
+    control = [script.name for script in scripts_manager.scripts_control.scripts if script.name is not None]
     return models.ResScripts(txt2img = t2ilist, img2img = i2ilist, control = control)
 
 
 def get_script_info(script_name: Optional[str] = None):
     res = []
-    for script_list in [scripts.scripts_txt2img.scripts, scripts.scripts_img2img.scripts, scripts.scripts_control.scripts]:
+    for script_list in [scripts_manager.scripts_txt2img.scripts, scripts_manager.scripts_img2img.scripts, scripts_manager.scripts_control.scripts]:
         for script in script_list:
             if script.api_info is not None and (script_name is None or script_name == script.api_info.name):
                 res.append(script.api_info)
diff --git a/modules/control/run.py b/modules/control/run.py
index 8b504bf13..72c6c591e 100644
--- a/modules/control/run.py
+++ b/modules/control/run.py
@@ -13,7 +13,7 @@ from modules.control.units import xs # VisLearn ControlNet-XS
 from modules.control.units import lite # Kohya ControlLLLite
 from modules.control.units import t2iadapter # TencentARC T2I-Adapter
 from modules.control.units import reference # ControlNet-Reference
-from modules import devices, shared, errors, processing, images, sd_models, scripts, masking
+from modules import devices, shared, errors, processing, images, sd_models, scripts_manager, masking
 from modules.processing_class import StableDiffusionProcessingControl
 from modules.ui_common import infotext_to_html
 from modules.api import script
@@ -737,10 +737,10 @@ def control_run(state: str = '',
                         if sd_models.get_diffusers_task(pipe) != sd_models.DiffusersTaskType.TEXT_2_IMAGE: # force vae back to gpu if not in txt2img mode
                             sd_models.move_model(pipe.vae, devices.device)
 
-                        p.scripts = scripts.scripts_control
+                        p.scripts = scripts_manager.scripts_control
                         p.script_args = input_script_args or []
                         if len(p.script_args) == 0:
-                            script_runner = scripts.scripts_control
+                            script_runner = scripts_manager.scripts_control
                             if not script_runner.scripts:
                                 script_runner.initialize_scripts(False)
                             p.script_args = script.init_default_script_args(script_runner)
diff --git a/modules/extensions.py b/modules/extensions.py
index 204297501..fa9a60aeb 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -77,7 +77,7 @@ class Extension:
                 self.remote = None
 
     def list_files(self, subdir, extension):
-        from modules import scripts
+        from modules import scripts_manager
         dirpath = os.path.join(self.path, subdir)
         if not os.path.isdir(dirpath):
             return []
@@ -89,7 +89,7 @@ class Extension:
             if os.path.isfile(os.path.join(dirpath, "..", ".priority")):
                 with open(os.path.join(dirpath, "..", ".priority"), "r", encoding="utf-8") as f:
                     priority = str(f.read().strip())
-            res.append(scripts.ScriptFile(self.path, filename, os.path.join(dirpath, filename), priority))
+            res.append(scripts_manager.ScriptFile(self.path, filename, os.path.join(dirpath, filename), priority))
             if priority != '50':
                 shared.log.debug(f'Extension priority override: {os.path.dirname(dirpath)}:{priority}')
         res = [x for x in res if os.path.splitext(x.path)[1].lower() == extension and os.path.isfile(x.path)]
diff --git a/modules/face/__init__.py b/modules/face/__init__.py
index bcd0e4ac4..2a83d3a53 100644
--- a/modules/face/__init__.py
+++ b/modules/face/__init__.py
@@ -1,13 +1,13 @@
 import os
 import gradio as gr
 from PIL import Image
-from modules import scripts, processing, shared, images
+from modules import scripts_manager, processing, shared, images
 
 
 debug = shared.log.trace if os.environ.get('SD_FACE_DEBUG', None) is not None else lambda *args, **kwargs: None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     original_pipeline = None
     original_prompt_attention = None
 
diff --git a/modules/flash_attn_triton_amd/utils.py b/modules/flash_attn_triton_amd/utils.py
index b9912aa49..9250819b2 100644
--- a/modules/flash_attn_triton_amd/utils.py
+++ b/modules/flash_attn_triton_amd/utils.py
@@ -42,7 +42,7 @@ class MetaData():
     rotary_cos: Optional[torch.Tensor] = None
     rotary_interleaved: bool = False
     rotary_conjunction: bool = False
-    
+
 
     def __repr__(self) -> str:
         return (f"MetaData(\n"
@@ -161,7 +161,7 @@ def generate_varlen_tensor(
     if batch_size is None:
         valid_batch_sizes = [bs for bs in [1, 2, 4, 8, 16, 32, 64] if bs <= total_seqlen]
         batch_size = random.choice(valid_batch_sizes)
-    
+
     # get seqlens
     if equal_seqlens:
         seqlens = torch.full(
@@ -241,14 +241,14 @@ def input_helper(
         TOTAL_SEQLENS_Q = BATCH * N_CTX_Q
         TOTAL_SEQLENS_K = BATCH * N_CTX_K
         equal_seqlens=False
-        
+
         # gen tensors
         # TODO: the gen functions should maybe have different gen modes like random, ones, increasing seqlen
         q, cu_seqlens_q, max_seqlen_q = generate_varlen_tensor(TOTAL_SEQLENS_Q, HQ, D_HEAD, batch_size=BATCH, dtype=dtype, device=device, equal_seqlens=equal_seqlens, DEBUG_INPUT=DEBUG_INPUT)
         k, cu_seqlens_k, max_seqlen_k = generate_varlen_tensor(TOTAL_SEQLENS_K, HK, D_HEAD, batch_size=BATCH, dtype=dtype, device=device, equal_seqlens=equal_seqlens, DEBUG_INPUT=DEBUG_INPUT)
         v, _, _ = generate_varlen_tensor(TOTAL_SEQLENS_K, HK, D_HEAD, batch_size=BATCH, dtype=dtype, device=device, equal_seqlens=equal_seqlens, DEBUG_INPUT=DEBUG_INPUT)
         do = torch.ones_like(q) if DEBUG_INPUT else torch.randn_like(q)
-        
+
         # setup metadata
         if DEBUG_INPUT:
             sm_scale = 1
@@ -369,7 +369,7 @@ def get_shape_from_layout(
             raise ValueError("cu_seqlens must be provided for varlen (thd) layout") 
         if max_seqlen is None:
             raise ValueError("max_seqlen must be provided for varlen (thd) layout")
-        
+
         batch, max_seqlen_final, num_heads, head_dim = len(cu_seqlens) - 1, max_seqlen, num_heads, head_dim
     else:
         assert False, "Got unsupported layout."
@@ -380,7 +380,7 @@ def get_shape_from_layout(
 def get_shapes_from_layout(q, k, layout, cu_seqlens_q = None, cu_seqlens_k = None, max_seqlen_q=None, max_seqlen_k=None):
     batch_q, seqlen_q, nheads_q, head_size_q = get_shape_from_layout(q, layout, cu_seqlens_q, max_seqlen_q)
     batch_k, seqlen_k, nheads_k, head_size_k = get_shape_from_layout(k, layout, cu_seqlens_k, max_seqlen_k)
-    
+
     # assert
     assert batch_q == batch_k
     assert head_size_q == head_size_k
@@ -458,22 +458,22 @@ def write_dropout_mask(x, tensor_name = "tensor"):
                 if True:
                     BLOCK_M = 64
                     BLOCK_N = 64
-                
+
                     # Calculate number of blocks in each dimension
                     m_blocks = math.ceil(seqlen_m / BLOCK_M)
                     n_blocks = math.ceil(seqlen_n / BLOCK_N)
-                    
+
                     # Process each block
                     for m_block in range(m_blocks):
                         # Calculate row range for current block
                         row_start = m_block * BLOCK_M
                         row_end = min(row_start + BLOCK_M, seqlen_m)
-                        
+
                         for n_block in range(n_blocks):
                             # Calculate column range for current block
                             col_start = n_block * BLOCK_N
                             col_end = min(col_start + BLOCK_N, seqlen_n)
-                            
+
                             # Extract and write the current block
                             for row_idx in range(row_start, row_end):
                                 row_data = dropout_mask[row_idx][col_start:col_end]
diff --git a/modules/gr_hijack.py b/modules/gr_hijack.py
index 9f9d1b9cb..b4607cc11 100644
--- a/modules/gr_hijack.py
+++ b/modules/gr_hijack.py
@@ -1,7 +1,7 @@
 from PIL import Image
 import gradio as gr
 import gradio.processing_utils
-from modules import scripts, patches, gr_tempdir
+from modules import scripts_manager, patches, gr_tempdir
 
 
 hijacked = False
@@ -44,14 +44,14 @@ def add_classes_to_gradio_component(comp):
 
 def IOComponent_init(self, *args, **kwargs):
     self.webui_tooltip = kwargs.pop('tooltip', None)
-    if scripts.scripts_current is not None:
-        scripts.scripts_current.before_component(self, **kwargs)
-    scripts.script_callbacks.before_component_callback(self, **kwargs)
+    if scripts_manager.scripts_current is not None:
+        scripts_manager.scripts_current.before_component(self, **kwargs)
+    scripts_manager.script_callbacks.before_component_callback(self, **kwargs)
     res = original_IOComponent_init(self, *args, **kwargs) # pylint: disable=assignment-from-no-return
     add_classes_to_gradio_component(self)
-    scripts.script_callbacks.after_component_callback(self, **kwargs)
-    if scripts.scripts_current is not None:
-        scripts.scripts_current.after_component(self, **kwargs)
+    scripts_manager.script_callbacks.after_component_callback(self, **kwargs)
+    if scripts_manager.scripts_current is not None:
+        scripts_manager.scripts_current.after_component(self, **kwargs)
     return res
 
 
@@ -65,14 +65,14 @@ def Block_get_config(self):
 
 
 def BlockContext_init(self, *args, **kwargs):
-    if scripts.scripts_current is not None:
-        scripts.scripts_current.before_component(self, **kwargs)
-    scripts.script_callbacks.before_component_callback(self, **kwargs)
+    if scripts_manager.scripts_current is not None:
+        scripts_manager.scripts_current.before_component(self, **kwargs)
+    scripts_manager.script_callbacks.before_component_callback(self, **kwargs)
     res = original_BlockContext_init(self, *args, **kwargs) # pylint: disable=assignment-from-no-return
     add_classes_to_gradio_component(self)
-    scripts.script_callbacks.after_component_callback(self, **kwargs)
-    if scripts.scripts_current is not None:
-        scripts.scripts_current.after_component(self, **kwargs)
+    scripts_manager.script_callbacks.after_component_callback(self, **kwargs)
+    if scripts_manager.scripts_current is not None:
+        scripts_manager.scripts_current.after_component(self, **kwargs)
     return res
 
 
diff --git a/modules/hidiffusion/utils.py b/modules/hidiffusion/utils.py
index b1b3a7347..d6cd79beb 100644
--- a/modules/hidiffusion/utils.py
+++ b/modules/hidiffusion/utils.py
@@ -5,14 +5,14 @@ def isinstance_str(x: object, cls_name: str):
     """
     Checks whether x has any class *named* cls_name in its ancestry.
     Doesn't require access to the class's implementation.
-    
+
     Useful for patching!
     """
 
     for _cls in x.__class__.__mro__:
         if _cls.__name__ == cls_name:
             return True
-    
+
     return False
 
 
@@ -29,4 +29,3 @@ def init_generator(device: torch.device, fallback: torch.Generator=None):
             return init_generator(torch.device("cpu"))
         else:
             return fallback
-    
\ No newline at end of file
diff --git a/modules/img2img.py b/modules/img2img.py
index 888bf3626..8a31044f7 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -3,8 +3,7 @@ import itertools # SBM Batch frames
 import numpy as np
 import filetype
 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
-import modules.scripts
-from modules import shared, processing, images
+from modules import scripts_manager, shared, processing, images
 from modules.generation_parameters_copypaste import create_override_settings_dict
 from modules.ui_common import plaintext_to_html
 from modules.memstats import memory_stats
@@ -100,7 +99,7 @@ def process_batch(p, input_files, input_dir, output_dir, inpaint_mask_dir, args)
 
         batch_image_files = batch_image_files * btcrept # List used for naming later.
 
-        processed = modules.scripts.scripts_img2img.run(p, *args)
+        processed = scripts_manager.scripts_img2img.run(p, *args)
         if processed is None:
             processed = processing.process_images(p)
 
@@ -124,7 +123,7 @@ def process_batch(p, input_files, input_dir, output_dir, inpaint_mask_dir, args)
             for k, v in items.items():
                 image.info[k] = v
             images.save_image(image, path=output_dir, basename=basename, seed=None, prompt=None, extension=ext, info=geninfo, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=image.info, forced_filename=forced_filename)
-        processed = modules.scripts.scripts_img2img.after(p, processed, *args)
+        processed = scripts_manager.scripts_img2img.after(p, processed, *args)
         shared.log.debug(f'Processed: images={len(batch_image_files)} memory={memory_stats()} batch')
 
 
@@ -289,7 +288,7 @@ def img2img(id_task: str, state: str, mode: int,
         # override
         override_settings=override_settings,
     )
-    p.scripts = modules.scripts.scripts_img2img
+    p.scripts = scripts_manager.scripts_img2img
     p.script_args = args
     p.state = state
     if mask:
@@ -304,10 +303,10 @@ def img2img(id_task: str, state: str, mode: int,
         process_batch(p, img2img_batch_files, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args)
         processed = processing.Processed(p, [], p.seed, "")
     else:
-        processed = modules.scripts.scripts_img2img.run(p, *args)
+        processed = scripts_manager.scripts_img2img.run(p, *args)
         if processed is None:
             processed = processing.process_images(p)
-        processed = modules.scripts.scripts_img2img.after(p, processed, *args)
+        processed = scripts_manager.scripts_img2img.after(p, processed, *args)
     p.close()
     generation_info_js = processed.js() if processed is not None else ''
     if processed is None:
diff --git a/modules/ldsr/sd_hijack_autoencoder.py b/modules/ldsr/sd_hijack_autoencoder.py
index 6722c190a..4fd7d67fe 100644
--- a/modules/ldsr/sd_hijack_autoencoder.py
+++ b/modules/ldsr/sd_hijack_autoencoder.py
@@ -137,7 +137,7 @@ class VQModel(pl.LightningModule):
                 # do the first few batches with max size to avoid later oom
                 new_resize = upper_size
             else:
-                new_resize = np.random.choice(np.arange(lower_size, upper_size+16, 16)) # noqa: NPY002
+                new_resize = np.random.choice(np.arange(lower_size, upper_size+16, 16))
             if new_resize != x.shape[2]:
                 x = F.interpolate(x, size=new_resize, mode="bicubic")
             x = x.detach()
diff --git a/modules/model_quant.py b/modules/model_quant.py
index cbacd7842..4f247cb4b 100644
--- a/modules/model_quant.py
+++ b/modules/model_quant.py
@@ -347,7 +347,7 @@ def sdnq_quantize_model(model, op=None, sd_model=None, do_gc: bool = True, weigh
         return_device = None
 
     if getattr(model, "_keep_in_fp32_modules", None) is not None:
-        modules_to_not_convert.extend(model._keep_in_fp32_modules)
+        modules_to_not_convert.extend(model._keep_in_fp32_modules) # pylint: disable=protected-access
     if model.__class__.__name__ == "ChromaTransformer2DModel":
         modules_to_not_convert.append("distilled_guidance_layer")
 
diff --git a/modules/model_te.py b/modules/model_te.py
index 27ad10357..049effd28 100644
--- a/modules/model_te.py
+++ b/modules/model_te.py
@@ -70,13 +70,13 @@ def load_t5(name=None, cache_dir=None):
 
     elif 'int8' in name.lower():
         from modules.model_quant import create_sdnq_config
-        quantization_config = create_sdnq_config(kwargs=None, allow_sdnq=True, module='any', weights_dtype='int8')
+        quantization_config = create_sdnq_config(kwargs=None, allow=True, module='any', weights_dtype='int8')
         if quantization_config is not None:
             t5 = transformers.T5EncoderModel.from_pretrained(repo_id, subfolder='text_encoder_3', quantization_config=quantization_config, cache_dir=cache_dir, torch_dtype=devices.dtype)
 
     elif 'uint4' in name.lower():
         from modules.model_quant import create_sdnq_config
-        quantization_config = create_sdnq_config(kwargs=None, allow_sdnq=True, module='any', weights_dtype='uint4')
+        quantization_config = create_sdnq_config(kwargs=None, allow=True, module='any', weights_dtype='uint4')
         if quantization_config is not None:
             t5 = transformers.T5EncoderModel.from_pretrained(repo_id, subfolder='text_encoder_3', quantization_config=quantization_config, cache_dir=cache_dir, torch_dtype=devices.dtype)
 
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 967bd04cc..aa9054ffc 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -4,7 +4,7 @@ from typing import List
 
 from PIL import Image
 
-from modules import shared, images, devices, scripts, scripts_postprocessing, infotext
+from modules import shared, images, devices, scripts_manager, scripts_postprocessing, infotext
 from modules.shared import opts
 
 
@@ -70,7 +70,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp
             continue
         shared.state.textinfo = name
         pp = scripts_postprocessing.PostprocessedImage(image.convert("RGB"))
-        scripts.scripts_postproc.run(pp, args)
+        scripts_manager.scripts_postproc.run(pp, args)
         geninfo, items = images.read_info_from_image(image)
         params = infotext.parse(geninfo)
         for k, v in items.items():
@@ -89,7 +89,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp
         if extras_mode != 2 or show_extras_results:
             outputs.append(pp.image)
         image.close()
-    scripts.scripts_postproc.postprocess(processed_images, args)
+    scripts_manager.scripts_postproc.postprocess(processed_images, args)
 
     devices.torch_gc()
     return outputs, info, params
@@ -98,7 +98,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp
 def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, gfpgan_visibility, codeformer_visibility, codeformer_weight, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, upscale_first: bool, save_output: bool = True): #pylint: disable=unused-argument
     """old handler for API"""
 
-    args = scripts.scripts_postproc.create_args_for_run({
+    args = scripts_manager.scripts_postproc.create_args_for_run({
         "Upscale": {
             "upscale_mode": resize_mode,
             "upscale_by": upscaling_resize,
diff --git a/modules/processing.py b/modules/processing.py
index 6fdb69d97..fcf85f82d 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -4,7 +4,7 @@ import time
 from contextlib import nullcontext
 import numpy as np
 from PIL import Image, ImageOps
-from modules import shared, devices, errors, images, scripts, memstats, lowvram, script_callbacks, extra_networks, detailer, sd_models, sd_checkpoint, sd_vae, processing_helpers, timer, face_restoration, token_merge
+from modules import shared, devices, errors, images, scripts_manager, memstats, lowvram, script_callbacks, extra_networks, detailer, sd_models, sd_checkpoint, sd_vae, processing_helpers, timer, face_restoration, token_merge
 from modules.sd_hijack_hypertile import context_hypertile_vae, context_hypertile_unet
 from modules.processing_class import StableDiffusionProcessing, StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, StableDiffusionProcessingControl, StableDiffusionProcessingVideo # pylint: disable=unused-import
 from modules.processing_info import create_infotext
@@ -128,7 +128,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     debug(f'Process images: {vars(p)}')
     if not hasattr(p.sd_model, 'sd_checkpoint_info'):
         return None
-    if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+    if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
         p.scripts.before_process(p)
     stored_opts = {}
     for k, v in p.override_settings.copy().items():
@@ -290,7 +290,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
     process_init(p)
     if not shared.native and os.path.exists(shared.opts.embeddings_dir) and not p.do_not_reload_embeddings:
         modules.sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings(force_reload=False)
-    if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+    if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
         p.scripts.process(p)
 
     ema_scope_context = p.sd_model.ema_scope if not shared.native else nullcontext
@@ -324,19 +324,19 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
                 p.negative_prompts = p.all_negative_prompts[n * p.batch_size:(n+1) * p.batch_size]
             p.seeds = p.all_seeds[n * p.batch_size:(n+1) * p.batch_size]
             p.subseeds = p.all_subseeds[n * p.batch_size:(n+1) * p.batch_size]
-            if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+            if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
                 p.scripts.before_process_batch(p, batch_number=n, prompts=p.prompts, seeds=p.seeds, subseeds=p.subseeds)
             if len(p.prompts) == 0:
                 break
             p.prompts, p.network_data = extra_networks.parse_prompts(p.prompts)
             if not shared.native:
                 extra_networks.activate(p, p.network_data)
-            if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+            if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
                 p.scripts.process_batch(p, batch_number=n, prompts=p.prompts, seeds=p.seeds, subseeds=p.subseeds)
 
             samples = None
             timer.process.record('init')
-            if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+            if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
                 processed = p.scripts.process_images(p)
                 if processed is not None:
                     samples = processed.images
@@ -358,12 +358,12 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
             if not shared.native and (shared.cmd_opts.lowvram or shared.cmd_opts.medvram):
                 lowvram.send_everything_to_cpu()
                 devices.torch_gc()
-            if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+            if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
                 p.scripts.postprocess_batch(p, samples, batch_number=n)
-            if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
+            if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
                 p.prompts = p.all_prompts[n * p.batch_size:(n+1) * p.batch_size]
                 p.negative_prompts = p.all_negative_prompts[n * p.batch_size:(n+1) * p.batch_size]
-                batch_params = scripts.PostprocessBatchListArgs(list(samples))
+                batch_params = scripts_manager.PostprocessBatchListArgs(list(samples))
                 p.scripts.postprocess_batch_list(p, batch_params, batch_number=n)
                 samples = batch_params.images
 
@@ -402,8 +402,8 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
                         info = create_infotext(p, p.prompts, p.seeds, p.subseeds, index=i)
                         images.save_image(image_without_cc, path=p.outpath_samples, basename="", seed=p.seeds[i], prompt=p.prompts[i], extension=shared.opts.samples_format, info=info, p=p, suffix="-before-color-correct")
                     image = apply_color_correction(p.color_corrections[i], image)
-                if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner):
-                    pp = scripts.PostprocessImageArgs(image)
+                if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner):
+                    pp = scripts_manager.PostprocessImageArgs(image)
                     p.scripts.postprocess_image(p, pp)
                     if pp.image is not None:
                         image = pp.image
@@ -496,7 +496,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
         index_of_first_image=index_of_first_image,
         infotexts=infotexts,
     )
-    if p.scripts is not None and isinstance(p.scripts, scripts.ScriptRunner) and not (shared.state.interrupted or shared.state.skipped):
+    if p.scripts is not None and isinstance(p.scripts, scripts_manager.ScriptRunner) and not (shared.state.interrupted or shared.state.skipped):
         p.scripts.postprocess(p, processed)
     timer.process.record('post')
     if not p.disable_extra_networks:
diff --git a/modules/processing_class.py b/modules/processing_class.py
index fc611b3ce..7d1415366 100644
--- a/modules/processing_class.py
+++ b/modules/processing_class.py
@@ -8,7 +8,7 @@ import torch
 import numpy as np
 import cv2
 from PIL import Image, ImageOps
-from modules import shared, devices, images, scripts, masking, sd_samplers, sd_models, processing_helpers
+from modules import shared, devices, images, scripts_manager, masking, sd_samplers, sd_models, processing_helpers
 from modules.sd_hijack_hypertile import hypertile_set
 
 
@@ -278,7 +278,7 @@ class StableDiffusionProcessing:
         self.prompt_for_display: str = None
 
         # scripts
-        self.scripts_value: scripts.ScriptRunner = field(default=None, init=False)
+        self.scripts_value: scripts_manager.ScriptRunner = field(default=None, init=False)
         self.script_args_value: list = field(default=None, init=False)
         self.scripts_setup_complete: bool = field(default=False, init=False)
         self.script_args = script_args
diff --git a/modules/prompt_parser_xhinker.py b/modules/prompt_parser_xhinker.py
index e2f40fc26..25fdb11ec 100644
--- a/modules/prompt_parser_xhinker.py
+++ b/modules/prompt_parser_xhinker.py
@@ -731,7 +731,7 @@ def get_weighted_text_embeddings_sdxl_refiner(
 
         for z in range(len(neg_weight_tensor_2)):
             if neg_weight_tensor_2[z] != 1.0:
-                ow = neg_weight_tensor_2[z] - 1
+                # ow = neg_weight_tensor_2[z] - 1
                 # neg_weight = 1 + (math.exp(ow)/(math.exp(ow) + 1) - 0.5) * 2
 
                 # add weight method 1:
@@ -1330,7 +1330,6 @@ def get_weighted_text_embeddings_sd3(
     sd3_neg_prompt_embeds = torch.cat([clip_neg_prompt_embeds, t5_neg_prompt_embeds], dim=-2)
 
     # padding
-    import torch.nn.functional as F
     size_diff = sd3_neg_prompt_embeds.size(1) - sd3_prompt_embeds.size(1)
     # Calculate padding. Format for pad is (padding_left, padding_right, padding_top, padding_bottom, padding_front, padding_back)
     # Since we are padding along the second dimension (axis=1), we need (0, 0, padding_top, padding_bottom, 0, 0)
diff --git a/modules/scripts.py b/modules/scripts.py
index 1ff034f6f..1de7b0a1e 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -1,730 +1,2 @@
-import os
-import re
-import sys
-import time
-from collections import namedtuple
-from dataclasses import dataclass
-import gradio as gr
-from modules import paths, script_callbacks, extensions, script_loading, scripts_postprocessing, errors, timer
-from installer import control_extensions
-
-
-AlwaysVisible = object()
-time_component = {}
-time_setup = {}
-debug = errors.log.trace if os.environ.get('SD_SCRIPT_DEBUG', None) is not None else lambda *args, **kwargs: None
-
-
-class PostprocessImageArgs:
-    def __init__(self, image):
-        self.image = image
-
-
-class PostprocessBatchListArgs:
-    def __init__(self, images):
-        self.images = images
-
-
-@dataclass
-class OnComponent:
-    component: gr.blocks.Block
-
-
-class Script:
-    parent = None
-    name = None
-    filename = None
-    args_from = 0
-    args_to = 0
-    alwayson = False
-    is_txt2img = False
-    is_img2img = False
-    api_info = None
-    group = None
-    infotext_fields = None
-    paste_field_names = None
-    section = None
-    standalone = False
-    on_before_component_elem_id = [] # list of callbacks to be called before a component with an elem_id is created
-    on_after_component_elem_id = [] # list of callbacks to be called after a component with an elem_id is created
-
-    def title(self):
-        """this function should return the title of the script. This is what will be displayed in the dropdown menu."""
-        raise NotImplementedError
-
-    def ui(self, is_img2img):
-        """this function should create gradio UI elements. See https://gradio.app/docs/#components
-        The return value should be an array of all components that are used in processing.
-        Values of those returned components will be passed to run() and process() functions.
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def show(self, is_img2img): # pylint: disable=unused-argument
-        """
-        is_img2img is True if this function is called for the img2img interface, and False otherwise
-        This function should return:
-         - False if the script should not be shown in UI at all
-         - True if the script should be shown in UI if it's selected in the scripts dropdown
-         - script.AlwaysVisible if the script should be shown in UI at all times
-         """
-        return True
-
-    def run(self, p, *args):
-        """
-        This function is called if the script has been selected in the script dropdown.
-        It must do all processing and return the Processed object with results, same as
-        one returned by processing.process_images.
-        Usually the processing is done by calling the processing.process_images function.
-        args contains all values returned by components from ui()
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def setup(self, p, *args):
-        """For AlwaysVisible scripts, this function is called when the processing object is set up, before any processing starts.
-        args contains all values returned by components from ui().
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def before_process(self, p, *args):
-        """
-        This function is called very early during processing begins for AlwaysVisible scripts.
-        You can modify the processing object (p) here, inject hooks, etc.
-        args contains all values returned by components from ui()
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def process(self, p, *args):
-        """
-        This function is called before processing begins for AlwaysVisible scripts.
-        You can modify the processing object (p) here, inject hooks, etc.
-        args contains all values returned by components from ui()
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def process_images(self, p, *args):
-        """
-        This function is called instead of main processing for AlwaysVisible scripts.
-        You can modify the processing object (p) here, inject hooks, etc.
-        args contains all values returned by components from ui()
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def before_process_batch(self, p, *args, **kwargs):
-        """
-        Called before extra networks are parsed from the prompt, so you can add
-        new extra network keywords to the prompt with this callback.
-        **kwargs will have those items:
-          - batch_number - index of current batch, from 0 to number of batches-1
-          - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things
-          - seeds - list of seeds for current batch
-          - subseeds - list of subseeds for current batch
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def process_batch(self, p, *args, **kwargs):
-        """
-        Same as process(), but called for every batch.
-        **kwargs will have those items:
-          - batch_number - index of current batch, from 0 to number of batches-1
-          - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things
-          - seeds - list of seeds for current batch
-          - subseeds - list of subseeds for current batch
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def postprocess_batch(self, p, *args, **kwargs):
-        """
-        Same as process_batch(), but called for every batch after it has been generated.
-        **kwargs will have same items as process_batch, and also:
-          - batch_number - index of current batch, from 0 to number of batches-1
-          - images - torch tensor with all generated images, with values ranging from 0 to 1;
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def postprocess_image(self, p, pp: PostprocessImageArgs, *args):
-        """
-        Called for every image after it has been generated.
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def postprocess_batch_list(self, p, pp: PostprocessBatchListArgs, *args, **kwargs):
-        """
-        Same as postprocess_batch(), but receives batch images as a list of 3D tensors instead of a 4D tensor.
-        This is useful when you want to update the entire batch instead of individual images.
-        You can modify the postprocessing object (pp) to update the images in the batch, remove images, add images, etc.
-        If the number of images is different from the batch size when returning,
-        then the script has the responsibility to also update the following attributes in the processing object (p):
-          - p.prompts
-          - p.negative_prompts
-          - p.seeds
-          - p.subseeds
-        **kwargs will have same items as process_batch, and also:
-          - batch_number - index of current batch, from 0 to number of batches-1
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def postprocess(self, p, processed, *args):
-        """
-        This function is called after processing ends for AlwaysVisible scripts.
-        args contains all values returned by components from ui()
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def before_component(self, component, **kwargs):
-        """
-        Called before a component is created.
-        Use elem_id/label fields of kwargs to figure out which component it is.
-        This can be useful to inject your own components somewhere in the middle of vanilla UI.
-        You can return created components in the ui() function to add them to the list of arguments for your processing functions
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def after_component(self, component, **kwargs):
-        """
-        Called after a component is created. Same as above.
-        """
-        pass # pylint: disable=unnecessary-pass
-
-    def describe(self):
-        """unused"""
-        return ""
-
-    def elem_id(self, item_id):
-        """helper function to generate id for a HTML element, constructs final id out of script name, tab and user-supplied item_id"""
-        title = re.sub(r'[^a-z_0-9]', '', re.sub(r'\s', '_', self.title().lower()))
-        return f'script_{self.parent}_{title}_{item_id}'
-
-
-current_basedir = paths.script_path
-
-
-def basedir():
-    """returns the base directory for the current script. For scripts in the main scripts directory,
-    this is the main directory (where webui.py resides), and for scripts in extensions directory
-    (ie extensions/aesthetic/script/aesthetic.py), this is extension's directory (extensions/aesthetic)
-    """
-    return current_basedir
-
-
-ScriptFile = namedtuple("ScriptFile", ["basedir", "filename", "path", "priority"])
-scripts_data = []
-postprocessing_scripts_data = []
-ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedir", "module"])
-
-
-def list_scripts(scriptdirname, extension):
-    tmp_list = []
-    base = os.path.join(paths.script_path, scriptdirname)
-    if os.path.exists(base):
-        for filename in sorted(os.listdir(base)):
-            tmp_list.append(ScriptFile(paths.script_path, filename, os.path.join(base, filename), '50'))
-    for ext in extensions.active():
-        tmp_list += ext.list_files(scriptdirname, extension)
-    priority_list = []
-    for script in tmp_list:
-        if os.path.splitext(script.path)[1].lower() == extension and os.path.isfile(script.path):
-            if script.basedir == paths.script_path:
-                priority = '0'
-            elif script.basedir.startswith(os.path.join(paths.script_path, 'scripts')):
-                priority = '1'
-            elif script.basedir.startswith(os.path.join(paths.script_path, 'extensions-builtin')):
-                priority = '2'
-            elif script.basedir.startswith(os.path.join(paths.script_path, 'extensions')):
-                priority = '3'
-            else:
-                priority = '9'
-            if os.path.isfile(os.path.join(base, "..", ".priority")):
-                with open(os.path.join(base, "..", ".priority"), "r", encoding="utf-8") as f:
-                    priority = priority + str(f.read().strip())
-                    errors.log.debug(f'Script priority override: ${script.name}:{priority}')
-            else:
-                priority = priority + script.priority
-            priority_list.append(ScriptFile(script.basedir, script.filename, script.path, priority))
-            debug(f'Adding script: folder="{script.basedir}" file="{script.filename}" full="{script.path}" priority={priority}')
-    priority_sort = sorted(priority_list, key=lambda item: item.priority + item.path.lower(), reverse=False)
-    return priority_sort
-
-
-def list_files_with_name(filename):
-    res = []
-    dirs = [paths.script_path] + [ext.path for ext in extensions.active()]
-    for dirpath in dirs:
-        if not os.path.isdir(dirpath):
-            continue
-        path = os.path.join(dirpath, filename)
-        if os.path.isfile(path):
-            res.append(path)
-    return res
-
-
-def load_scripts():
-    t = timer.Timer()
-    t0 = time.time()
-    global current_basedir # pylint: disable=global-statement
-    scripts_data.clear()
-    postprocessing_scripts_data.clear()
-    script_callbacks.clear_callbacks()
-    scripts_list = list_scripts('scripts', '.py') + list_scripts(os.path.join('modules', 'face'), '.py')
-    scripts_list = sorted(scripts_list, key=lambda item: item.priority + item.path.lower(), reverse=False)
-    syspath = sys.path
-
-    def register_scripts_from_module(module, scriptfile):
-        for script_class in module.__dict__.values():
-            if type(script_class) != type:
-                continue
-            debug(f'Registering script: path="{scriptfile.path}"')
-            if issubclass(script_class, Script):
-                scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
-            elif issubclass(script_class, scripts_postprocessing.ScriptPostprocessing):
-                postprocessing_scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
-
-    for scriptfile in scripts_list:
-        try:
-            if scriptfile.basedir != paths.script_path:
-                sys.path = [scriptfile.basedir] + sys.path
-            current_basedir = scriptfile.basedir
-            script_module = script_loading.load_module(scriptfile.path)
-            register_scripts_from_module(script_module, scriptfile)
-        except Exception as e:
-            errors.display(e, f'Load script: {scriptfile.filename}')
-        finally:
-            current_basedir = paths.script_path
-            t.record(os.path.basename(scriptfile.basedir) if scriptfile.basedir != paths.script_path else scriptfile.filename)
-            sys.path = syspath
-
-    global scripts_txt2img, scripts_img2img, scripts_control, scripts_postproc # pylint: disable=global-statement
-    scripts_txt2img = ScriptRunner('txt2img')
-    scripts_img2img = ScriptRunner('img2img')
-    scripts_control = ScriptRunner('control')
-    scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
-    return t, time.time()-t0
-
-
-def wrap_call(func, filename, funcname, *args, default=None, **kwargs):
-    try:
-        res = func(*args, **kwargs)
-        return res
-    except Exception as e:
-        errors.display(e, f'Calling script: {filename}/{funcname}')
-    return default
-
-
-class ScriptSummary:
-    def __init__(self, op):
-        self.start = time.time()
-        self.update = time.time()
-        self.op = op
-        self.time = {}
-
-    def record(self, script):
-        self.update = time.time()
-        self.time[script] = round(time.time() - self.update, 2)
-
-    def report(self):
-        total = sum(self.time.values())
-        if total == 0:
-            return
-        scripts = [f'{k}:{v}' for k, v in self.time.items() if v > 0]
-        errors.log.debug(f'Script: op={self.op} total={total} scripts={scripts}')
-
-
-class ScriptRunner:
-    def __init__(self, name=''):
-        self.name = name
-        self.scripts = []
-        self.selectable_scripts = []
-        self.alwayson_scripts = []
-        self.auto_processing_scripts = []
-        self.titles = []
-        self.infotext_fields = []
-        self.paste_field_names = []
-        self.script_load_ctr = 0
-        self.is_img2img = False
-        self.inputs = [None]
-        self.time = 0
-
-    def add_script(self, script_class, path, is_img2img, is_control):
-        try:
-            script = script_class()
-            script.filename = path
-            script.is_txt2img = not is_img2img
-            script.is_img2img = is_img2img
-            if is_control: # this is messy but show is a legacy function that is not aware of control tab
-                v1 = script.show(script.is_txt2img)
-                v2 = script.show(script.is_img2img)
-                if v1 == AlwaysVisible or v2 == AlwaysVisible:
-                    visibility = AlwaysVisible
-                else:
-                    visibility = v1 or v2
-            else:
-                visibility = script.show(script.is_img2img)
-            if visibility == AlwaysVisible:
-                self.scripts.append(script)
-                self.alwayson_scripts.append(script)
-                script.alwayson = True
-            elif visibility:
-                self.scripts.append(script)
-                self.selectable_scripts.append(script)
-        except Exception as e:
-            errors.log.error(f'Script initialize: {path} {e}')
-
-    def initialize_scripts(self, is_img2img=False, is_control=False):
-        from modules import scripts_auto_postprocessing
-
-        self.scripts.clear()
-        self.selectable_scripts.clear()
-        self.alwayson_scripts.clear()
-        self.titles.clear()
-        self.infotext_fields.clear()
-        self.paste_field_names.clear()
-        self.script_load_ctr = 0
-        self.is_img2img = is_img2img
-        self.scripts.clear()
-        self.alwayson_scripts.clear()
-        self.selectable_scripts.clear()
-        self.auto_processing_scripts = scripts_auto_postprocessing.create_auto_preprocessing_script_data()
-
-        sorted_scripts = sorted(scripts_data, key=lambda x: x.script_class().title().lower())
-        for script_class, path, _basedir, _script_module in sorted_scripts:
-            self.add_script(script_class, path, is_img2img, is_control)
-        sorted_scripts = sorted(self.auto_processing_scripts, key=lambda x: x.script_class().title().lower())
-        for script_class, path, _basedir, _script_module in sorted_scripts:
-            self.add_script(script_class, path, is_img2img, is_control)
-
-    def prepare_ui(self):
-        self.inputs = [None]
-
-    def setup_ui(self, parent='unknown', accordion=True):
-        import modules.api.models as api_models
-        self.titles = [wrap_call(script.title, script.filename, "title") or f"{script.filename} [error]" for script in self.selectable_scripts]
-
-        inputs = []
-        inputs_alwayson = [True]
-
-        def create_script_ui(script: Script, inputs, inputs_alwayson):
-            script.parent = parent
-            script.args_from = len(inputs)
-            script.args_to = len(inputs)
-            controls = wrap_call(script.ui, script.filename, "ui", script.is_img2img)
-            if controls is None:
-                return
-            script.name = wrap_call(script.title, script.filename, "title", default=script.filename).lower()
-            api_args = []
-            for control in controls:
-                debug(f'Script control: parent={script.parent} script="{script.name}" label="{control.label}" type={control} id={control.elem_id}')
-                if hasattr(gr.components, 'IOComponent'):
-                    if not isinstance(control, gr.components.IOComponent):
-                        errors.log.error(f'Invalid script control: "{script.filename}" control={control}')
-                        continue
-                else:
-                    if not isinstance(control, gr.components.Component):
-                        errors.log.error(f'Invalid script control: "{script.filename}" control={control}')
-                        continue
-                control.custom_script_source = os.path.basename(script.filename)
-                arg_info = api_models.ScriptArg(label=control.label or "")
-                for field in ("value", "minimum", "maximum", "step", "choices"):
-                    v = getattr(control, field, None)
-                    if v is not None:
-                        setattr(arg_info, field, v)
-                api_args.append(arg_info)
-
-            script.api_info = api_models.ItemScript(
-                name=script.name,
-                is_img2img=script.is_img2img,
-                is_alwayson=script.alwayson,
-                args=api_args,
-            )
-            if script.infotext_fields is not None:
-                self.infotext_fields += script.infotext_fields
-            if script.paste_field_names is not None:
-                self.paste_field_names += script.paste_field_names
-            inputs += controls
-            inputs_alwayson += [script.alwayson for _ in controls]
-            script.args_to = len(inputs)
-
-        with gr.Row():
-            dropdown = gr.Dropdown(label="Script", elem_id=f'{parent}_script_list', choices=["None"] + self.titles, value="None", type="index")
-            inputs.insert(0, dropdown)
-
-        with gr.Row():
-            for script in self.alwayson_scripts:
-                if not script.standalone:
-                    continue
-                if (self.name == 'control') and (script.name not in control_extensions) and (script.title() not in control_extensions):
-                    errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
-                    continue
-                t0 = time.time()
-                with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-extension']) as group:
-                    create_script_ui(script, inputs, inputs_alwayson)
-                script.group = group
-                time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
-
-        with gr.Row():
-            with gr.Accordion(label="Extensions", elem_id=f'{parent}_script_alwayson') if accordion else gr.Group():
-                for script in self.alwayson_scripts:
-                    if script.standalone:
-                        continue
-                    if (self.name == 'control') and (paths.extensions_dir in script.filename) and (script.title() not in control_extensions):
-                        errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
-                        continue
-                    t0 = time.time()
-                    with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-extension']) as group:
-                        create_script_ui(script, inputs, inputs_alwayson)
-                    script.group = group
-                    time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
-
-        for script in self.selectable_scripts:
-            if (self.name == 'control') and (paths.extensions_dir in script.filename) and (script.title() not in control_extensions):
-                errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
-                continue
-            with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-scripts'], visible=False) as group:
-                t0 = time.time()
-                create_script_ui(script, inputs, inputs_alwayson)
-                time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
-                script.group = group
-
-        def select_script(script_index):
-            if script_index is None:
-                return [gr.update(visible=False) for script in self.selectable_scripts]
-            selected_script = self.selectable_scripts[script_index - 1] if script_index > 0 else None
-            return [gr.update(visible=selected_script == s) for s in self.selectable_scripts]
-
-        def init_field(title):
-            if title == 'None': # called when an initial value is set from ui-config.json to show script's UI components
-                return
-            if title not in self.titles:
-                errors.log.error(f'Script not found: {title}')
-                return
-            script_index = self.titles.index(title)
-            self.selectable_scripts[script_index].group.visible = True
-
-        dropdown.init_field = init_field
-        dropdown.change(fn=select_script, inputs=[dropdown], outputs=[script.group for script in self.selectable_scripts if script.group is not None])
-
-        def onload_script_visibility(params):
-            title = params.get('Script', None)
-            if title:
-                title_index = self.titles.index(title)
-                visibility = title_index == self.script_load_ctr
-                self.script_load_ctr = (self.script_load_ctr + 1) % len(self.titles)
-                return gr.update(visible=visibility)
-            else:
-                return gr.update(visible=False)
-
-        self.infotext_fields.append((dropdown, lambda x: gr.update(value=x.get('Script', 'None'))))
-        self.infotext_fields.extend([(script.group, onload_script_visibility) for script in self.selectable_scripts if script.group is not None])
-        return inputs
-
-    def run(self, p, *args):
-        s = ScriptSummary('run')
-        script_index = args[0] if len(args) > 0 else 0
-        if script_index == 0:
-            return None
-        script = self.selectable_scripts[script_index-1]
-        if script is None:
-            return None
-        if 'upscale' in script.title():
-            if not hasattr(p, 'init_images') and p.task_args.get('image', None) is not None:
-                p.init_images = p.task_args['image']
-        parsed = []
-        if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
-            parsed = p.per_script_args.get(script.title(), args[script.args_from:script.args_to])
-        if hasattr(script, 'run'):
-            processed = script.run(p, *parsed)
-        else:
-            processed = None
-            errors.log.error(f'Script: file="{script.filename}" no run function defined')
-        s.record(script.title())
-        s.report()
-        return processed
-
-    def after(self, p, processed, *args):
-        s = ScriptSummary('after')
-        script_index = args[0] if len(args) > 0 else 0
-        if script_index == 0:
-            return processed
-        script = self.selectable_scripts[script_index-1]
-        if script is None or not hasattr(script, 'after'):
-            return processed
-        parsed = []
-        if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
-            parsed = p.per_script_args.get(script.title(), args[script.args_from:script.args_to])
-        after_processed = script.after(p, processed, *parsed)
-        if after_processed is not None:
-            processed = after_processed
-        s.record(script.title())
-        s.report()
-        return processed
-
-    def before_process(self, p, **kwargs):
-        s = ScriptSummary('before-process')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.before_process(p, *args, **kwargs)
-            except Exception as e:
-                errors.display(e, f"Error running before process: {script.filename}")
-            s.record(script.title())
-        s.report()
-
-    def process(self, p, **kwargs):
-        s = ScriptSummary('process')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.process(p, *args, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script process: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def process_images(self, p, **kwargs):
-        s = ScriptSummary('process_images')
-        processed = None
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    _processed = script.process_images(p, *args, **kwargs)
-                    if _processed is not None:
-                        processed = _processed
-            except Exception as e:
-                errors.display(e, f'Running script process images: {script.filename}')
-            s.record(script.title())
-        s.report()
-        return processed
-
-    def before_process_batch(self, p, **kwargs):
-        s = ScriptSummary('before-process-batch')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.before_process_batch(p, *args, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script before process batch: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def process_batch(self, p, **kwargs):
-        s = ScriptSummary('process-batch')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.process_batch(p, *args, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script process batch: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def postprocess(self, p, processed):
-        s = ScriptSummary('postprocess')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.postprocess(p, processed, *args)
-            except Exception as e:
-                errors.display(e, f'Running script postprocess: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def postprocess_batch(self, p, images, **kwargs):
-        s = ScriptSummary('postprocess-batch')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.postprocess_batch(p, *args, images=images, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script before postprocess batch: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def postprocess_batch_list(self, p, pp: PostprocessBatchListArgs, **kwargs):
-        s = ScriptSummary('postprocess-batch-list')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.postprocess_batch_list(p, pp, *args, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script before postprocess batch list: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def postprocess_image(self, p, pp: PostprocessImageArgs):
-        s = ScriptSummary('postprocess-image')
-        for script in self.alwayson_scripts:
-            try:
-                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
-                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
-                    script.postprocess_image(p, pp, *args)
-            except Exception as e:
-                errors.display(e, f'Running script postprocess image: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def before_component(self, component, **kwargs):
-        s = ScriptSummary('before-component')
-        for script in self.scripts:
-            try:
-                script.before_component(component, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script before component: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def after_component(self, component, **kwargs):
-        s = ScriptSummary('after-component')
-        for script in self.scripts:
-            for elem_id, callback in script.on_after_component_elem_id:
-                if elem_id == kwargs.get("elem_id"):
-                    try:
-                        callback(OnComponent(component=component))
-                    except Exception as e:
-                        errors.display(e, f"Running script before_component_elem_id: {script.filename}")
-            try:
-                script.after_component(component, **kwargs)
-            except Exception as e:
-                errors.display(e, f'Running script after component: {script.filename}')
-            s.record(script.title())
-        s.report()
-
-    def reload_sources(self, cache):
-        s = ScriptSummary('reload-sources')
-        for si, script in list(enumerate(self.scripts)):
-            if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
-                args_from = script.args_from
-                args_to = script.args_to
-                filename = script.filename
-                module = cache.get(filename, None)
-                if module is None:
-                    module = script_loading.load_module(script.filename)
-                    cache[filename] = module
-                for script_class in module.__dict__.values():
-                    if type(script_class) == type and issubclass(script_class, Script):
-                        self.scripts[si] = script_class()
-                        self.scripts[si].filename = filename
-                        self.scripts[si].args_from = args_from
-                        self.scripts[si].args_to = args_to
-                s.record(script.title())
-        s.report()
-
-
-scripts_txt2img: ScriptRunner = None
-scripts_img2img: ScriptRunner = None
-scripts_control: ScriptRunner = None
-scripts_current: ScriptRunner = None
-scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None
-reload_scripts = load_scripts  # compatibility alias
-
-
-def reload_script_body_only():
-    cache = {}
-    scripts_txt2img.reload_sources(cache)
-    scripts_img2img.reload_sources(cache)
-    scripts_control.reload_sources(cache)
+# compatibility with extensions that import scripts directly
+from modules.scripts_manager import * # noqa: F403
diff --git a/modules/scripts_auto_postprocessing.py b/modules/scripts_auto_postprocessing.py
index 51d948a21..a1ebc104e 100644
--- a/modules/scripts_auto_postprocessing.py
+++ b/modules/scripts_auto_postprocessing.py
@@ -1,7 +1,7 @@
-from modules import scripts, scripts_postprocessing, shared
+from modules import scripts_manager, scripts_postprocessing, shared
 
 
-class ScriptPostprocessingForMainUI(scripts.Script):
+class ScriptPostprocessingForMainUI(scripts_manager.Script):
     def __init__(self, script_postproc):
         self.script: scripts_postprocessing.ScriptPostprocessing = script_postproc
         self.postprocessing_controls = None
@@ -10,7 +10,7 @@ class ScriptPostprocessingForMainUI(scripts.Script):
         return self.script.name
 
     def show(self, is_img2img): # pylint: disable=unused-argument
-        return scripts.AlwaysVisible
+        return scripts_manager.AlwaysVisible
 
     def ui(self, is_img2img): # pylint: disable=unused-argument
         self.postprocessing_controls = self.script.ui()
@@ -28,9 +28,9 @@ class ScriptPostprocessingForMainUI(scripts.Script):
 def create_auto_preprocessing_script_data():
     res = []
     for name in shared.opts.postprocessing_enable_in_main_ui:
-        script = next(iter([x for x in scripts.postprocessing_scripts_data if x.script_class.name == name]), None)
+        script = next(iter([x for x in scripts_manager.postprocessing_scripts_data if x.script_class.name == name]), None)
         if script is None:
             continue
         constructor = lambda s=script: ScriptPostprocessingForMainUI(s.script_class()) # pylint: disable=unnecessary-lambda-assignment
-        res.append(scripts.ScriptClassData(script_class=constructor, path=script.path, basedir=script.basedir, module=script.module))
+        res.append(scripts_manager.ScriptClassData(script_class=constructor, path=script.path, basedir=script.basedir, module=script.module))
     return res
diff --git a/modules/scripts_manager.py b/modules/scripts_manager.py
new file mode 100644
index 000000000..1ff034f6f
--- /dev/null
+++ b/modules/scripts_manager.py
@@ -0,0 +1,730 @@
+import os
+import re
+import sys
+import time
+from collections import namedtuple
+from dataclasses import dataclass
+import gradio as gr
+from modules import paths, script_callbacks, extensions, script_loading, scripts_postprocessing, errors, timer
+from installer import control_extensions
+
+
+AlwaysVisible = object()
+time_component = {}
+time_setup = {}
+debug = errors.log.trace if os.environ.get('SD_SCRIPT_DEBUG', None) is not None else lambda *args, **kwargs: None
+
+
+class PostprocessImageArgs:
+    def __init__(self, image):
+        self.image = image
+
+
+class PostprocessBatchListArgs:
+    def __init__(self, images):
+        self.images = images
+
+
+@dataclass
+class OnComponent:
+    component: gr.blocks.Block
+
+
+class Script:
+    parent = None
+    name = None
+    filename = None
+    args_from = 0
+    args_to = 0
+    alwayson = False
+    is_txt2img = False
+    is_img2img = False
+    api_info = None
+    group = None
+    infotext_fields = None
+    paste_field_names = None
+    section = None
+    standalone = False
+    on_before_component_elem_id = [] # list of callbacks to be called before a component with an elem_id is created
+    on_after_component_elem_id = [] # list of callbacks to be called after a component with an elem_id is created
+
+    def title(self):
+        """this function should return the title of the script. This is what will be displayed in the dropdown menu."""
+        raise NotImplementedError
+
+    def ui(self, is_img2img):
+        """this function should create gradio UI elements. See https://gradio.app/docs/#components
+        The return value should be an array of all components that are used in processing.
+        Values of those returned components will be passed to run() and process() functions.
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def show(self, is_img2img): # pylint: disable=unused-argument
+        """
+        is_img2img is True if this function is called for the img2img interface, and False otherwise
+        This function should return:
+         - False if the script should not be shown in UI at all
+         - True if the script should be shown in UI if it's selected in the scripts dropdown
+         - script.AlwaysVisible if the script should be shown in UI at all times
+         """
+        return True
+
+    def run(self, p, *args):
+        """
+        This function is called if the script has been selected in the script dropdown.
+        It must do all processing and return the Processed object with results, same as
+        one returned by processing.process_images.
+        Usually the processing is done by calling the processing.process_images function.
+        args contains all values returned by components from ui()
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def setup(self, p, *args):
+        """For AlwaysVisible scripts, this function is called when the processing object is set up, before any processing starts.
+        args contains all values returned by components from ui().
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def before_process(self, p, *args):
+        """
+        This function is called very early during processing begins for AlwaysVisible scripts.
+        You can modify the processing object (p) here, inject hooks, etc.
+        args contains all values returned by components from ui()
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def process(self, p, *args):
+        """
+        This function is called before processing begins for AlwaysVisible scripts.
+        You can modify the processing object (p) here, inject hooks, etc.
+        args contains all values returned by components from ui()
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def process_images(self, p, *args):
+        """
+        This function is called instead of main processing for AlwaysVisible scripts.
+        You can modify the processing object (p) here, inject hooks, etc.
+        args contains all values returned by components from ui()
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def before_process_batch(self, p, *args, **kwargs):
+        """
+        Called before extra networks are parsed from the prompt, so you can add
+        new extra network keywords to the prompt with this callback.
+        **kwargs will have those items:
+          - batch_number - index of current batch, from 0 to number of batches-1
+          - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things
+          - seeds - list of seeds for current batch
+          - subseeds - list of subseeds for current batch
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def process_batch(self, p, *args, **kwargs):
+        """
+        Same as process(), but called for every batch.
+        **kwargs will have those items:
+          - batch_number - index of current batch, from 0 to number of batches-1
+          - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things
+          - seeds - list of seeds for current batch
+          - subseeds - list of subseeds for current batch
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def postprocess_batch(self, p, *args, **kwargs):
+        """
+        Same as process_batch(), but called for every batch after it has been generated.
+        **kwargs will have same items as process_batch, and also:
+          - batch_number - index of current batch, from 0 to number of batches-1
+          - images - torch tensor with all generated images, with values ranging from 0 to 1;
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def postprocess_image(self, p, pp: PostprocessImageArgs, *args):
+        """
+        Called for every image after it has been generated.
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def postprocess_batch_list(self, p, pp: PostprocessBatchListArgs, *args, **kwargs):
+        """
+        Same as postprocess_batch(), but receives batch images as a list of 3D tensors instead of a 4D tensor.
+        This is useful when you want to update the entire batch instead of individual images.
+        You can modify the postprocessing object (pp) to update the images in the batch, remove images, add images, etc.
+        If the number of images is different from the batch size when returning,
+        then the script has the responsibility to also update the following attributes in the processing object (p):
+          - p.prompts
+          - p.negative_prompts
+          - p.seeds
+          - p.subseeds
+        **kwargs will have same items as process_batch, and also:
+          - batch_number - index of current batch, from 0 to number of batches-1
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def postprocess(self, p, processed, *args):
+        """
+        This function is called after processing ends for AlwaysVisible scripts.
+        args contains all values returned by components from ui()
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def before_component(self, component, **kwargs):
+        """
+        Called before a component is created.
+        Use elem_id/label fields of kwargs to figure out which component it is.
+        This can be useful to inject your own components somewhere in the middle of vanilla UI.
+        You can return created components in the ui() function to add them to the list of arguments for your processing functions
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def after_component(self, component, **kwargs):
+        """
+        Called after a component is created. Same as above.
+        """
+        pass # pylint: disable=unnecessary-pass
+
+    def describe(self):
+        """unused"""
+        return ""
+
+    def elem_id(self, item_id):
+        """helper function to generate id for a HTML element, constructs final id out of script name, tab and user-supplied item_id"""
+        title = re.sub(r'[^a-z_0-9]', '', re.sub(r'\s', '_', self.title().lower()))
+        return f'script_{self.parent}_{title}_{item_id}'
+
+
+current_basedir = paths.script_path
+
+
+def basedir():
+    """returns the base directory for the current script. For scripts in the main scripts directory,
+    this is the main directory (where webui.py resides), and for scripts in extensions directory
+    (ie extensions/aesthetic/script/aesthetic.py), this is extension's directory (extensions/aesthetic)
+    """
+    return current_basedir
+
+
+ScriptFile = namedtuple("ScriptFile", ["basedir", "filename", "path", "priority"])
+scripts_data = []
+postprocessing_scripts_data = []
+ScriptClassData = namedtuple("ScriptClassData", ["script_class", "path", "basedir", "module"])
+
+
+def list_scripts(scriptdirname, extension):
+    tmp_list = []
+    base = os.path.join(paths.script_path, scriptdirname)
+    if os.path.exists(base):
+        for filename in sorted(os.listdir(base)):
+            tmp_list.append(ScriptFile(paths.script_path, filename, os.path.join(base, filename), '50'))
+    for ext in extensions.active():
+        tmp_list += ext.list_files(scriptdirname, extension)
+    priority_list = []
+    for script in tmp_list:
+        if os.path.splitext(script.path)[1].lower() == extension and os.path.isfile(script.path):
+            if script.basedir == paths.script_path:
+                priority = '0'
+            elif script.basedir.startswith(os.path.join(paths.script_path, 'scripts')):
+                priority = '1'
+            elif script.basedir.startswith(os.path.join(paths.script_path, 'extensions-builtin')):
+                priority = '2'
+            elif script.basedir.startswith(os.path.join(paths.script_path, 'extensions')):
+                priority = '3'
+            else:
+                priority = '9'
+            if os.path.isfile(os.path.join(base, "..", ".priority")):
+                with open(os.path.join(base, "..", ".priority"), "r", encoding="utf-8") as f:
+                    priority = priority + str(f.read().strip())
+                    errors.log.debug(f'Script priority override: ${script.name}:{priority}')
+            else:
+                priority = priority + script.priority
+            priority_list.append(ScriptFile(script.basedir, script.filename, script.path, priority))
+            debug(f'Adding script: folder="{script.basedir}" file="{script.filename}" full="{script.path}" priority={priority}')
+    priority_sort = sorted(priority_list, key=lambda item: item.priority + item.path.lower(), reverse=False)
+    return priority_sort
+
+
+def list_files_with_name(filename):
+    res = []
+    dirs = [paths.script_path] + [ext.path for ext in extensions.active()]
+    for dirpath in dirs:
+        if not os.path.isdir(dirpath):
+            continue
+        path = os.path.join(dirpath, filename)
+        if os.path.isfile(path):
+            res.append(path)
+    return res
+
+
+def load_scripts():
+    t = timer.Timer()
+    t0 = time.time()
+    global current_basedir # pylint: disable=global-statement
+    scripts_data.clear()
+    postprocessing_scripts_data.clear()
+    script_callbacks.clear_callbacks()
+    scripts_list = list_scripts('scripts', '.py') + list_scripts(os.path.join('modules', 'face'), '.py')
+    scripts_list = sorted(scripts_list, key=lambda item: item.priority + item.path.lower(), reverse=False)
+    syspath = sys.path
+
+    def register_scripts_from_module(module, scriptfile):
+        for script_class in module.__dict__.values():
+            if type(script_class) != type:
+                continue
+            debug(f'Registering script: path="{scriptfile.path}"')
+            if issubclass(script_class, Script):
+                scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
+            elif issubclass(script_class, scripts_postprocessing.ScriptPostprocessing):
+                postprocessing_scripts_data.append(ScriptClassData(script_class, scriptfile.path, scriptfile.basedir, module))
+
+    for scriptfile in scripts_list:
+        try:
+            if scriptfile.basedir != paths.script_path:
+                sys.path = [scriptfile.basedir] + sys.path
+            current_basedir = scriptfile.basedir
+            script_module = script_loading.load_module(scriptfile.path)
+            register_scripts_from_module(script_module, scriptfile)
+        except Exception as e:
+            errors.display(e, f'Load script: {scriptfile.filename}')
+        finally:
+            current_basedir = paths.script_path
+            t.record(os.path.basename(scriptfile.basedir) if scriptfile.basedir != paths.script_path else scriptfile.filename)
+            sys.path = syspath
+
+    global scripts_txt2img, scripts_img2img, scripts_control, scripts_postproc # pylint: disable=global-statement
+    scripts_txt2img = ScriptRunner('txt2img')
+    scripts_img2img = ScriptRunner('img2img')
+    scripts_control = ScriptRunner('control')
+    scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
+    return t, time.time()-t0
+
+
+def wrap_call(func, filename, funcname, *args, default=None, **kwargs):
+    try:
+        res = func(*args, **kwargs)
+        return res
+    except Exception as e:
+        errors.display(e, f'Calling script: {filename}/{funcname}')
+    return default
+
+
+class ScriptSummary:
+    def __init__(self, op):
+        self.start = time.time()
+        self.update = time.time()
+        self.op = op
+        self.time = {}
+
+    def record(self, script):
+        self.update = time.time()
+        self.time[script] = round(time.time() - self.update, 2)
+
+    def report(self):
+        total = sum(self.time.values())
+        if total == 0:
+            return
+        scripts = [f'{k}:{v}' for k, v in self.time.items() if v > 0]
+        errors.log.debug(f'Script: op={self.op} total={total} scripts={scripts}')
+
+
+class ScriptRunner:
+    def __init__(self, name=''):
+        self.name = name
+        self.scripts = []
+        self.selectable_scripts = []
+        self.alwayson_scripts = []
+        self.auto_processing_scripts = []
+        self.titles = []
+        self.infotext_fields = []
+        self.paste_field_names = []
+        self.script_load_ctr = 0
+        self.is_img2img = False
+        self.inputs = [None]
+        self.time = 0
+
+    def add_script(self, script_class, path, is_img2img, is_control):
+        try:
+            script = script_class()
+            script.filename = path
+            script.is_txt2img = not is_img2img
+            script.is_img2img = is_img2img
+            if is_control: # this is messy but show is a legacy function that is not aware of control tab
+                v1 = script.show(script.is_txt2img)
+                v2 = script.show(script.is_img2img)
+                if v1 == AlwaysVisible or v2 == AlwaysVisible:
+                    visibility = AlwaysVisible
+                else:
+                    visibility = v1 or v2
+            else:
+                visibility = script.show(script.is_img2img)
+            if visibility == AlwaysVisible:
+                self.scripts.append(script)
+                self.alwayson_scripts.append(script)
+                script.alwayson = True
+            elif visibility:
+                self.scripts.append(script)
+                self.selectable_scripts.append(script)
+        except Exception as e:
+            errors.log.error(f'Script initialize: {path} {e}')
+
+    def initialize_scripts(self, is_img2img=False, is_control=False):
+        from modules import scripts_auto_postprocessing
+
+        self.scripts.clear()
+        self.selectable_scripts.clear()
+        self.alwayson_scripts.clear()
+        self.titles.clear()
+        self.infotext_fields.clear()
+        self.paste_field_names.clear()
+        self.script_load_ctr = 0
+        self.is_img2img = is_img2img
+        self.scripts.clear()
+        self.alwayson_scripts.clear()
+        self.selectable_scripts.clear()
+        self.auto_processing_scripts = scripts_auto_postprocessing.create_auto_preprocessing_script_data()
+
+        sorted_scripts = sorted(scripts_data, key=lambda x: x.script_class().title().lower())
+        for script_class, path, _basedir, _script_module in sorted_scripts:
+            self.add_script(script_class, path, is_img2img, is_control)
+        sorted_scripts = sorted(self.auto_processing_scripts, key=lambda x: x.script_class().title().lower())
+        for script_class, path, _basedir, _script_module in sorted_scripts:
+            self.add_script(script_class, path, is_img2img, is_control)
+
+    def prepare_ui(self):
+        self.inputs = [None]
+
+    def setup_ui(self, parent='unknown', accordion=True):
+        import modules.api.models as api_models
+        self.titles = [wrap_call(script.title, script.filename, "title") or f"{script.filename} [error]" for script in self.selectable_scripts]
+
+        inputs = []
+        inputs_alwayson = [True]
+
+        def create_script_ui(script: Script, inputs, inputs_alwayson):
+            script.parent = parent
+            script.args_from = len(inputs)
+            script.args_to = len(inputs)
+            controls = wrap_call(script.ui, script.filename, "ui", script.is_img2img)
+            if controls is None:
+                return
+            script.name = wrap_call(script.title, script.filename, "title", default=script.filename).lower()
+            api_args = []
+            for control in controls:
+                debug(f'Script control: parent={script.parent} script="{script.name}" label="{control.label}" type={control} id={control.elem_id}')
+                if hasattr(gr.components, 'IOComponent'):
+                    if not isinstance(control, gr.components.IOComponent):
+                        errors.log.error(f'Invalid script control: "{script.filename}" control={control}')
+                        continue
+                else:
+                    if not isinstance(control, gr.components.Component):
+                        errors.log.error(f'Invalid script control: "{script.filename}" control={control}')
+                        continue
+                control.custom_script_source = os.path.basename(script.filename)
+                arg_info = api_models.ScriptArg(label=control.label or "")
+                for field in ("value", "minimum", "maximum", "step", "choices"):
+                    v = getattr(control, field, None)
+                    if v is not None:
+                        setattr(arg_info, field, v)
+                api_args.append(arg_info)
+
+            script.api_info = api_models.ItemScript(
+                name=script.name,
+                is_img2img=script.is_img2img,
+                is_alwayson=script.alwayson,
+                args=api_args,
+            )
+            if script.infotext_fields is not None:
+                self.infotext_fields += script.infotext_fields
+            if script.paste_field_names is not None:
+                self.paste_field_names += script.paste_field_names
+            inputs += controls
+            inputs_alwayson += [script.alwayson for _ in controls]
+            script.args_to = len(inputs)
+
+        with gr.Row():
+            dropdown = gr.Dropdown(label="Script", elem_id=f'{parent}_script_list', choices=["None"] + self.titles, value="None", type="index")
+            inputs.insert(0, dropdown)
+
+        with gr.Row():
+            for script in self.alwayson_scripts:
+                if not script.standalone:
+                    continue
+                if (self.name == 'control') and (script.name not in control_extensions) and (script.title() not in control_extensions):
+                    errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
+                    continue
+                t0 = time.time()
+                with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-extension']) as group:
+                    create_script_ui(script, inputs, inputs_alwayson)
+                script.group = group
+                time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
+
+        with gr.Row():
+            with gr.Accordion(label="Extensions", elem_id=f'{parent}_script_alwayson') if accordion else gr.Group():
+                for script in self.alwayson_scripts:
+                    if script.standalone:
+                        continue
+                    if (self.name == 'control') and (paths.extensions_dir in script.filename) and (script.title() not in control_extensions):
+                        errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
+                        continue
+                    t0 = time.time()
+                    with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-extension']) as group:
+                        create_script_ui(script, inputs, inputs_alwayson)
+                    script.group = group
+                    time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
+
+        for script in self.selectable_scripts:
+            if (self.name == 'control') and (paths.extensions_dir in script.filename) and (script.title() not in control_extensions):
+                errors.log.debug(f'Script: fn="{script.filename}" type={self.name} skip')
+                continue
+            with gr.Group(elem_id=f'{parent}_script_{script.title().lower().replace(" ", "_")}', elem_classes=['group-scripts'], visible=False) as group:
+                t0 = time.time()
+                create_script_ui(script, inputs, inputs_alwayson)
+                time_setup[script.title()] = time_setup.get(script.title(), 0) + (time.time()-t0)
+                script.group = group
+
+        def select_script(script_index):
+            if script_index is None:
+                return [gr.update(visible=False) for script in self.selectable_scripts]
+            selected_script = self.selectable_scripts[script_index - 1] if script_index > 0 else None
+            return [gr.update(visible=selected_script == s) for s in self.selectable_scripts]
+
+        def init_field(title):
+            if title == 'None': # called when an initial value is set from ui-config.json to show script's UI components
+                return
+            if title not in self.titles:
+                errors.log.error(f'Script not found: {title}')
+                return
+            script_index = self.titles.index(title)
+            self.selectable_scripts[script_index].group.visible = True
+
+        dropdown.init_field = init_field
+        dropdown.change(fn=select_script, inputs=[dropdown], outputs=[script.group for script in self.selectable_scripts if script.group is not None])
+
+        def onload_script_visibility(params):
+            title = params.get('Script', None)
+            if title:
+                title_index = self.titles.index(title)
+                visibility = title_index == self.script_load_ctr
+                self.script_load_ctr = (self.script_load_ctr + 1) % len(self.titles)
+                return gr.update(visible=visibility)
+            else:
+                return gr.update(visible=False)
+
+        self.infotext_fields.append((dropdown, lambda x: gr.update(value=x.get('Script', 'None'))))
+        self.infotext_fields.extend([(script.group, onload_script_visibility) for script in self.selectable_scripts if script.group is not None])
+        return inputs
+
+    def run(self, p, *args):
+        s = ScriptSummary('run')
+        script_index = args[0] if len(args) > 0 else 0
+        if script_index == 0:
+            return None
+        script = self.selectable_scripts[script_index-1]
+        if script is None:
+            return None
+        if 'upscale' in script.title():
+            if not hasattr(p, 'init_images') and p.task_args.get('image', None) is not None:
+                p.init_images = p.task_args['image']
+        parsed = []
+        if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
+            parsed = p.per_script_args.get(script.title(), args[script.args_from:script.args_to])
+        if hasattr(script, 'run'):
+            processed = script.run(p, *parsed)
+        else:
+            processed = None
+            errors.log.error(f'Script: file="{script.filename}" no run function defined')
+        s.record(script.title())
+        s.report()
+        return processed
+
+    def after(self, p, processed, *args):
+        s = ScriptSummary('after')
+        script_index = args[0] if len(args) > 0 else 0
+        if script_index == 0:
+            return processed
+        script = self.selectable_scripts[script_index-1]
+        if script is None or not hasattr(script, 'after'):
+            return processed
+        parsed = []
+        if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
+            parsed = p.per_script_args.get(script.title(), args[script.args_from:script.args_to])
+        after_processed = script.after(p, processed, *parsed)
+        if after_processed is not None:
+            processed = after_processed
+        s.record(script.title())
+        s.report()
+        return processed
+
+    def before_process(self, p, **kwargs):
+        s = ScriptSummary('before-process')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.before_process(p, *args, **kwargs)
+            except Exception as e:
+                errors.display(e, f"Error running before process: {script.filename}")
+            s.record(script.title())
+        s.report()
+
+    def process(self, p, **kwargs):
+        s = ScriptSummary('process')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.process(p, *args, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script process: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def process_images(self, p, **kwargs):
+        s = ScriptSummary('process_images')
+        processed = None
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    _processed = script.process_images(p, *args, **kwargs)
+                    if _processed is not None:
+                        processed = _processed
+            except Exception as e:
+                errors.display(e, f'Running script process images: {script.filename}')
+            s.record(script.title())
+        s.report()
+        return processed
+
+    def before_process_batch(self, p, **kwargs):
+        s = ScriptSummary('before-process-batch')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.before_process_batch(p, *args, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script before process batch: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def process_batch(self, p, **kwargs):
+        s = ScriptSummary('process-batch')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.process_batch(p, *args, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script process batch: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def postprocess(self, p, processed):
+        s = ScriptSummary('postprocess')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.postprocess(p, processed, *args)
+            except Exception as e:
+                errors.display(e, f'Running script postprocess: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def postprocess_batch(self, p, images, **kwargs):
+        s = ScriptSummary('postprocess-batch')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.postprocess_batch(p, *args, images=images, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script before postprocess batch: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def postprocess_batch_list(self, p, pp: PostprocessBatchListArgs, **kwargs):
+        s = ScriptSummary('postprocess-batch-list')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.postprocess_batch_list(p, pp, *args, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script before postprocess batch list: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def postprocess_image(self, p, pp: PostprocessImageArgs):
+        s = ScriptSummary('postprocess-image')
+        for script in self.alwayson_scripts:
+            try:
+                if hasattr(script, 'args_to') and hasattr(script, 'args_from') and (script.args_to > 0) and (script.args_to >= script.args_from):
+                    args = p.per_script_args.get(script.title(), p.script_args[script.args_from:script.args_to])
+                    script.postprocess_image(p, pp, *args)
+            except Exception as e:
+                errors.display(e, f'Running script postprocess image: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def before_component(self, component, **kwargs):
+        s = ScriptSummary('before-component')
+        for script in self.scripts:
+            try:
+                script.before_component(component, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script before component: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def after_component(self, component, **kwargs):
+        s = ScriptSummary('after-component')
+        for script in self.scripts:
+            for elem_id, callback in script.on_after_component_elem_id:
+                if elem_id == kwargs.get("elem_id"):
+                    try:
+                        callback(OnComponent(component=component))
+                    except Exception as e:
+                        errors.display(e, f"Running script before_component_elem_id: {script.filename}")
+            try:
+                script.after_component(component, **kwargs)
+            except Exception as e:
+                errors.display(e, f'Running script after component: {script.filename}')
+            s.record(script.title())
+        s.report()
+
+    def reload_sources(self, cache):
+        s = ScriptSummary('reload-sources')
+        for si, script in list(enumerate(self.scripts)):
+            if hasattr(script, 'args_to') and hasattr(script, 'args_from'):
+                args_from = script.args_from
+                args_to = script.args_to
+                filename = script.filename
+                module = cache.get(filename, None)
+                if module is None:
+                    module = script_loading.load_module(script.filename)
+                    cache[filename] = module
+                for script_class in module.__dict__.values():
+                    if type(script_class) == type and issubclass(script_class, Script):
+                        self.scripts[si] = script_class()
+                        self.scripts[si].filename = filename
+                        self.scripts[si].args_from = args_from
+                        self.scripts[si].args_to = args_to
+                s.record(script.title())
+        s.report()
+
+
+scripts_txt2img: ScriptRunner = None
+scripts_img2img: ScriptRunner = None
+scripts_control: ScriptRunner = None
+scripts_current: ScriptRunner = None
+scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None
+reload_scripts = load_scripts  # compatibility alias
+
+
+def reload_script_body_only():
+    cache = {}
+    scripts_txt2img.reload_sources(cache)
+    scripts_img2img.reload_sources(cache)
+    scripts_control.reload_sources(cache)
diff --git a/modules/scripts_postprocessing.py b/modules/scripts_postprocessing.py
index da65ee551..6c9983801 100644
--- a/modules/scripts_postprocessing.py
+++ b/modules/scripts_postprocessing.py
@@ -72,8 +72,8 @@ class ScriptPostprocessingRunner:
 
     def scripts_in_preferred_order(self):
         if self.scripts is None:
-            import modules.scripts
-            self.initialize_scripts(modules.scripts.postprocessing_scripts_data)
+            import modules.scripts_manager
+            self.initialize_scripts(modules.scripts_manager.postprocessing_scripts_data)
         scripts_order = shared.opts.postprocessing_operation_order
 
         def script_score(name):
diff --git a/modules/sd_models.py b/modules/sd_models.py
index e998abefd..707cf8031 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -306,7 +306,7 @@ def load_diffuser_force(model_type, checkpoint_info, diffusers_load_config, op='
     shared.sd_model = None
     try:
         if model_type in ['Stable Cascade']: # forced pipeline
-            from modules.model_stablecascade import load_cascade_combined
+            from pipelines.model_stablecascade import load_cascade_combined
             sd_model = load_cascade_combined(checkpoint_info, diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['InstaFlow']: # forced pipeline
@@ -315,77 +315,77 @@ def load_diffuser_force(model_type, checkpoint_info, diffusers_load_config, op='
             sd_model = pipeline.from_pretrained(checkpoint_info.path, cache_dir=shared.opts.diffusers_dir, **diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['SegMoE']: # forced pipeline
-            from modules.segmoe.segmoe_model import SegMoEPipeline
+            from pipelines.segmoe.segmoe_model import SegMoEPipeline
             sd_model = SegMoEPipeline(checkpoint_info.path, cache_dir=shared.opts.diffusers_dir, **diffusers_load_config)
             sd_model = sd_model.pipe # segmoe pipe does its stuff in __init__ and __call__ is the original pipeline
             allow_post_quant = True
             shared_items.pipelines['SegMoE'] = SegMoEPipeline
         elif model_type in ['PixArt Sigma']: # forced pipeline
-            from modules.model_pixart import load_pixart
+            from pipelines.model_pixart import load_pixart
             sd_model = load_pixart(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Sana']: # forced pipeline
-            from modules.model_sana import load_sana
+            from pipelines.model_sana import load_sana
             sd_model = load_sana(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Lumina-Next']: # forced pipeline
-            from modules.model_lumina import load_lumina
+            from pipelines.model_lumina import load_lumina
             sd_model = load_lumina(checkpoint_info, diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['Kolors']: # forced pipeline
-            from modules.model_kolors import load_kolors
+            from pipelines.model_kolors import load_kolors
             sd_model = load_kolors(checkpoint_info, diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['AuraFlow']: # forced pipeline
-            from modules.model_auraflow import load_auraflow
+            from pipelines.model_auraflow import load_auraflow
             sd_model = load_auraflow(checkpoint_info, diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['FLUX']:
-            from modules.model_flux import load_flux
+            from pipelines.model_flux import load_flux
             sd_model = load_flux(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['FLEX']:
-            from modules.model_flex import load_flex
+            from pipelines.model_flex import load_flex
             sd_model = load_flex(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Chroma']:
-            from modules.model_chroma import load_chroma
+            from pipelines.model_chroma import load_chroma
             sd_model = load_chroma(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Lumina 2']:
-            from modules.model_lumina import load_lumina2
+            from pipelines.model_lumina import load_lumina2
             sd_model = load_lumina2(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Stable Diffusion 3']:
-            from modules.model_sd3 import load_sd3
+            from pipelines.model_sd3 import load_sd3
             sd_model = load_sd3(checkpoint_info, cache_dir=shared.opts.diffusers_dir, config=diffusers_load_config.get('config', None))
             allow_post_quant = False
         elif model_type in ['CogView 3']: # forced pipeline
-            from modules.model_cogview import load_cogview3
+            from pipelines.model_cogview import load_cogview3
             sd_model = load_cogview3(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['CogView 4']: # forced pipeline
-            from modules.model_cogview import load_cogview4
+            from pipelines.model_cogview import load_cogview4
             sd_model = load_cogview4(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Meissonic']: # forced pipeline
-            from modules.model_meissonic import load_meissonic
+            from pipelines.model_meissonic import load_meissonic
             sd_model = load_meissonic(checkpoint_info, diffusers_load_config)
             allow_post_quant = True
         elif model_type in ['OmniGen2']: # forced pipeline
-            from modules.model_omnigen2 import load_omnigen2
+            from pipelines.model_omnigen2 import load_omnigen2
             sd_model = load_omnigen2(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['OmniGen']: # forced pipeline
-            from modules.model_omnigen import load_omnigen
+            from pipelines.model_omnigen import load_omnigen
             sd_model = load_omnigen(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['HiDream']:
-            from modules.model_hidream import load_hidream
+            from pipelines.model_hidream import load_hidream
             sd_model = load_hidream(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
         elif model_type in ['Cosmos']:
-            from modules.model_cosmos import load_cosmos_t2i
+            from pipelines.model_cosmos import load_cosmos_t2i
             sd_model = load_cosmos_t2i(checkpoint_info, diffusers_load_config)
             allow_post_quant = False
     except Exception as e:
@@ -480,7 +480,7 @@ def load_diffuser_file(model_type, pipeline, checkpoint_info, diffusers_load_con
                         shared.log.debug(f'Load {op}: config="{model_config}"')
                     diffusers_load_config['config'] = model_config
         if model_type.startswith('Stable Diffusion 3'):
-            from modules.model_sd3 import load_sd3
+            from pipelines.model_sd3 import load_sd3
             sd_model = load_sd3(checkpoint_info=checkpoint_info, cache_dir=shared.opts.diffusers_dir, config=diffusers_load_config.get('config', None))
         elif hasattr(pipeline, 'from_single_file'):
             diffusers.loaders.single_file_utils.CHECKPOINT_KEY_NAMES["clip"] = "cond_stage_model.transformer.text_model.embeddings.position_embedding.weight" # patch for diffusers==0.28.0
@@ -1069,7 +1069,7 @@ def reload_model_weights(sd_model=None, info=None, reuse_dict=False, op='model',
             unload_model_weights(op=op)
             sd_model = None
     timer = Timer()
-    # TODO model loader: implement model in-memory caching
+    # TODO model load: implement model in-memory caching
     state_dict = get_checkpoint_state_dict(checkpoint_info, timer) if not shared.native else None
     checkpoint_config = sd_models_config.find_checkpoint_config(state_dict, checkpoint_info)
     timer.record("config")
diff --git a/modules/sd_unet.py b/modules/sd_unet.py
index ccf84b62d..12772c4a6 100644
--- a/modules/sd_unet.py
+++ b/modules/sd_unet.py
@@ -25,7 +25,7 @@ def load_unet(model):
         if shared.opts.sd_unet == loaded_unet or shared.opts.sd_unet in failed_unet:
             pass
         elif "StableCascade" in model.__class__.__name__:
-            from modules.model_stablecascade import load_prior
+            from pipelines.model_stablecascade import load_prior
             prior_unet, prior_text_encoder = load_prior(unet_dict[shared.opts.sd_unet], config_file=config_file)
             loaded_unet = shared.opts.sd_unet
             if prior_unet is not None:
@@ -38,7 +38,7 @@ def load_unet(model):
             loaded_unet = shared.opts.sd_unet
             sd_models.load_diffuser() # TODO model load: force-reloading entire model as loading transformers only leads to massive memory usage
             """
-            from modules.model_flux import load_transformer
+            from pipelines.model_flux import load_transformer
             transformer = load_transformer(unet_dict[shared.opts.sd_unet])
             if transformer is not None:
                 model.transformer = None
diff --git a/modules/sdnq/__init__.py b/modules/sdnq/__init__.py
index b4e251601..fedeabf38 100644
--- a/modules/sdnq/__init__.py
+++ b/modules/sdnq/__init__.py
@@ -14,7 +14,7 @@ from .dequantizer import dequantizer_dict
 from .forward import get_forward_func
 
 
-def sdnq_quantize_layer(layer, weights_dtype="int8", torch_dtype=None, group_size=0, quant_conv=False, use_quantized_matmul=False, use_quantized_matmul_conv=False, dequantize_fp32=False, quantization_device=None, return_device=None, param_name=None):
+def sdnq_quantize_layer(layer, weights_dtype="int8", torch_dtype=None, group_size=0, quant_conv=False, use_quantized_matmul=False, use_quantized_matmul_conv=False, dequantize_fp32=False, quantization_device=None, return_device=None, param_name=None): # pylint: disable=unused-argument
     layer_class_name = layer.__class__.__name__
     if layer_class_name in allowed_types:
         is_conv_type = False
diff --git a/modules/shared_items.py b/modules/shared_items.py
index 214d05801..f785ae5a5 100644
--- a/modules/shared_items.py
+++ b/modules/shared_items.py
@@ -61,8 +61,8 @@ onnx_pipelines = {
 
 
 def postprocessing_scripts():
-    import modules.scripts
-    return modules.scripts.scripts_postproc.scripts
+    import modules.scripts_manager
+    return modules.scripts_manager.scripts_postproc.scripts
 
 
 def sd_vae_items():
diff --git a/modules/txt2img.py b/modules/txt2img.py
index 151110d07..ad7a38612 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -1,5 +1,5 @@
 import os
-from modules import shared, processing, scripts
+from modules import shared, processing, scripts_manager
 from modules.generation_parameters_copypaste import create_override_settings_dict
 from modules.ui_common import plaintext_to_html
 
@@ -90,13 +90,13 @@ def txt2img(id_task, state,
         hdr_boundary=hdr_boundary, hdr_threshold=hdr_threshold, hdr_maximize=hdr_maximize, hdr_max_center=hdr_max_center, hdr_max_boundry=hdr_max_boundry, hdr_color_picker=hdr_color_picker, hdr_tint_ratio=hdr_tint_ratio,
         override_settings=override_settings,
     )
-    p.scripts = scripts.scripts_txt2img
+    p.scripts = scripts_manager.scripts_txt2img
     p.script_args = args
     p.state = state
-    processed: processing.Processed = scripts.scripts_txt2img.run(p, *args)
+    processed: processing.Processed = scripts_manager.scripts_txt2img.run(p, *args)
     if processed is None:
         processed = processing.process_images(p)
-    processed = scripts.scripts_txt2img.after(p, processed, *args)
+    processed = scripts_manager.scripts_txt2img.after(p, processed, *args)
     p.close()
     if processed is None:
         return [], '', '', 'Error: processing failed'
diff --git a/modules/ui.py b/modules/ui.py
index 1c4b7ec0f..2ae79f0db 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -2,7 +2,7 @@ import mimetypes
 import gradio as gr
 import gradio.routes
 import gradio.utils
-from modules import errors, timer, gr_hijack, shared, script_callbacks, ui_common, ui_symbols, ui_javascript, ui_sections, generation_parameters_copypaste, call_queue, scripts
+from modules import errors, timer, gr_hijack, shared, script_callbacks, ui_common, ui_symbols, ui_javascript, ui_sections, generation_parameters_copypaste, call_queue, scripts_manager
 from modules.paths import script_path, data_path # pylint: disable=unused-import
 
 
@@ -76,7 +76,7 @@ def create_ui(startup_timer = None):
         timer.startup = timer.Timer()
     ui_javascript.reload_javascript()
     generation_parameters_copypaste.reset()
-    scripts.scripts_current = None
+    scripts_manager.scripts_current = None
 
     with gr.Blocks(analytics_enabled=False) as txt2img_interface:
         from modules import ui_txt2img
diff --git a/modules/ui_common.py b/modules/ui_common.py
index 84cae441d..30c54a200 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -6,7 +6,7 @@ import platform
 import subprocess
 from functools import reduce
 import gradio as gr
-from modules import call_queue, shared, prompt_parser, ui_sections, ui_symbols, ui_components, generation_parameters_copypaste, images, scripts, script_callbacks, infotext
+from modules import call_queue, shared, prompt_parser, ui_sections, ui_symbols, ui_components, generation_parameters_copypaste, images, scripts_manager, script_callbacks, infotext
 
 
 folder_symbol = ui_symbols.folder
@@ -304,11 +304,11 @@ def create_output_panel(tabname, preview=True, prompt=None, height=None, transfe
                 )
 
             if tabname == "txt2img":
-                paste_field_names = scripts.scripts_txt2img.paste_field_names
+                paste_field_names = scripts_manager.scripts_txt2img.paste_field_names
             elif tabname == "img2img":
-                paste_field_names = scripts.scripts_img2img.paste_field_names
+                paste_field_names = scripts_manager.scripts_img2img.paste_field_names
             elif tabname == "control":
-                paste_field_names = scripts.scripts_control.paste_field_names
+                paste_field_names = scripts_manager.scripts_control.paste_field_names
             else:
                 paste_field_names = []
             debug(f'Paste field: tab={tabname} fields={paste_field_names}')
diff --git a/modules/ui_control.py b/modules/ui_control.py
index 4b53a76bf..2a4c7831f 100644
--- a/modules/ui_control.py
+++ b/modules/ui_control.py
@@ -9,7 +9,7 @@ from modules.control.units import xs # vislearn ControlNet-XS
 from modules.control.units import lite # vislearn ControlNet-XS
 from modules.control.units import t2iadapter # TencentARC T2I-Adapter
 from modules.control.units import reference # reference pipeline
-from modules import errors, shared, progress, ui_components, ui_symbols, ui_common, ui_sections, generation_parameters_copypaste, call_queue, scripts, masking, images, processing_vae, timer # pylint: disable=ungrouped-imports
+from modules import errors, shared, progress, ui_components, ui_symbols, ui_common, ui_sections, generation_parameters_copypaste, call_queue, scripts_manager, masking, images, processing_vae, timer # pylint: disable=ungrouped-imports
 from modules import ui_control_helpers as helpers
 
 
@@ -539,7 +539,7 @@ def create_ui(_blocks: gr.Blocks=None):
                             setting.change(fn=processors.update_settings, inputs=settings, outputs=[])
 
             with gr.Row(elem_id="control_script_container"):
-                input_script_args = scripts.scripts_current.setup_ui(parent='control', accordion=True)
+                input_script_args = scripts_manager.scripts_current.setup_ui(parent='control', accordion=True)
 
             # handlers
             for btn in input_buttons:
@@ -709,7 +709,7 @@ def create_ui(_blocks: gr.Blocks=None):
                 # hidden
                 (seed_resize_from_w, "Seed resize from-1"),
                 (seed_resize_from_h, "Seed resize from-2"),
-                *scripts.scripts_control.infotext_fields
+                *scripts_manager.scripts_control.infotext_fields
             ]
             generation_parameters_copypaste.add_paste_fields("control", input_image, paste_fields, override_settings)
             bindings = generation_parameters_copypaste.ParamBinding(paste_button=btn_paste, tabname="control", source_text_component=prompt, source_image_component=output_gallery)
diff --git a/modules/ui_control_helpers.py b/modules/ui_control_helpers.py
index de8983be2..c21799ab0 100644
--- a/modules/ui_control_helpers.py
+++ b/modules/ui_control_helpers.py
@@ -1,7 +1,7 @@
 import os
 import gradio as gr
 from PIL import Image
-from modules import shared, scripts, masking, video # pylint: disable=ungrouped-imports
+from modules import shared, scripts_manager, masking, video # pylint: disable=ungrouped-imports
 
 
 gr_height = None
@@ -43,8 +43,8 @@ def initialize():
         os.makedirs(masking.cache_dir, exist_ok=True)
     except Exception:
         pass
-    scripts.scripts_current = scripts.scripts_control
-    scripts.scripts_control.initialize_scripts(is_img2img=False, is_control=True)
+    scripts_manager.scripts_current = scripts_manager.scripts_control
+    scripts_manager.scripts_control.initialize_scripts(is_img2img=False, is_control=True)
 
 
 def interrogate():
diff --git a/modules/ui_img2img.py b/modules/ui_img2img.py
index bd7627a48..747964254 100644
--- a/modules/ui_img2img.py
+++ b/modules/ui_img2img.py
@@ -35,8 +35,8 @@ def process_interrogate(mode, ii_input_files, ii_input_dir, ii_output_dir, *ii_s
 def create_ui():
     shared.log.debug('UI initialize: img2img')
     import modules.img2img # pylint: disable=redefined-outer-name
-    modules.scripts.scripts_current = modules.scripts.scripts_img2img
-    modules.scripts.scripts_img2img.initialize_scripts(is_img2img=True, is_control=False)
+    modules.scripts_manager.scripts_current = modules.scripts_manager.scripts_img2img
+    modules.scripts_manager.scripts_img2img.initialize_scripts(is_img2img=True, is_control=False)
     with gr.Blocks(analytics_enabled=False) as _img2img_interface:
         img2img_prompt, img2img_prompt_styles, img2img_negative_prompt, img2img_submit, img2img_reprocess, img2img_paste, img2img_extra_networks_button, img2img_token_counter, img2img_token_button, img2img_negative_token_counter, img2img_negative_token_button = ui_sections.create_toprow(is_img2img=True, id_part="img2img")
         img2img_prompt_img = gr.File(label="", elem_id="img2img_prompt_image", file_count="single", type="binary", visible=False)
@@ -156,7 +156,7 @@ def create_ui():
                     override_settings = ui_common.create_override_inputs('img2img')
 
                 with gr.Group(elem_id="img2img_script_container"):
-                    img2img_script_inputs = modules.scripts.scripts_img2img.setup_ui(parent='img2img', accordion=True)
+                    img2img_script_inputs = modules.scripts_manager.scripts_img2img.setup_ui(parent='img2img', accordion=True)
 
             img2img_gallery, img2img_generation_info, img2img_html_info, _img2img_html_info_formatted, img2img_html_log = ui_common.create_output_panel("img2img", prompt=img2img_prompt)
 
@@ -304,7 +304,7 @@ def create_ui():
                 # hidden
                 (seed_resize_from_w, "Seed resize from-1"),
                 (seed_resize_from_h, "Seed resize from-2"),
-                *modules.scripts.scripts_img2img.infotext_fields
+                *modules.scripts_manager.scripts_img2img.infotext_fields
             ]
             generation_parameters_copypaste.add_paste_fields("img2img", img_init, img2img_paste_fields, override_settings)
             generation_parameters_copypaste.add_paste_fields("sketch", img_sketch, img2img_paste_fields, override_settings)
diff --git a/modules/ui_javascript.py b/modules/ui_javascript.py
index c8847c7d8..7bbe59988 100644
--- a/modules/ui_javascript.py
+++ b/modules/ui_javascript.py
@@ -3,7 +3,7 @@ import gradio.routes
 import gradio.utils
 from modules import shared, theme
 from modules.paths import script_path, data_path
-import modules.scripts
+import modules.scripts_manager
 
 
 def webpath(fn):
@@ -22,12 +22,12 @@ def html_head():
         script_js = os.path.join(script_path, "javascript", js)
         head += f'<script type="text/javascript" src="{webpath(script_js)}"></script>\n'
     added = []
-    for script in modules.scripts.list_scripts("javascript", ".js"):
+    for script in modules.scripts_manager.list_scripts("javascript", ".js"):
         if script.filename in main or script.filename in skip:
             continue
         head += f'<script type="text/javascript" src="{webpath(script.path)}"></script>\n'
         added.append(script.path)
-    for script in modules.scripts.list_scripts("javascript", ".mjs"):
+    for script in modules.scripts_manager.list_scripts("javascript", ".mjs"):
         head += f'<script type="module" src="{webpath(script.path)}"></script>\n'
         added.append(script.path)
     added = [a.replace(script_path, '').replace('\\', '/') for a in added]
@@ -59,7 +59,7 @@ def html_css(css: str):
     head = ''
     if css is not None:
         head += stylesheet(os.path.join(script_path, 'javascript', css))
-    for cssfile in modules.scripts.list_files_with_name("style.css"):
+    for cssfile in modules.scripts_manager.list_files_with_name("style.css"):
         if not os.path.isfile(cssfile):
             continue
         head += stylesheet(cssfile)
diff --git a/modules/ui_postprocessing.py b/modules/ui_postprocessing.py
index 8ed530de7..a84b30276 100644
--- a/modules/ui_postprocessing.py
+++ b/modules/ui_postprocessing.py
@@ -1,6 +1,6 @@
 import json
 import gradio as gr
-from modules import scripts, shared, ui_common, postprocessing, call_queue, generation_parameters_copypaste
+from modules import scripts_manager, shared, ui_common, postprocessing, call_queue, generation_parameters_copypaste
 
 
 def submit_info(image):
@@ -32,7 +32,7 @@ def create_ui():
             with gr.Row():
                 save_output = gr.Checkbox(label='Save output', value=True, elem_id="extras_save_output")
 
-            script_inputs = scripts.scripts_postproc.setup_ui()
+            script_inputs = scripts_manager.scripts_postproc.setup_ui()
         with gr.Column():
             id_part = 'extras'
             with gr.Row(elem_id=f"{id_part}_generate_box", elem_classes="generate-box"):
@@ -56,7 +56,7 @@ def create_ui():
     tab_batch.select(fn=lambda: 1, inputs=[], outputs=[tab_index])
     tab_batch_dir.select(fn=lambda: 2, inputs=[], outputs=[tab_index])
     extras_image.change(fn=submit_info, inputs=[extras_image], outputs=[html_info_formatted, exif_info, gen_info])
-    extras_image.change(fn=scripts.scripts_postproc.image_changed, inputs=[], outputs=[])
+    extras_image.change(fn=scripts_manager.scripts_postproc.image_changed, inputs=[], outputs=[])
     submit.click(
         _js="submit_postprocessing",
         fn=call_queue.wrap_gradio_gpu_call(submit_process, extra_outputs=[None, ''], name='Postprocess'),
diff --git a/modules/ui_txt2img.py b/modules/ui_txt2img.py
index 63d47920d..c74547e3c 100644
--- a/modules/ui_txt2img.py
+++ b/modules/ui_txt2img.py
@@ -17,8 +17,8 @@ def calc_resolution_hires(width, height, hr_scale, hr_resize_x, hr_resize_y, hr_
 def create_ui():
     shared.log.debug('UI initialize: txt2img')
     import modules.txt2img # pylint: disable=redefined-outer-name
-    modules.scripts.scripts_current = modules.scripts.scripts_txt2img
-    modules.scripts.scripts_txt2img.initialize_scripts(is_img2img=False, is_control=False)
+    modules.scripts_manager.scripts_current = modules.scripts_manager.scripts_txt2img
+    modules.scripts_manager.scripts_txt2img.initialize_scripts(is_img2img=False, is_control=False)
     with gr.Blocks(analytics_enabled=False) as _txt2img_interface:
         txt2img_prompt, txt2img_prompt_styles, txt2img_negative_prompt, txt2img_submit, txt2img_reprocess, txt2img_paste, txt2img_extra_networks_button, txt2img_token_counter, txt2img_token_button, txt2img_negative_token_counter, txt2img_negative_token_button = ui_sections.create_toprow(is_img2img=False, id_part="txt2img")
 
@@ -52,7 +52,7 @@ def create_ui():
                     state = gr.Textbox(value='', visible=False)
 
                 with gr.Group(elem_id="txt2img_script_container"):
-                    txt2img_script_inputs = modules.scripts.scripts_txt2img.setup_ui(parent='txt2img', accordion=True)
+                    txt2img_script_inputs = modules.scripts_manager.scripts_txt2img.setup_ui(parent='txt2img', accordion=True)
 
             txt2img_gallery, txt2img_generation_info, txt2img_html_info, _txt2img_html_info_formatted, txt2img_html_log = ui_common.create_output_panel("txt2img", preview=True, prompt=txt2img_prompt)
             ui_common.connect_reuse_seed(seed, reuse_seed, txt2img_generation_info, is_subseed=False)
@@ -158,7 +158,7 @@ def create_ui():
                 # hidden
                 (seed_resize_from_w, "Seed resize from-1"),
                 (seed_resize_from_h, "Seed resize from-2"),
-                *modules.scripts.scripts_txt2img.infotext_fields
+                *modules.scripts_manager.scripts_txt2img.infotext_fields
             ]
             generation_parameters_copypaste.add_paste_fields("txt2img", None, txt2img_paste_fields, override_settings)
             txt2img_bindings = generation_parameters_copypaste.ParamBinding(paste_button=txt2img_paste, tabname="txt2img", source_text_component=txt2img_prompt, source_image_component=None)
diff --git a/package.json b/package.json
index 8e6126230..93b117e9a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "localize": "node cli/localize.js",
     "ruff": ". venv/bin/activate && ruff check",
     "eslint": "eslint javascript/ extensions-builtin/sdnext-modernui/javascript/",
-    "pylint": ". venv/bin/activate && pylint *.py modules/ extensions-builtin/ | grep -v '^*'",
+    "pylint": ". venv/bin/activate && pylint *.py modules/ pipelines/ scripts/ extensions-builtin/ | grep -v '^*'",
     "lint": "npm run eslint && npm run ruff && npm run pylint",
     "test": "cli/test.sh"
   },
diff --git a/modules/flex2/__init__.py b/pipelines/flex2/__init__.py
similarity index 100%
rename from modules/flex2/__init__.py
rename to pipelines/flex2/__init__.py
diff --git a/modules/hidream/pipeline_hidream_image_editing.py b/pipelines/hidream/pipeline_hidream_image_editing.py
similarity index 100%
rename from modules/hidream/pipeline_hidream_image_editing.py
rename to pipelines/hidream/pipeline_hidream_image_editing.py
diff --git a/modules/instantir/ip_adapter/__init__.py b/pipelines/meissonic/__init__.py
similarity index 100%
rename from modules/instantir/ip_adapter/__init__.py
rename to pipelines/meissonic/__init__.py
diff --git a/modules/meissonic/pipeline.py b/pipelines/meissonic/pipeline.py
similarity index 100%
rename from modules/meissonic/pipeline.py
rename to pipelines/meissonic/pipeline.py
diff --git a/modules/meissonic/pipeline_img2img.py b/pipelines/meissonic/pipeline_img2img.py
similarity index 100%
rename from modules/meissonic/pipeline_img2img.py
rename to pipelines/meissonic/pipeline_img2img.py
diff --git a/modules/meissonic/pipeline_inpaint.py b/pipelines/meissonic/pipeline_inpaint.py
similarity index 100%
rename from modules/meissonic/pipeline_inpaint.py
rename to pipelines/meissonic/pipeline_inpaint.py
diff --git a/modules/meissonic/scheduler.py b/pipelines/meissonic/scheduler.py
similarity index 100%
rename from modules/meissonic/scheduler.py
rename to pipelines/meissonic/scheduler.py
diff --git a/modules/meissonic/test.py b/pipelines/meissonic/test.py
similarity index 100%
rename from modules/meissonic/test.py
rename to pipelines/meissonic/test.py
diff --git a/modules/meissonic/transformer.py b/pipelines/meissonic/transformer.py
similarity index 100%
rename from modules/meissonic/transformer.py
rename to pipelines/meissonic/transformer.py
diff --git a/modules/model_auraflow.py b/pipelines/model_auraflow.py
similarity index 100%
rename from modules/model_auraflow.py
rename to pipelines/model_auraflow.py
diff --git a/modules/model_chroma.py b/pipelines/model_chroma.py
similarity index 98%
rename from modules/model_chroma.py
rename to pipelines/model_chroma.py
index 9333ccc30..262b698e5 100644
--- a/modules/model_chroma.py
+++ b/pipelines/model_chroma.py
@@ -173,7 +173,7 @@ def load_transformer(file_path): # triggered by opts.sd_unet change
             if transformer is not None:
                 return transformer
         shared.log.info(f'Load module: type=UNet/Transformer file="{file_path}" offload={shared.opts.diffusers_offload_mode} quant=none dtype={devices.dtype}')
-        # TODO chroma transformer from-single-file with quant
+        # TODO model load: chroma transformer from-single-file with quant
         # shared.log.warning('Load module: type=UNet/Transformer does not support load-time quantization')
         # transformer = diffusers.ChromaTransformer2DModel.from_single_file(file_path, **diffusers_load_config)
     if transformer is None:
@@ -261,8 +261,8 @@ def load_chroma(checkpoint_info, diffusers_load_config): # triggered by opts.sd_
     if vae is not None:
         kwargs['vae'] = vae
 
-    # TODO add ChromaFillPipeline, ChromaControlPipeline, ChromaImg2ImgPipeline etc when available
-    # TODO Chroma will support inpainting *after* its training has finished: https://huggingface.co/lodestones/Chroma/discussions/28#6826dd2ed86f53ff983add5c
+    # TODO model load: add ChromaFillPipeline, ChromaControlPipeline, ChromaImg2ImgPipeline etc when available
+    # Chroma will support inpainting *after* its training has finished: https://huggingface.co/lodestones/Chroma/discussions/28#6826dd2ed86f53ff983add5c
     cls = diffusers.ChromaPipeline
     shared.log.debug(f'Load model: type=Chroma cls={cls.__name__} preloaded={list(kwargs)} revision={diffusers_load_config.get("revision", None)}')
     for c in kwargs:
diff --git a/modules/model_cogview.py b/pipelines/model_cogview.py
similarity index 96%
rename from modules/model_cogview.py
rename to pipelines/model_cogview.py
index eaba437ed..0f1f4a3f7 100644
--- a/modules/model_cogview.py
+++ b/pipelines/model_cogview.py
@@ -76,6 +76,6 @@ def load_cogview4(checkpoint_info, diffusers_load_config={}):
     if shared.opts.diffusers_eval:
         pipe.text_encoder.eval()
         pipe.transformer.eval()
-    pipe.enable_model_cpu_offload() # TODO cogview4: balanced offload does not work for GlmModel
+    pipe.enable_model_cpu_offload() # TODO model fix: cogview4: balanced offload does not work for GlmModel
     devices.torch_gc()
     return pipe
diff --git a/modules/model_cosmos.py b/pipelines/model_cosmos.py
similarity index 100%
rename from modules/model_cosmos.py
rename to pipelines/model_cosmos.py
diff --git a/modules/model_flex.py b/pipelines/model_flex.py
similarity index 94%
rename from modules/model_flex.py
rename to pipelines/model_flex.py
index 1ce5d6145..169d704e6 100644
--- a/modules/model_flex.py
+++ b/pipelines/model_flex.py
@@ -24,9 +24,6 @@ def load_transformer(repo_id, diffusers_load_config={}):
     elif fn is not None and 'safetensors' in fn.lower():
         shared.log.debug(f'Load model: type=FLEX transformer="{repo_id}" quant="{model_quant.get_quant(repo_id)}" args={load_args}')
         transformer = diffusers.FluxTransformer2DModel.from_single_file(fn, cache_dir=shared.opts.hfcache_dir, **load_args)
-    # elif model_quant.check_nunchaku('Model'):
-    #     shared.log.error(f'Load model: type=HiDream transformer="{repo_id}" quant="Nunchaku" unsupported')
-    #     transformer = None
     else:
         shared.log.debug(f'Load model: type=FLEX transformer="{repo_id}" quant="{model_quant.get_quant_type(quant_args)}" args={load_args}')
         transformer = diffusers.FluxTransformer2DModel.from_pretrained(
@@ -71,7 +68,7 @@ def load_flex(checkpoint_info, diffusers_load_config={}):
     load_args, _quant_args = model_quant.get_dit_args(diffusers_load_config, module='Model')
     shared.log.debug(f'Load model: type=FLEX model="{checkpoint_info.name}" repo="{repo_id}" offload={shared.opts.diffusers_offload_mode} dtype={devices.dtype} args={load_args}')
 
-    from modules.flex2 import Flex2Pipeline
+    from pipelines.flex2 import Flex2Pipeline
     pipe = Flex2Pipeline.from_pretrained(
         repo_id,
         # custom_pipeline=repo_id,
diff --git a/modules/model_flux.py b/pipelines/model_flux.py
similarity index 99%
rename from modules/model_flux.py
rename to pipelines/model_flux.py
index 6194cfbd1..574904f14 100644
--- a/modules/model_flux.py
+++ b/pipelines/model_flux.py
@@ -175,7 +175,7 @@ def load_transformer(file_path): # triggered by opts.sd_unet change
         if _transformer is not None:
             transformer = _transformer
     elif 'nf4' in quant: # TODO flux: loader for civitai nf4 models
-        from modules.model_flux_nf4 import load_flux_nf4
+        from pipelines.model_flux_nf4 import load_flux_nf4
         _transformer, _text_encoder_2 = load_flux_nf4(file_path, prequantized=True)
         if _transformer is not None:
             transformer = _transformer
@@ -183,7 +183,7 @@ def load_transformer(file_path): # triggered by opts.sd_unet change
         quant_args = model_quant.create_bnb_config({})
         if quant_args:
             shared.log.info(f'Load module: type=UNet/Transformer file="{file_path}" offload={shared.opts.diffusers_offload_mode} quant=bnb dtype={devices.dtype}')
-            from modules.model_flux_nf4 import load_flux_nf4
+            from pipelines.model_flux_nf4 import load_flux_nf4
             transformer, _text_encoder_2 = load_flux_nf4(file_path, prequantized=False)
             if transformer is not None:
                 return transformer
@@ -275,7 +275,7 @@ def load_flux(checkpoint_info, diffusers_load_config): # triggered by opts.sd_ch
     # load quantized components if any
     if prequantized == 'nf4':
         try:
-            from modules.model_flux_nf4 import load_flux_nf4
+            from pipelines.model_flux_nf4 import load_flux_nf4
             _transformer, _text_encoder = load_flux_nf4(checkpoint_info)
             if _transformer is not None:
                 transformer = _transformer
diff --git a/modules/model_flux_nf4.py b/pipelines/model_flux_nf4.py
similarity index 100%
rename from modules/model_flux_nf4.py
rename to pipelines/model_flux_nf4.py
diff --git a/modules/model_hidream.py b/pipelines/model_hidream.py
similarity index 98%
rename from modules/model_hidream.py
rename to pipelines/model_hidream.py
index ac7b335d1..9acd92e38 100644
--- a/modules/model_hidream.py
+++ b/pipelines/model_hidream.py
@@ -102,7 +102,7 @@ def load_hidream(checkpoint_info, diffusers_load_config={}):
     if 'I1' in repo_id:
         cls = diffusers.HiDreamImagePipeline
     elif 'E1' in repo_id:
-        from modules.hidream.pipeline_hidream_image_editing import HiDreamImageEditingPipeline
+        from pipelines.hidream.pipeline_hidream_image_editing import HiDreamImageEditingPipeline
         cls = HiDreamImageEditingPipeline
         diffusers.pipelines.auto_pipeline.AUTO_TEXT2IMAGE_PIPELINES_MAPPING["hidream-e1"] = diffusers.HiDreamImagePipeline
         diffusers.pipelines.auto_pipeline.AUTO_IMAGE2IMAGE_PIPELINES_MAPPING["hidream-e1"] = HiDreamImageEditingPipeline
diff --git a/modules/model_kolors.py b/pipelines/model_kolors.py
similarity index 100%
rename from modules/model_kolors.py
rename to pipelines/model_kolors.py
diff --git a/modules/model_lumina.py b/pipelines/model_lumina.py
similarity index 100%
rename from modules/model_lumina.py
rename to pipelines/model_lumina.py
diff --git a/modules/model_meissonic.py b/pipelines/model_meissonic.py
similarity index 80%
rename from modules/model_meissonic.py
rename to pipelines/model_meissonic.py
index 2be5c3bbe..da7ea1429 100644
--- a/modules/model_meissonic.py
+++ b/pipelines/model_meissonic.py
@@ -4,11 +4,11 @@ import diffusers
 
 def load_meissonic(checkpoint_info, diffusers_load_config={}):
     from modules import shared, devices, modelloader, sd_models, shared_items
-    from modules.meissonic.transformer import Transformer2DModel as TransformerMeissonic
-    from modules.meissonic.scheduler import Scheduler as MeissonicScheduler
-    from modules.meissonic.pipeline import Pipeline as PipelineMeissonic
-    from modules.meissonic.pipeline_img2img import Img2ImgPipeline as PipelineMeissonicImg2Img
-    from modules.meissonic.pipeline_inpaint import InpaintPipeline as PipelineMeissonicInpaint
+    from pipelines.meissonic.transformer import Transformer2DModel as TransformerMeissonic
+    from pipelines.meissonic.scheduler import Scheduler as MeissonicScheduler
+    from pipelines.meissonic.pipeline import Pipeline as PipelineMeissonic
+    from pipelines.meissonic.pipeline_img2img import Img2ImgPipeline as PipelineMeissonicImg2Img
+    from pipelines.meissonic.pipeline_inpaint import InpaintPipeline as PipelineMeissonicInpaint
     shared_items.pipelines['Meissonic'] = PipelineMeissonic
 
     modelloader.hf_login()
diff --git a/modules/model_omnigen.py b/pipelines/model_omnigen.py
similarity index 93%
rename from modules/model_omnigen.py
rename to pipelines/model_omnigen.py
index b2fb95830..ba60eb389 100644
--- a/modules/model_omnigen.py
+++ b/pipelines/model_omnigen.py
@@ -1,6 +1,6 @@
 import os
 import diffusers
-from modules import errors, shared, devices, sd_models, model_quant
+from modules import shared, devices, sd_models, model_quant
 
 debug = shared.log.trace if os.environ.get('SD_LOAD_DEBUG', None) is not None else lambda *args, **kwargs: None
 
diff --git a/modules/model_omnigen2.py b/pipelines/model_omnigen2.py
similarity index 93%
rename from modules/model_omnigen2.py
rename to pipelines/model_omnigen2.py
index 285e46f50..33c354931 100644
--- a/modules/model_omnigen2.py
+++ b/pipelines/model_omnigen2.py
@@ -7,7 +7,7 @@ debug = shared.log.trace if os.environ.get('SD_LOAD_DEBUG', None) is not None el
 def load_omnigen2(checkpoint_info, diffusers_load_config={}): # pylint: disable=unused-argument
     repo_id = sd_models.path_to_repo(checkpoint_info.name)
 
-    from modules.omnigen2 import OmniGen2Pipeline, OmniGen2Transformer2DModel, Qwen2_5_VLForConditionalGeneration
+    from pipelines.omnigen2 import OmniGen2Pipeline, OmniGen2Transformer2DModel, Qwen2_5_VLForConditionalGeneration
     import diffusers
     from diffusers import pipelines
     diffusers.OmniGen2Pipeline = OmniGen2Pipeline # monkey-pathch
diff --git a/modules/model_pixart.py b/pipelines/model_pixart.py
similarity index 100%
rename from modules/model_pixart.py
rename to pipelines/model_pixart.py
diff --git a/modules/model_sana.py b/pipelines/model_sana.py
similarity index 100%
rename from modules/model_sana.py
rename to pipelines/model_sana.py
diff --git a/modules/model_sd3.py b/pipelines/model_sd3.py
similarity index 100%
rename from modules/model_sd3.py
rename to pipelines/model_sd3.py
diff --git a/modules/model_stablecascade.py b/pipelines/model_stablecascade.py
similarity index 100%
rename from modules/model_stablecascade.py
rename to pipelines/model_stablecascade.py
diff --git a/modules/omnigen2/__init__.py b/pipelines/omnigen2/__init__.py
similarity index 100%
rename from modules/omnigen2/__init__.py
rename to pipelines/omnigen2/__init__.py
diff --git a/modules/omnigen2/image_processor.py b/pipelines/omnigen2/image_processor.py
similarity index 100%
rename from modules/omnigen2/image_processor.py
rename to pipelines/omnigen2/image_processor.py
diff --git a/modules/omnigen2/models/attention_processor.py b/pipelines/omnigen2/models/attention_processor.py
similarity index 100%
rename from modules/omnigen2/models/attention_processor.py
rename to pipelines/omnigen2/models/attention_processor.py
diff --git a/modules/omnigen2/models/embeddings.py b/pipelines/omnigen2/models/embeddings.py
similarity index 100%
rename from modules/omnigen2/models/embeddings.py
rename to pipelines/omnigen2/models/embeddings.py
diff --git a/modules/omnigen2/models/transformers/__init__.py b/pipelines/omnigen2/models/transformers/__init__.py
similarity index 100%
rename from modules/omnigen2/models/transformers/__init__.py
rename to pipelines/omnigen2/models/transformers/__init__.py
diff --git a/modules/omnigen2/models/transformers/block_lumina2.py b/pipelines/omnigen2/models/transformers/block_lumina2.py
similarity index 100%
rename from modules/omnigen2/models/transformers/block_lumina2.py
rename to pipelines/omnigen2/models/transformers/block_lumina2.py
diff --git a/modules/omnigen2/models/transformers/repo.py b/pipelines/omnigen2/models/transformers/repo.py
similarity index 100%
rename from modules/omnigen2/models/transformers/repo.py
rename to pipelines/omnigen2/models/transformers/repo.py
diff --git a/modules/omnigen2/models/transformers/transformer_omnigen2.py b/pipelines/omnigen2/models/transformers/transformer_omnigen2.py
similarity index 100%
rename from modules/omnigen2/models/transformers/transformer_omnigen2.py
rename to pipelines/omnigen2/models/transformers/transformer_omnigen2.py
diff --git a/modules/omnigen2/pipeline_omnigen2.py b/pipelines/omnigen2/pipeline_omnigen2.py
similarity index 100%
rename from modules/omnigen2/pipeline_omnigen2.py
rename to pipelines/omnigen2/pipeline_omnigen2.py
diff --git a/modules/segmoe/segmoe_model.py b/pipelines/segmoe/segmoe_model.py
similarity index 100%
rename from modules/segmoe/segmoe_model.py
rename to pipelines/segmoe/segmoe_model.py
diff --git a/scripts/allegrovideo.py b/scripts/allegrovideo.py
index 673627ddb..9fe0bc584 100644
--- a/scripts/allegrovideo.py
+++ b/scripts/allegrovideo.py
@@ -2,7 +2,7 @@ import time
 import gradio as gr
 import transformers
 import diffusers
-from modules import scripts, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
+from modules import scripts_manager, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
 
 
 repo_id = 'rhymes-ai/Allegro'
@@ -19,7 +19,7 @@ def hijack_decode(*args, **kwargs):
     return res
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: Allegro (Legacy)'
 
diff --git a/scripts/animatediff.py b/scripts/animatediff.py
index 6fb77a45b..79fa4c740 100644
--- a/scripts/animatediff.py
+++ b/scripts/animatediff.py
@@ -2,7 +2,7 @@ import os
 import gradio as gr
 import diffusers
 from safetensors.torch import load_file
-from modules import scripts, processing, shared, devices, sd_models
+from modules import scripts_manager, processing, shared, devices, sd_models
 
 
 # config
@@ -189,12 +189,12 @@ def set_free_noise(frames):
         shared.sd_model.enable_free_noise(context_length=context_length, context_stride=context_stride)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: AnimateDiff'
 
     def show(self, is_img2img):
-        # return scripts.AlwaysVisible if shared.native else False
+        # return scripts_manager.AlwaysVisible if shared.native else False
         return not is_img2img
 
 
@@ -231,7 +231,7 @@ class Script(scripts.Script):
         lora = LORAS[lora_index]
         set_adapter(adapter)
         if motion_adapter is None:
-            return
+            return None
         set_scheduler(p, adapter, override_scheduler)
         set_lora(p, lora, strength)
         set_free_init(fi_method, fi_iters, fi_order, fi_spatial, fi_temporal)
diff --git a/scripts/apg.py b/scripts/apg.py
index 6d0ec107e..5b8373a8d 100644
--- a/scripts/apg.py
+++ b/scripts/apg.py
@@ -1,11 +1,11 @@
 import gradio as gr
-from modules import scripts, processing, shared, sd_models
+from modules import scripts_manager, processing, shared, sd_models
 
 
 registered = False
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -71,6 +71,7 @@ class Script(scripts.Script):
         shared.log.info(f'APG apply: guidance={p.cfg_scale} momentum={apg.momentum} eta={apg.eta} threshold={apg.threshold} class={shared.sd_model.__class__.__name__}')
         p.extra_generation_params["APG"] = f'ETA={apg.eta} Momentum={apg.momentum} Threshold={apg.threshold}'
         # processed = processing.process_images(p)
+        return None
 
     def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, eta, momentum, threshold): # pylint: disable=arguments-differ, unused-argument
         from modules import apg
diff --git a/scripts/automatic_color_inpaint.py b/scripts/automatic_color_inpaint.py
index 227a445fa..afe020881 100644
--- a/scripts/automatic_color_inpaint.py
+++ b/scripts/automatic_color_inpaint.py
@@ -1,7 +1,7 @@
 import gradio as gr
 from PIL import Image
 import numpy as np
-from modules import shared, scripts, processing, masking
+from modules import shared, scripts_manager, processing, masking
 
 """
 Automatic Color Inpaint Script for SD.NEXT - SD & SDXL Support
@@ -28,7 +28,7 @@ img2img = True
 
 ### Script definition
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return title
 
diff --git a/scripts/blipdiffusion.py b/scripts/blipdiffusion.py
index 0acc80929..14b4a6a1c 100644
--- a/scripts/blipdiffusion.py
+++ b/scripts/blipdiffusion.py
@@ -1,8 +1,8 @@
 import gradio as gr
-from modules import scripts, processing, shared, sd_models
+from modules import scripts_manager, processing, shared, sd_models
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'BLIP Diffusion: Controllable Generation and Editing'
 
diff --git a/scripts/cogvideo.py b/scripts/cogvideo.py
index 67022da67..42b9111fc 100644
--- a/scripts/cogvideo.py
+++ b/scripts/cogvideo.py
@@ -13,14 +13,14 @@ import torch
 from torchvision import transforms
 import diffusers
 import numpy as np
-from modules import scripts, shared, devices, errors, sd_models, processing
+from modules import scripts_manager, shared, devices, errors, sd_models, processing
 from modules.processing_callbacks import diffusers_callback, set_callbacks_p
 
 
 debug = (os.environ.get('SD_LOAD_DEBUG', None) is not None) or (os.environ.get('SD_PROCESS_DEBUG', None) is not None)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: CogVideoX (Legacy)'
 
diff --git a/modules/consistory/__init__.py b/scripts/consistory/__init__.py
similarity index 100%
rename from modules/consistory/__init__.py
rename to scripts/consistory/__init__.py
diff --git a/modules/consistory/attention_processor.py b/scripts/consistory/attention_processor.py
similarity index 100%
rename from modules/consistory/attention_processor.py
rename to scripts/consistory/attention_processor.py
diff --git a/modules/consistory/consistory_pipeline.py b/scripts/consistory/consistory_pipeline.py
similarity index 100%
rename from modules/consistory/consistory_pipeline.py
rename to scripts/consistory/consistory_pipeline.py
diff --git a/modules/consistory/consistory_run.py b/scripts/consistory/consistory_run.py
similarity index 100%
rename from modules/consistory/consistory_run.py
rename to scripts/consistory/consistory_run.py
diff --git a/modules/consistory/consistory_unet_sdxl.py b/scripts/consistory/consistory_unet_sdxl.py
similarity index 100%
rename from modules/consistory/consistory_unet_sdxl.py
rename to scripts/consistory/consistory_unet_sdxl.py
diff --git a/modules/consistory/consistory_utils.py b/scripts/consistory/consistory_utils.py
similarity index 100%
rename from modules/consistory/consistory_utils.py
rename to scripts/consistory/consistory_utils.py
diff --git a/modules/consistory/utils/general_utils.py b/scripts/consistory/utils/general_utils.py
similarity index 100%
rename from modules/consistory/utils/general_utils.py
rename to scripts/consistory/utils/general_utils.py
diff --git a/modules/consistory/utils/ptp_utils.py b/scripts/consistory/utils/ptp_utils.py
similarity index 100%
rename from modules/consistory/utils/ptp_utils.py
rename to scripts/consistory/utils/ptp_utils.py
diff --git a/scripts/consistory_ext.py b/scripts/consistory_ext.py
index c02ca1e50..ab0019fcc 100644
--- a/scripts/consistory_ext.py
+++ b/scripts/consistory_ext.py
@@ -12,10 +12,10 @@ ported to modules/consistory
 import time
 import gradio as gr
 import diffusers
-from modules import scripts, devices, errors, processing, shared, sd_models, sd_samplers
+from modules import scripts_manager, devices, errors, processing, shared, sd_models, sd_samplers
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.anchor_cache_first_stage = None
@@ -66,7 +66,7 @@ class Script(scripts.Script):
 
     def create_model(self):
         diffusers.models.embeddings.PositionNet = diffusers.models.embeddings.GLIGENTextBoundingboxProjection # patch as renamed in https://github.com/huggingface/diffusers/pull/6244/files
-        import modules.consistory as cs
+        import scripts.consistory as cs
         if shared.sd_model.__class__.__name__ != 'ConsistoryExtendAttnSDXLPipeline':
             shared.log.debug('ConsiStory init')
             t0 = time.time()
@@ -128,7 +128,7 @@ class Script(scripts.Script):
         return concepts, anchors, prompts, alpha, steps, seed
 
     def create_anchors(self, anchors, concepts, seed, steps, dropout, same, queries, sdsa, injection, alpha):
-        import modules.consistory as cs
+        import scripts.consistory as cs
         t0 = time.time()
         if len(anchors) == 0:
             shared.log.warning('ConsiStory: no anchors')
@@ -159,7 +159,7 @@ class Script(scripts.Script):
         return images
 
     def create_extra(self, prompt, concepts, seed, steps, dropout, same, queries, sdsa, injection, alpha):
-        import modules.consistory as cs
+        import scripts.consistory as cs
         t0 = time.time()
         images = []
         shared.log.debug(f'ConsiStory extra: concepts={concepts} prompt="{prompt}"')
diff --git a/modules/ctrlx/__init__.py b/scripts/ctrlx/__init__.py
similarity index 100%
rename from modules/ctrlx/__init__.py
rename to scripts/ctrlx/__init__.py
diff --git a/modules/ctrlx/features.py b/scripts/ctrlx/features.py
similarity index 100%
rename from modules/ctrlx/features.py
rename to scripts/ctrlx/features.py
diff --git a/modules/ctrlx/media.py b/scripts/ctrlx/media.py
similarity index 100%
rename from modules/ctrlx/media.py
rename to scripts/ctrlx/media.py
diff --git a/modules/ctrlx/sdxl.py b/scripts/ctrlx/sdxl.py
similarity index 100%
rename from modules/ctrlx/sdxl.py
rename to scripts/ctrlx/sdxl.py
diff --git a/modules/ctrlx/utils.py b/scripts/ctrlx/utils.py
similarity index 100%
rename from modules/ctrlx/utils.py
rename to scripts/ctrlx/utils.py
diff --git a/scripts/ctrlx.py b/scripts/ctrlx_ext.py
similarity index 93%
rename from scripts/ctrlx.py
rename to scripts/ctrlx_ext.py
index 30b87c038..66c4881f8 100644
--- a/scripts/ctrlx.py
+++ b/scripts/ctrlx_ext.py
@@ -2,10 +2,10 @@
 
 import gradio as gr
 from diffusers import StableDiffusionXLPipeline
-from modules import shared, scripts, processing, processing_helpers, sd_models, devices
+from modules import shared, scripts_manager, processing, processing_helpers, sd_models, devices
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Ctrl-X: Controlling Structure and Appearance'
 
@@ -44,9 +44,9 @@ class Script(scripts.Script):
             return None
 
         import yaml
-        from modules.ctrlx import CtrlXStableDiffusionXLPipeline
-        from modules.ctrlx.sdxl import get_control_config, register_control
-        from modules.ctrlx.utils import get_self_recurrence_schedule
+        from scripts.ctrlx import CtrlXStableDiffusionXLPipeline
+        from scripts.ctrlx.sdxl import get_control_config, register_control
+        from scripts.ctrlx.utils import get_self_recurrence_schedule
 
         orig_prompt_attention = shared.opts.prompt_attention
         shared.opts.data['prompt_attention'] = 'fixed'
diff --git a/scripts/custom_code.py b/scripts/custom_code.py
index 56b0db222..4c79463db 100644
--- a/scripts/custom_code.py
+++ b/scripts/custom_code.py
@@ -1,8 +1,7 @@
 import copy
 import ast
 import gradio as gr
-import modules.scripts as scripts
-
+from modules import scripts_manager
 from modules.processing import Processed
 from modules.shared import opts, cmd_opts, state # pylint: disable=unused-import
 
@@ -28,14 +27,15 @@ def exec_with_return(code, module):
     last_ast = copy.deepcopy(code_ast)
     last_ast.body = code_ast.body[-1:]
 
-    exec(compile(init_ast, "<ast>", "exec"), module.__dict__)
+    exec(compile(init_ast, "<ast>", "exec"), module.__dict__) # pylint: disable=exec-used
     if type(last_ast.body[0]) == ast.Expr:
-        return eval(compile(convertExpr2Expression(last_ast.body[0]), "<ast>", "eval"), module.__dict__)
+        return eval(compile(convertExpr2Expression(last_ast.body[0]), "<ast>", "eval"), module.__dict__) # pylint: disable=eval-used
     else:
-        exec(compile(last_ast, "<ast>", "exec"), module.__dict__)
+        exec(compile(last_ast, "<ast>", "exec"), module.__dict__) # pylint: disable=exec-used
+    return None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
 
     def title(self):
         return "Custom code"
@@ -60,7 +60,7 @@ return process_images(p)
 
         return [code, indent_level]
 
-    def run(self, p, code, indent_level):
+    def run(self, p, code, indent_level): # pylint: disable=arguments-differ
         assert cmd_opts.allow_code, '--allow-code option must be enabled'
 
         display_result_data = [[], -1, ""]
diff --git a/scripts/demofusion.py b/scripts/demofusion.py
index 6625c0c79..a81d3727e 100644
--- a/scripts/demofusion.py
+++ b/scripts/demofusion.py
@@ -14,7 +14,7 @@ from diffusers.schedulers import KarrasDiffusionSchedulers
 from diffusers.utils import is_accelerate_available, is_accelerate_version
 from diffusers.utils.torch_utils import randn_tensor
 from diffusers.pipelines.pipeline_utils import DiffusionPipeline, ImagePipelineOutput
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 
 
 ### Class definition
@@ -1219,7 +1219,7 @@ class DemoFusionSDXLPipeline(DiffusionPipeline, FromSingleFileMixin, LoraLoaderM
 
 ### Script definition
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'DemoFusion: High-Resolution Image Generation'
 
diff --git a/scripts/differential_diffusion.py b/scripts/differential_diffusion.py
index 12bbe45e7..ce4e71d3e 100644
--- a/scripts/differential_diffusion.py
+++ b/scripts/differential_diffusion.py
@@ -1845,7 +1845,7 @@ import gradio as gr
 import diffusers
 from PIL import Image, ImageEnhance, ImageOps # pylint: disable=reimported
 from torchvision import transforms
-from modules import errors, shared, devices, scripts, processing, sd_models, images
+from modules import errors, shared, devices, scripts_manager, processing, sd_models, images
 
 
 detector = None
@@ -1856,7 +1856,7 @@ MODELS = {
 }
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Differential diffusion: Individual Pixel Strength'
 
diff --git a/scripts/example.py b/scripts/example.py
index d62d65461..7d84ab184 100644
--- a/scripts/example.py
+++ b/scripts/example.py
@@ -1,6 +1,6 @@
 import gradio as gr
 from diffusers.pipelines import StableDiffusionPipeline, StableDiffusionXLPipeline # pylint: disable=unused-import
-from modules import shared, scripts, processing, sd_models, devices
+from modules import shared, scripts_manager, processing, sd_models, devices
 
 """
 This is a simpler template for script for SD.Next that implements a custom pipeline
@@ -62,7 +62,7 @@ params = ['test1', 'test2', 'test3', 'test4']
 
 ### Script definition
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return title
 
diff --git a/scripts/flux_enhance.py b/scripts/flux_enhance.py
index 72eb76d4e..75e6b7770 100644
--- a/scripts/flux_enhance.py
+++ b/scripts/flux_enhance.py
@@ -5,7 +5,7 @@ import random
 import threading
 from transformers import AutoTokenizer, AutoModelForSeq2SeqLM
 import gradio as gr
-from modules import shared, scripts, devices, processing
+from modules import shared, scripts_manager, devices, processing
 
 
 repo_id = "gokaygokay/Flux-Prompt-Enhance"
@@ -13,7 +13,7 @@ num_return_sequences = 5
 load_lock = threading.Lock()
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     prompts = [['']]
     tokenizer: AutoTokenizer = None
     model: AutoModelForSeq2SeqLM = None
diff --git a/scripts/flux_tools.py b/scripts/flux_tools.py
index ff5367cd8..07b96f0aa 100644
--- a/scripts/flux_tools.py
+++ b/scripts/flux_tools.py
@@ -3,7 +3,7 @@
 import time
 import gradio as gr
 import diffusers
-from modules import scripts, processing, shared, devices, sd_models
+from modules import scripts_manager, processing, shared, devices, sd_models
 from installer import install
 
 
@@ -14,7 +14,7 @@ processor_depth = None
 title = 'Flux Tools'
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return f'{title}'
 
@@ -44,7 +44,7 @@ class Script(scripts.Script):
     def run(self, p: processing.StableDiffusionProcessing, tool: str = 'None', prompt: float = 1.0, strength: bool = True, process: bool = True): # pylint: disable=arguments-differ
         global redux_pipe, processor_canny, processor_depth # pylint: disable=global-statement
         if tool is None or tool == 'None':
-            return
+            return None
         image = getattr(p, 'init_images', None)
         if image is None or len(image) == 0:
             shared.log.error(f'{title}: tool={tool} no init_images')
@@ -147,3 +147,4 @@ class Script(scripts.Script):
 
         shared.log.debug(f'{title}: tool={tool} ready time={time.time() - t0:.2f}')
         devices.torch_gc()
+        return None
diff --git a/modules/freescale/__init__.py b/scripts/freescale/__init__.py
similarity index 100%
rename from modules/freescale/__init__.py
rename to scripts/freescale/__init__.py
diff --git a/modules/freescale/free_lunch_utils.py b/scripts/freescale/free_lunch_utils.py
similarity index 100%
rename from modules/freescale/free_lunch_utils.py
rename to scripts/freescale/free_lunch_utils.py
diff --git a/modules/freescale/freescale_pipeline.py b/scripts/freescale/freescale_pipeline.py
similarity index 100%
rename from modules/freescale/freescale_pipeline.py
rename to scripts/freescale/freescale_pipeline.py
diff --git a/modules/freescale/freescale_pipeline_img2img.py b/scripts/freescale/freescale_pipeline_img2img.py
similarity index 100%
rename from modules/freescale/freescale_pipeline_img2img.py
rename to scripts/freescale/freescale_pipeline_img2img.py
diff --git a/modules/freescale/scale_attention.py b/scripts/freescale/scale_attention.py
similarity index 100%
rename from modules/freescale/scale_attention.py
rename to scripts/freescale/scale_attention.py
diff --git a/scripts/freescale.py b/scripts/freescale_ext.py
similarity index 97%
rename from scripts/freescale.py
rename to scripts/freescale_ext.py
index 31c5a3b1c..1f24123af 100644
--- a/scripts/freescale.py
+++ b/scripts/freescale_ext.py
@@ -1,11 +1,11 @@
 import gradio as gr
-from modules import scripts, processing, shared, sd_models
+from modules import scripts_manager, processing, shared, sd_models
 
 
 registered = False
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -58,7 +58,7 @@ class Script(scripts.Script):
                 shared.log.warning('FreeScale: missing input image')
                 return None
 
-        from modules.freescale import StableDiffusionXLFreeScale, StableDiffusionXLFreeScaleImg2Img
+        from scripts.freescale import StableDiffusionXLFreeScale, StableDiffusionXLFreeScaleImg2Img
         self.orig_pipe = shared.sd_model
         self.orig_slice = shared.opts.diffusers_vae_slicing
         self.orig_tile = shared.opts.diffusers_vae_tiling
diff --git a/scripts/hdr.py b/scripts/hdr.py
index 9afc3673b..7daf3e3a0 100644
--- a/scripts/hdr.py
+++ b/scripts/hdr.py
@@ -3,13 +3,12 @@ import cv2
 import numpy as np
 import gradio as gr
 from PIL import Image
-import modules.scripts as scripts
-from modules import images, processing, shared
+from modules import images, processing, shared, scripts_manager
 from modules.processing import Processed
 from modules.shared import opts, state
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "HDR: High Dynamic Range"
 
@@ -60,7 +59,7 @@ class Script(scripts.Script):
     def run(self, p, hdr_range, save_hdr, is_tonemap, gamma, scale, saturation): # pylint: disable=arguments-differ
         if shared.sd_model_type != 'sd' and shared.sd_model_type != 'sdxl':
             shared.log.error(f'HDR: incorrect base model: {shared.sd_model.__class__.__name__}')
-            return
+            return None
         p.extra_generation_params = {
             "HDR range": hdr_range,
         }
diff --git a/scripts/hunyuanvideo.py b/scripts/hunyuanvideo.py
index 0291c4124..93a2a157c 100644
--- a/scripts/hunyuanvideo.py
+++ b/scripts/hunyuanvideo.py
@@ -3,7 +3,7 @@ import torch
 import gradio as gr
 import transformers
 import diffusers
-from modules import scripts, processing, shared, images, devices, sd_models, sd_checkpoint, sd_samplers, model_quant, timer, sd_hijack_te
+from modules import scripts_manager, processing, shared, images, devices, sd_models, sd_checkpoint, sd_samplers, model_quant, timer, sd_hijack_te
 
 
 default_template = """Describe the video by detailing the following aspects:
@@ -48,7 +48,7 @@ def hijack_decode(*args, **kwargs):
     return res
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: Hunyuan Video (Legacy)'
 
diff --git a/scripts/image2video.py b/scripts/image2video.py
index b39b793b5..3b59a84a3 100644
--- a/scripts/image2video.py
+++ b/scripts/image2video.py
@@ -1,7 +1,7 @@
 import torch
 import gradio as gr
 import diffusers
-from modules import scripts, processing, shared, images, sd_models, devices
+from modules import scripts_manager, processing, shared, images, sd_models, devices
 
 
 MODELS = [
@@ -11,7 +11,7 @@ MODELS = [
 ]
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: VGen Image-to-Video'
 
@@ -53,9 +53,9 @@ class Script(scripts.Script):
 
     def run(self, p: processing.StableDiffusionProcessing, model_name, num_frames, video_type, duration, gif_loop, mp4_pad, mp4_interpolate, fi_method, fi_iters, fi_order, fi_spatial, fi_temporal, vg_chunks, vg_fps): # pylint: disable=arguments-differ, unused-argument
         if model_name == 'None':
-            return
+            return None
         if p.init_images is None or len(p.init_images) == 0:
-            return
+            return None
         model = [m for m in MODELS if m['name'] == model_name][0]
         repo_id = model['url']
         shared.log.debug(f'Image2Video: model={model_name} frames={num_frames}, video={video_type} duration={duration} loop={gif_loop} pad={mp4_pad} interpolate={mp4_interpolate}')
@@ -66,7 +66,7 @@ class Script(scripts.Script):
         if model_name == 'PIA':
             if shared.sd_model_type != 'sd':
                 shared.log.error('Image2Video PIA: base model must be SD15')
-                return
+                return None
             shared.log.info(f'Image2Video PIA load: model={repo_id}')
             motion_adapter = diffusers.MotionAdapter.from_pretrained(repo_id)
             sd_models.move_model(motion_adapter, devices.device)
diff --git a/modules/infiniteyou/__init__.py b/scripts/infiniteyou/__init__.py
similarity index 100%
rename from modules/infiniteyou/__init__.py
rename to scripts/infiniteyou/__init__.py
diff --git a/modules/infiniteyou/pipeline_flux_infusenet.py b/scripts/infiniteyou/pipeline_flux_infusenet.py
similarity index 100%
rename from modules/infiniteyou/pipeline_flux_infusenet.py
rename to scripts/infiniteyou/pipeline_flux_infusenet.py
diff --git a/modules/infiniteyou/pipeline_infu_flux.py b/scripts/infiniteyou/pipeline_infu_flux.py
similarity index 100%
rename from modules/infiniteyou/pipeline_infu_flux.py
rename to scripts/infiniteyou/pipeline_infu_flux.py
diff --git a/modules/infiniteyou/resampler.py b/scripts/infiniteyou/resampler.py
similarity index 100%
rename from modules/infiniteyou/resampler.py
rename to scripts/infiniteyou/resampler.py
diff --git a/scripts/infiniteyou_ext.py b/scripts/infiniteyou_ext.py
index 7a702d858..9a280811b 100644
--- a/scripts/infiniteyou_ext.py
+++ b/scripts/infiniteyou_ext.py
@@ -4,7 +4,7 @@
 
 import gradio as gr
 from PIL import Image
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 
 
 prefix = 'InfiniteYou'
@@ -22,7 +22,7 @@ def verify_insightface():
 
 
 def load_infiniteyou(model: str):
-    from modules.infiniteyou import InfUFluxPipeline
+    from scripts.infiniteyou import InfUFluxPipeline
     shared.sd_model = InfUFluxPipeline(
         pipe=shared.sd_model,
         model_version=model,
@@ -31,7 +31,7 @@ def load_infiniteyou(model: str):
     sd_models.set_diffuser_options(shared.sd_model)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return f'{prefix}: Flexible Photo Recrafting'
 
diff --git a/scripts/init_latents.py b/scripts/init_latents.py
index 77a73c80b..5b3d9b406 100644
--- a/scripts/init_latents.py
+++ b/scripts/init_latents.py
@@ -1,14 +1,14 @@
-from modules import scripts, processing, shared, devices
+from modules import scripts_manager, processing, shared, devices
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     standalone = False
 
     def title(self):
         return 'Init Latents'
 
     def show(self, is_img2img):
-        return scripts.AlwaysVisible if shared.native else False
+        return scripts_manager.AlwaysVisible if shared.native else False
 
     @staticmethod
     def get_latents(p):
diff --git a/modules/instantir/__init__.py b/scripts/instantir/__init__.py
similarity index 100%
rename from modules/instantir/__init__.py
rename to scripts/instantir/__init__.py
diff --git a/modules/instantir/aggregator.py b/scripts/instantir/aggregator.py
similarity index 100%
rename from modules/instantir/aggregator.py
rename to scripts/instantir/aggregator.py
diff --git a/modules/meissonic/__init__.py b/scripts/instantir/ip_adapter/__init__.py
similarity index 100%
rename from modules/meissonic/__init__.py
rename to scripts/instantir/ip_adapter/__init__.py
diff --git a/modules/instantir/ip_adapter/attention_processor.py b/scripts/instantir/ip_adapter/attention_processor.py
similarity index 100%
rename from modules/instantir/ip_adapter/attention_processor.py
rename to scripts/instantir/ip_adapter/attention_processor.py
diff --git a/modules/instantir/ip_adapter/ip_adapter.py b/scripts/instantir/ip_adapter/ip_adapter.py
similarity index 100%
rename from modules/instantir/ip_adapter/ip_adapter.py
rename to scripts/instantir/ip_adapter/ip_adapter.py
diff --git a/modules/instantir/ip_adapter/resampler.py b/scripts/instantir/ip_adapter/resampler.py
similarity index 100%
rename from modules/instantir/ip_adapter/resampler.py
rename to scripts/instantir/ip_adapter/resampler.py
diff --git a/modules/instantir/ip_adapter/utils.py b/scripts/instantir/ip_adapter/utils.py
similarity index 100%
rename from modules/instantir/ip_adapter/utils.py
rename to scripts/instantir/ip_adapter/utils.py
diff --git a/modules/instantir/lcm_single_step_scheduler.py b/scripts/instantir/lcm_single_step_scheduler.py
similarity index 100%
rename from modules/instantir/lcm_single_step_scheduler.py
rename to scripts/instantir/lcm_single_step_scheduler.py
diff --git a/modules/instantir/sdxl_instantir.py b/scripts/instantir/sdxl_instantir.py
similarity index 100%
rename from modules/instantir/sdxl_instantir.py
rename to scripts/instantir/sdxl_instantir.py
diff --git a/scripts/instantir.py b/scripts/instantir_ext.py
similarity index 96%
rename from scripts/instantir.py
rename to scripts/instantir_ext.py
index 6ab7733fe..0fb39b0bb 100644
--- a/scripts/instantir.py
+++ b/scripts/instantir_ext.py
@@ -2,10 +2,10 @@ import gradio as gr
 import torch
 import diffusers
 from huggingface_hub import hf_hub_download
-from modules import scripts, processing, shared, sd_models, devices, ipadapter
+from modules import scripts_manager, processing, shared, sd_models, devices, ipadapter
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -40,7 +40,7 @@ class Script(scripts.Script):
             shared.log.warning(f'InstantIR: class={shared.sd_model.__class__.__name__} model={shared.sd_model_type} required={supported_model_list}')
             return None
         start, end, hq, multistep, adastep, image = args
-        from modules import instantir as ir
+        from scripts import instantir as ir
         if shared.sd_model_type == "sdxl":
             if shared.sd_model.__class__.__name__ != "InstantIRPipeline":
                 self.orig_pipe = shared.sd_model
diff --git a/scripts/ipadapter.py b/scripts/ipadapter.py
index 98b2a683f..ca1cdcfbc 100644
--- a/scripts/ipadapter.py
+++ b/scripts/ipadapter.py
@@ -1,20 +1,20 @@
 import json
 from PIL import Image
 import gradio as gr
-from modules import scripts, processing, shared, ipadapter, ui_common
+from modules import scripts_manager, processing, shared, ipadapter, ui_common
 
 
 MAX_ADAPTERS = 4
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     standalone = True
 
     def title(self):
         return 'IP Adapters'
 
     def show(self, is_img2img):
-        return scripts.AlwaysVisible if shared.native else False
+        return scripts_manager.AlwaysVisible if shared.native else False
 
     def load_images(self, files):
         init_images = []
diff --git a/scripts/ipinstruct.py b/scripts/ipinstruct.py
index 9add5c41d..57e20de86 100644
--- a/scripts/ipinstruct.py
+++ b/scripts/ipinstruct.py
@@ -7,7 +7,7 @@ encoder: `laion/CLIP-ViT-H-14-laion2B-s32B-b79K`=3.94GB
 import os
 import importlib
 import gradio as gr
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 
 
 repo = 'https://github.com/vladmandic/IP-Instruct'
@@ -16,7 +16,7 @@ encoder = "laion/CLIP-ViT-H-14-laion2B-s32B-b79K"
 folder = os.path.join('repositories', 'ip_instruct')
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
diff --git a/scripts/k_diff.py b/scripts/k_diff.py
index f5f7caab6..d2f50ff3c 100644
--- a/scripts/k_diff.py
+++ b/scripts/k_diff.py
@@ -1,9 +1,9 @@
 import inspect
 import gradio as gr
-from modules import scripts, processing, shared, sd_models, ui_common
+from modules import scripts_manager, processing, shared, sd_models, ui_common
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     supported_models = ['sd', 'sdxl']
     orig_pipe = None
 
@@ -65,6 +65,7 @@ class Script(scripts.Script):
         #     params['disable'] = False
         shared.log.info(f'K-diffusion apply: class={shared.sd_model.__class__.__name__} sampler={sampler} params={params}')
         p.extra_generation_params["Sampler"] = sampler
+        return None
 
     def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, sampler): # pylint: disable=arguments-differ, unused-argument
         if self.orig_pipe is None:
diff --git a/scripts/kohya_hires_fix.py b/scripts/kohya_hires_fix.py
index 090edcaf9..3d7b16c61 100644
--- a/scripts/kohya_hires_fix.py
+++ b/scripts/kohya_hires_fix.py
@@ -1,9 +1,9 @@
 import gradio as gr
 import diffusers
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Kohya HiRes Fix'
 
diff --git a/modules/layerdiffuse/__init__.py b/scripts/layerdiffuse/__init__.py
similarity index 94%
rename from modules/layerdiffuse/__init__.py
rename to scripts/layerdiffuse/__init__.py
index 368790c19..c980196c4 100644
--- a/modules/layerdiffuse/__init__.py
+++ b/scripts/layerdiffuse/__init__.py
@@ -2,9 +2,9 @@
 
 from huggingface_hub import hf_hub_download
 from safetensors.torch import load_file
-from modules.layerdiffuse.layerdiffuse_model import TransparentVAEDecoder
-from modules.layerdiffuse.layerdiffuse_loader import load_lora_to_unet, merge_delta_weights_into_unet
 from modules import shared, errors, devices
+from .layerdiffuse_model import TransparentVAEDecoder
+from .layerdiffuse_loader import load_lora_to_unet, merge_delta_weights_into_unet
 
 
 def apply_layerdiffuse_sd15(pipeline):
diff --git a/modules/layerdiffuse/layerdiffuse_loader.py b/scripts/layerdiffuse/layerdiffuse_loader.py
similarity index 99%
rename from modules/layerdiffuse/layerdiffuse_loader.py
rename to scripts/layerdiffuse/layerdiffuse_loader.py
index 577b006fe..4c029f4d5 100644
--- a/modules/layerdiffuse/layerdiffuse_loader.py
+++ b/scripts/layerdiffuse/layerdiffuse_loader.py
@@ -1,5 +1,5 @@
 from safetensors.torch import load_file
-from modules.layerdiffuse.layerdiffuse_model import LoraLoader, AttentionSharingProcessor
+from scripts.layerdiffuse.layerdiffuse_model import LoraLoader, AttentionSharingProcessor
 
 
 def merge_delta_weights_into_unet(pipe, delta_weights):
diff --git a/modules/layerdiffuse/layerdiffuse_model.py b/scripts/layerdiffuse/layerdiffuse_model.py
similarity index 100%
rename from modules/layerdiffuse/layerdiffuse_model.py
rename to scripts/layerdiffuse/layerdiffuse_model.py
diff --git a/scripts/layerdiffuse.py b/scripts/layerdiffuse_ext.py
similarity index 94%
rename from scripts/layerdiffuse.py
rename to scripts/layerdiffuse_ext.py
index ecf7da1d3..611af5a77 100644
--- a/scripts/layerdiffuse.py
+++ b/scripts/layerdiffuse_ext.py
@@ -1,8 +1,8 @@
 import gradio as gr
-from modules import shared, scripts, sd_models
+from modules import shared, scripts_manager, sd_models
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
 
     def title(self):
         return 'LayerDiffuse: Transparent Image'
@@ -11,7 +11,7 @@ class Script(scripts.Script):
         return True if shared.native else False
 
     def apply(self):
-        from modules import layerdiffuse
+        from scripts import layerdiffuse
         if not shared.sd_loaded:
             shared.log.error('LayerDiffuse: model not loaded')
             return self.is_active()
diff --git a/scripts/ledits.py b/scripts/ledits.py
index b75c6ff6f..712840e7c 100644
--- a/scripts/ledits.py
+++ b/scripts/ledits.py
@@ -1,9 +1,9 @@
 import diffusers
 import gradio as gr
-from modules import scripts, processing, shared, devices, sd_models
+from modules import scripts_manager, processing, shared, devices, sd_models
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'LEdits: Limitless Image Editing'
 
diff --git a/scripts/legacy_allegrovideo.py b/scripts/legacy_allegrovideo.py
index 1403e0765..ac6ee7f2b 100644
--- a/scripts/legacy_allegrovideo.py
+++ b/scripts/legacy_allegrovideo.py
@@ -2,7 +2,7 @@ import time
 import gradio as gr
 import transformers
 import diffusers
-from modules import scripts, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
+from modules import scripts_manager, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
 
 
 repo_id = 'rhymes-ai/Allegro'
@@ -19,7 +19,7 @@ def hijack_decode(*args, **kwargs):
     return res
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: Allegro (Legacy)'
 
diff --git a/scripts/loopback.py b/scripts/loopback.py
index 99111d486..98b4f1e00 100644
--- a/scripts/loopback.py
+++ b/scripts/loopback.py
@@ -1,13 +1,12 @@
 import math
 
 import gradio as gr
-import modules.scripts as scripts
-from modules import images, processing
+from modules import images, processing, scripts_manager
 from modules.processing import Processed
 from modules.shared import opts, state
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "Loopback"
 
diff --git a/scripts/ltxvideo.py b/scripts/ltxvideo.py
index 43ea75595..51a823f3b 100644
--- a/scripts/ltxvideo.py
+++ b/scripts/ltxvideo.py
@@ -4,7 +4,7 @@ import torch
 import gradio as gr
 import diffusers
 import transformers
-from modules import scripts, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
+from modules import scripts_manager, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant, timer, sd_hijack_te
 
 
 repos = {
@@ -39,7 +39,7 @@ def hijack_decode(*args, **kwargs):
     return res
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: LTX Video (Legacy)'
 
diff --git a/scripts/lut.py b/scripts/lut.py
index 265abb2de..c32986fe5 100644
--- a/scripts/lut.py
+++ b/scripts/lut.py
@@ -5,14 +5,14 @@ lib: https://github.com/homm/pillow-lut-tools
 import os
 import gradio as gr
 from installer import install
-from modules import scripts, shared, processing
+from modules import scripts_manager, shared, processing
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'LUT Color grading'
 
-    def show(self, is_img2img):
+    def show(self, is_img2img): # pylint: disable=unused-argument
         return shared.native
 
     def ui(self, _is_img2img):
diff --git a/scripts/mixture_of_diffusers.py b/scripts/mixture_of_diffusers.py
index 58598ec66..0cbc60d4e 100644
--- a/scripts/mixture_of_diffusers.py
+++ b/scripts/mixture_of_diffusers.py
@@ -1,5 +1,5 @@
 import gradio as gr
-from modules import scripts, processing, shared, sd_models
+from modules import scripts_manager, processing, shared, sd_models
 
 
 supported_models = ['sdxl']
@@ -7,7 +7,7 @@ max_xtiles = 4
 max_ytiles = 4
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -16,7 +16,7 @@ class Script(scripts.Script):
     def title(self):
         return 'Mixture-of-Diffusers: Tile Control'
 
-    def show(self, is_img2img):
+    def show(self, is_img2img): # pylint: disable=unused-argument
         return shared.native
 
     def update_ui(self, x_tiles, y_tiles):
@@ -85,7 +85,7 @@ class Script(scripts.Script):
         [x_tiles, y_tiles, x_overlap, y_overlap], prompts = args[:4], args[4:]
         if max(x_tiles, y_tiles) <= 1:
             return None
-        from modules.mod import StableDiffusionXLTilingPipeline
+        from scripts.mod import StableDiffusionXLTilingPipeline
         self.orig_pipe = shared.sd_model
         self.orig_attn = shared.opts.prompt_attention
 
@@ -113,7 +113,7 @@ class Script(scripts.Script):
         shared.sd_model = sd_models.switch_pipe(StableDiffusionXLTilingPipeline, shared.sd_model)
         sd_models.set_diffuser_options(shared.sd_model)
         sd_models.apply_balanced_offload(shared.sd_model)
-
+        return None
 
     def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, *args): # pylint: disable=arguments-differ, unused-argument
         if self.orig_pipe is None:
diff --git a/scripts/mixture_tiling.py b/scripts/mixture_tiling.py
index 5b5aab9db..5a78c8203 100644
--- a/scripts/mixture_tiling.py
+++ b/scripts/mixture_tiling.py
@@ -1,6 +1,6 @@
 import gradio as gr
 import torch
-from modules import shared, devices, scripts, processing, sd_models
+from modules import shared, devices, scripts_manager, processing, sd_models
 
 
 checked_ok = False
@@ -24,7 +24,7 @@ def check_dependencies():
         return False
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Mixture Tiling: Scene Composition'
 
@@ -47,11 +47,11 @@ class Script(scripts.Script):
     def run(self, p: processing.StableDiffusionProcessing, x_size, y_size, x_overlap, y_overlap): # pylint: disable=arguments-differ
         if not checked_ok:
             if not check_dependencies():
-                return
+                return None
         prompts = p.prompt.splitlines()
         if len(prompts) != x_size * y_size:
             shared.log.error(f'Mixture tiling prompt count mismatch: prompts={len(prompts)} required={x_size * y_size}')
-            return
+            return None
         # backup pipeline and params
         orig_pipeline = shared.sd_model
         orig_dtype = devices.dtype
@@ -59,12 +59,12 @@ class Script(scripts.Script):
         # create pipeline
         if shared.sd_model_type != 'sd':
             shared.log.error(f'Mixture tiling: incorrect base model: {shared.sd_model.__class__.__name__}')
-            return
+            return None
         shared.sd_model = sd_models.switch_pipe('mixture_tiling', shared.sd_model)
         if shared.sd_model.__class__.__name__ != 'StableDiffusionTilingPipeline': # switch failed
             shared.log.error(f'Mixture tiling: not a tiling pipeline: {shared.sd_model.__class__.__name__}')
             shared.sd_model = orig_pipeline
-            return
+            return None
         sd_models.set_diffuser_options(shared.sd_model)
         shared.opts.data['prompt_attention'] = 'fixed' # this pipeline is not compatible with embeds
         shared.sd_model.to(torch.float32) # this pipeline unet is not compatible with fp16
diff --git a/scripts/mochivideo.py b/scripts/mochivideo.py
index 1e7ba5541..d5c743ad6 100644
--- a/scripts/mochivideo.py
+++ b/scripts/mochivideo.py
@@ -2,13 +2,13 @@ import time
 import torch
 import gradio as gr
 import diffusers
-from modules import scripts, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant
+from modules import scripts_manager, processing, shared, images, devices, sd_models, sd_checkpoint, model_quant
 
 
 repo_id = 'genmo/mochi-1-preview'
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: Mochi.1 Video (Legacy)'
 
diff --git a/modules/mod/__init__.py b/scripts/mod/__init__.py
similarity index 100%
rename from modules/mod/__init__.py
rename to scripts/mod/__init__.py
diff --git a/scripts/mulan.py b/scripts/mulan.py
index 829ce1463..f177d5d14 100644
--- a/scripts/mulan.py
+++ b/scripts/mulan.py
@@ -24,7 +24,7 @@ Examples:
 """
 
 import gradio as gr
-from modules import shared, scripts, processing, devices
+from modules import shared, scripts_manager, processing, devices
 
 
 ENCODERS =[
@@ -44,7 +44,7 @@ tokenizer = None
 text_encoder_path = None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'MuLan: Multi Language Prompts'
 
@@ -61,11 +61,11 @@ class Script(scripts.Script):
     def run(self, p: processing.StableDiffusionProcessing, selected_encoder): # pylint: disable=arguments-differ
         global pipe_type, adapter, text_encoder, tokenizer, text_encoder_path # pylint: disable=global-statement
         if not selected_encoder or selected_encoder == 'None':
-            return
+            return None
         # create pipeline
         if shared.sd_model_type != 'sd' and shared.sd_model_type != 'sdxl':
             shared.log.error(f'MuLan: incorrect base model: {shared.sd_model.__class__.__name__}')
-            return
+            return None
 
         adapter_path = None
         if shared.sd_model_type == 'sd':
@@ -73,7 +73,7 @@ class Script(scripts.Script):
         if shared.sd_model_type == 'sdxl':
             adapter_path = 'mulanai/mulan-lang-adapter::sdxl_aesthetic.pth'
         if adapter_path is None:
-            return
+            return None
 
         # install-on-demand
         import installer
diff --git a/scripts/outpainting_mk_2.py b/scripts/outpainting_mk_2.py
index 7fd56e353..adbdbdb83 100644
--- a/scripts/outpainting_mk_2.py
+++ b/scripts/outpainting_mk_2.py
@@ -2,8 +2,7 @@ import math
 import numpy as np
 import gradio as gr
 from PIL import Image, ImageDraw
-import modules.scripts as scripts
-from modules import images
+from modules import images, scripts_manager
 from modules.processing import Processed, process_images
 from modules.shared import opts, state
 
@@ -100,7 +99,7 @@ def get_matched_noise(_np_src_image, np_mask_rgb, noise_q=1, color_variation=0.0
     return np.clip(matched_noise, 0., 1.)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "Outpainting"
 
diff --git a/modules/pixelsmith/__init__.py b/scripts/pixelsmith/__init__.py
similarity index 100%
rename from modules/pixelsmith/__init__.py
rename to scripts/pixelsmith/__init__.py
diff --git a/modules/pixelsmith/autoencoder_kl.py b/scripts/pixelsmith/autoencoder_kl.py
similarity index 100%
rename from modules/pixelsmith/autoencoder_kl.py
rename to scripts/pixelsmith/autoencoder_kl.py
diff --git a/modules/pixelsmith/pixelsmith_pipeline.py b/scripts/pixelsmith/pixelsmith_pipeline.py
similarity index 100%
rename from modules/pixelsmith/pixelsmith_pipeline.py
rename to scripts/pixelsmith/pixelsmith_pipeline.py
diff --git a/modules/pixelsmith/vae.py b/scripts/pixelsmith/vae.py
similarity index 100%
rename from modules/pixelsmith/vae.py
rename to scripts/pixelsmith/vae.py
diff --git a/scripts/pixelsmith.py b/scripts/pixelsmith_ext.py
similarity index 95%
rename from scripts/pixelsmith.py
rename to scripts/pixelsmith_ext.py
index a9509081c..b2cd06bdd 100644
--- a/scripts/pixelsmith.py
+++ b/scripts/pixelsmith_ext.py
@@ -1,9 +1,9 @@
 import gradio as gr
 from PIL import Image
-from modules import scripts, processing, shared, sd_models, devices, images
+from modules import scripts_manager, processing, shared, sd_models, devices, images
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -49,7 +49,7 @@ class Script(scripts.Script):
         supported_model_list = ['sdxl']
         if shared.sd_model_type not in supported_model_list:
             shared.log.warning(f'PixelSmith: class={shared.sd_model.__class__.__name__} model={shared.sd_model_type} required={supported_model_list}')
-        from modules.pixelsmith import PixelSmithXLPipeline, PixelSmithVAE
+        from scripts.pixelsmith import PixelSmithXLPipeline, PixelSmithVAE
         self.orig_pipe = shared.sd_model
         self.orig_vae = shared.sd_model.vae
         if self.vae is None:
diff --git a/scripts/poor_mans_outpainting.py b/scripts/poor_mans_outpainting.py
index 690dd1911..667ec6853 100644
--- a/scripts/poor_mans_outpainting.py
+++ b/scripts/poor_mans_outpainting.py
@@ -1,13 +1,12 @@
 import math
 import gradio as gr
 from PIL import Image, ImageDraw
-import modules.scripts as scripts
-from modules import images, devices
+from modules import images, devices, scripts_manager
 from modules.processing import Processed, process_images
 from modules.shared import opts, state, log
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "Outpainting alternative"
 
diff --git a/scripts/prompt_enhance.py b/scripts/prompt_enhance.py
index 26981f812..077d8959c 100644
--- a/scripts/prompt_enhance.py
+++ b/scripts/prompt_enhance.py
@@ -8,7 +8,7 @@ import torch
 import transformers
 import gradio as gr
 from PIL import Image
-from modules import scripts, shared, devices, errors, processing, sd_models, sd_modules
+from modules import scripts_manager, shared, devices, errors, processing, sd_models, sd_modules
 
 
 debug_enabled = os.environ.get('SD_LLM_DEBUG', None) is not None
@@ -83,7 +83,7 @@ class Options:
     thinking_mode: bool = False
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     prompt: gr.Textbox = None
     image: gr.Image = None
     model: str = None
@@ -96,7 +96,7 @@ class Script(scripts.Script):
         return 'Prompt enhance'
 
     def show(self, _is_img2img):
-        return scripts.AlwaysVisible
+        return scripts_manager.AlwaysVisible
 
     def load(self, name:str=None, model_repo:str=None, model_gguf:str=None, model_type:str=None, model_file:str=None):
         name = name or self.options.default
@@ -515,4 +515,3 @@ class Script(scripts.Script):
         )
         p.extra_generation_params['LLM'] = llm_model
         shared.state.end()
-
diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 37cc2795c..05f007ba0 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -1,7 +1,6 @@
 import math
 import gradio as gr
-import modules.scripts as scripts
-from modules import images
+from modules import images, scripts_manager
 from modules.processing import process_images
 from modules.shared import opts, state, log
 import modules.sd_samplers
@@ -21,7 +20,7 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
         for ix, x in enumerate(xs):
             state.job = f"{ix + iy * len(xs) + 1} out of {len(xs) * len(ys)}"
 
-            processed, t = cell(x, y)
+            processed, _t = cell(x, y)
             if first_processed is None:
                 first_processed = processed
 
@@ -37,7 +36,7 @@ def draw_xy_grid(xs, ys, x_label, y_label, cell):
     return first_processed
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "Prompt matrix"
 
diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py
index eac66b418..6e55a8ebb 100644
--- a/scripts/prompts_from_file.py
+++ b/scripts/prompts_from_file.py
@@ -2,8 +2,7 @@ import copy
 import random
 import shlex
 import gradio as gr
-import modules.scripts as scripts
-from modules import sd_samplers, errors
+from modules import sd_samplers, errors, scripts_manager
 from modules.processing import Processed, process_images
 from modules.shared import state, log
 
@@ -94,7 +93,7 @@ def load_prompt_file(file):
         return None, "\n".join(lines), gr.update(lines=7)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "Prompts from file"
 
diff --git a/modules/pulid/__init__.py b/scripts/pulid/__init__.py
similarity index 100%
rename from modules/pulid/__init__.py
rename to scripts/pulid/__init__.py
diff --git a/modules/pulid/attention_processor.py b/scripts/pulid/attention_processor.py
similarity index 100%
rename from modules/pulid/attention_processor.py
rename to scripts/pulid/attention_processor.py
diff --git a/modules/pulid/encoders_transformer.py b/scripts/pulid/encoders_transformer.py
similarity index 100%
rename from modules/pulid/encoders_transformer.py
rename to scripts/pulid/encoders_transformer.py
diff --git a/modules/pulid/eva_clip/__init__.py b/scripts/pulid/eva_clip/__init__.py
similarity index 100%
rename from modules/pulid/eva_clip/__init__.py
rename to scripts/pulid/eva_clip/__init__.py
diff --git a/modules/pulid/eva_clip/bpe_simple_vocab_16e6.txt.gz b/scripts/pulid/eva_clip/bpe_simple_vocab_16e6.txt.gz
similarity index 100%
rename from modules/pulid/eva_clip/bpe_simple_vocab_16e6.txt.gz
rename to scripts/pulid/eva_clip/bpe_simple_vocab_16e6.txt.gz
diff --git a/modules/pulid/eva_clip/constants.py b/scripts/pulid/eva_clip/constants.py
similarity index 100%
rename from modules/pulid/eva_clip/constants.py
rename to scripts/pulid/eva_clip/constants.py
diff --git a/modules/pulid/eva_clip/eva_vit_model.py b/scripts/pulid/eva_clip/eva_vit_model.py
similarity index 100%
rename from modules/pulid/eva_clip/eva_vit_model.py
rename to scripts/pulid/eva_clip/eva_vit_model.py
diff --git a/modules/pulid/eva_clip/factory.py b/scripts/pulid/eva_clip/factory.py
similarity index 100%
rename from modules/pulid/eva_clip/factory.py
rename to scripts/pulid/eva_clip/factory.py
diff --git a/modules/pulid/eva_clip/hf_configs.py b/scripts/pulid/eva_clip/hf_configs.py
similarity index 100%
rename from modules/pulid/eva_clip/hf_configs.py
rename to scripts/pulid/eva_clip/hf_configs.py
diff --git a/modules/pulid/eva_clip/hf_model.py b/scripts/pulid/eva_clip/hf_model.py
similarity index 100%
rename from modules/pulid/eva_clip/hf_model.py
rename to scripts/pulid/eva_clip/hf_model.py
diff --git a/modules/pulid/eva_clip/loss.py b/scripts/pulid/eva_clip/loss.py
similarity index 100%
rename from modules/pulid/eva_clip/loss.py
rename to scripts/pulid/eva_clip/loss.py
diff --git a/modules/pulid/eva_clip/model.py b/scripts/pulid/eva_clip/model.py
similarity index 100%
rename from modules/pulid/eva_clip/model.py
rename to scripts/pulid/eva_clip/model.py
diff --git a/modules/pulid/eva_clip/model_configs/EVA01-CLIP-B-16.json b/scripts/pulid/eva_clip/model_configs/EVA01-CLIP-B-16.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA01-CLIP-B-16.json
rename to scripts/pulid/eva_clip/model_configs/EVA01-CLIP-B-16.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA01-CLIP-g-14-plus.json b/scripts/pulid/eva_clip/model_configs/EVA01-CLIP-g-14-plus.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA01-CLIP-g-14-plus.json
rename to scripts/pulid/eva_clip/model_configs/EVA01-CLIP-g-14-plus.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA01-CLIP-g-14.json b/scripts/pulid/eva_clip/model_configs/EVA01-CLIP-g-14.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA01-CLIP-g-14.json
rename to scripts/pulid/eva_clip/model_configs/EVA01-CLIP-g-14.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA02-CLIP-B-16.json b/scripts/pulid/eva_clip/model_configs/EVA02-CLIP-B-16.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA02-CLIP-B-16.json
rename to scripts/pulid/eva_clip/model_configs/EVA02-CLIP-B-16.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA02-CLIP-L-14-336.json b/scripts/pulid/eva_clip/model_configs/EVA02-CLIP-L-14-336.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA02-CLIP-L-14-336.json
rename to scripts/pulid/eva_clip/model_configs/EVA02-CLIP-L-14-336.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA02-CLIP-L-14.json b/scripts/pulid/eva_clip/model_configs/EVA02-CLIP-L-14.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA02-CLIP-L-14.json
rename to scripts/pulid/eva_clip/model_configs/EVA02-CLIP-L-14.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14-plus.json b/scripts/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14-plus.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14-plus.json
rename to scripts/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14-plus.json
diff --git a/modules/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14.json b/scripts/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14.json
similarity index 100%
rename from modules/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14.json
rename to scripts/pulid/eva_clip/model_configs/EVA02-CLIP-bigE-14.json
diff --git a/modules/pulid/eva_clip/modified_resnet.py b/scripts/pulid/eva_clip/modified_resnet.py
similarity index 100%
rename from modules/pulid/eva_clip/modified_resnet.py
rename to scripts/pulid/eva_clip/modified_resnet.py
diff --git a/modules/pulid/eva_clip/openai.py b/scripts/pulid/eva_clip/openai.py
similarity index 100%
rename from modules/pulid/eva_clip/openai.py
rename to scripts/pulid/eva_clip/openai.py
diff --git a/modules/pulid/eva_clip/pretrained.py b/scripts/pulid/eva_clip/pretrained.py
similarity index 100%
rename from modules/pulid/eva_clip/pretrained.py
rename to scripts/pulid/eva_clip/pretrained.py
diff --git a/modules/pulid/eva_clip/rope.py b/scripts/pulid/eva_clip/rope.py
similarity index 100%
rename from modules/pulid/eva_clip/rope.py
rename to scripts/pulid/eva_clip/rope.py
diff --git a/modules/pulid/eva_clip/timm_model.py b/scripts/pulid/eva_clip/timm_model.py
similarity index 100%
rename from modules/pulid/eva_clip/timm_model.py
rename to scripts/pulid/eva_clip/timm_model.py
diff --git a/modules/pulid/eva_clip/tokenizer.py b/scripts/pulid/eva_clip/tokenizer.py
similarity index 100%
rename from modules/pulid/eva_clip/tokenizer.py
rename to scripts/pulid/eva_clip/tokenizer.py
diff --git a/modules/pulid/eva_clip/transform.py b/scripts/pulid/eva_clip/transform.py
similarity index 100%
rename from modules/pulid/eva_clip/transform.py
rename to scripts/pulid/eva_clip/transform.py
diff --git a/modules/pulid/eva_clip/transformer.py b/scripts/pulid/eva_clip/transformer.py
similarity index 100%
rename from modules/pulid/eva_clip/transformer.py
rename to scripts/pulid/eva_clip/transformer.py
diff --git a/modules/pulid/eva_clip/utils.py b/scripts/pulid/eva_clip/utils.py
similarity index 100%
rename from modules/pulid/eva_clip/utils.py
rename to scripts/pulid/eva_clip/utils.py
diff --git a/modules/pulid/pulid_sampling.py b/scripts/pulid/pulid_sampling.py
similarity index 100%
rename from modules/pulid/pulid_sampling.py
rename to scripts/pulid/pulid_sampling.py
diff --git a/modules/pulid/pulid_sdxl.py b/scripts/pulid/pulid_sdxl.py
similarity index 99%
rename from modules/pulid/pulid_sdxl.py
rename to scripts/pulid/pulid_sdxl.py
index 18bf0eb1c..e964e58fe 100644
--- a/modules/pulid/pulid_sdxl.py
+++ b/scripts/pulid/pulid_sdxl.py
@@ -123,7 +123,7 @@ class StableDiffusionXLPuLIDPipeline:
         if sampler is not None:
             self.sampler = sampler
         else:
-            from modules.pulid import sampling
+            from scripts.pulid import sampling
             self.sampler = sampling.sample_dpmpp_sde
 
     @property
diff --git a/modules/pulid/pulid_utils.py b/scripts/pulid/pulid_utils.py
similarity index 100%
rename from modules/pulid/pulid_utils.py
rename to scripts/pulid/pulid_utils.py
diff --git a/scripts/pulid_ext.py b/scripts/pulid_ext.py
index f000bc43a..5fc186c57 100644
--- a/scripts/pulid_ext.py
+++ b/scripts/pulid_ext.py
@@ -4,7 +4,7 @@ import time
 import contextlib
 import gradio as gr
 from PIL import Image
-from modules import shared, devices, errors, scripts, processing, processing_helpers, sd_models
+from modules import shared, devices, errors, scripts_manager, processing, processing_helpers, sd_models
 
 
 debug = os.environ.get('SD_PULID_DEBUG', None) is not None
@@ -13,7 +13,7 @@ registered = False
 uploaded_images = []
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         self.pulid = None
         self.cache = None
@@ -144,7 +144,7 @@ class Script(scripts.Script):
         if self.pulid is None:
             self.dependencies()
             try:
-                from modules import pulid # pylint: disable=redefined-outer-name
+                from scripts import pulid # pylint: disable=redefined-outer-name
                 self.pulid = pulid
                 from diffusers import pipelines
                 pipelines.auto_pipeline.AUTO_TEXT2IMAGE_PIPELINES_MAPPING["pulid"] = pulid.StableDiffusionXLPuLIDPipeline
diff --git a/scripts/regional_prompting.py b/scripts/regional_prompting.py
index 5016d6e2f..ba92364ec 100644
--- a/scripts/regional_prompting.py
+++ b/scripts/regional_prompting.py
@@ -3,7 +3,7 @@
 
 import gradio as gr
 from diffusers.pipelines import pipeline_utils
-from modules import shared, devices, scripts, processing, sd_models, prompt_parser_diffusers
+from modules import shared, devices, scripts_manager, processing, sd_models, prompt_parser_diffusers
 
 
 def hijack_register_modules(self, **kwargs):
@@ -21,7 +21,7 @@ def hijack_register_modules(self, **kwargs):
         setattr(self, name, module)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Regional prompting'
 
@@ -45,7 +45,7 @@ class Script(scripts.Script):
 
     def run(self, p: processing.StableDiffusionProcessing, mode, grid, power, threshold): # pylint: disable=arguments-differ
         if mode is None or mode == 'None':
-            return
+            return None
         # backup pipeline and params
         orig_pipeline = shared.sd_model
         orig_dtype = devices.dtype
@@ -53,7 +53,7 @@ class Script(scripts.Script):
         # create pipeline
         if shared.sd_model_type != 'sd':
             shared.log.error(f'Regional prompting: incorrect base model: {shared.sd_model.__class__.__name__}')
-            return
+            return None
 
         pipeline_utils.DiffusionPipeline.register_modules = hijack_register_modules
         prompt_parser_diffusers.EmbeddingsProvider._encode_token_ids_to_embeddings = prompt_parser_diffusers.orig_encode_token_ids_to_embeddings # pylint: disable=protected-access
@@ -62,7 +62,7 @@ class Script(scripts.Script):
         if shared.sd_model.__class__.__name__ != 'RegionalPromptingStableDiffusionPipeline': # switch failed
             shared.log.error(f'Regional prompting: not a tiling pipeline: {shared.sd_model.__class__.__name__}')
             shared.sd_model = orig_pipeline
-            return
+            return None
         sd_models.set_diffuser_options(shared.sd_model)
         shared.opts.data['prompt_attention'] = 'fixed' # this pipeline is not compatible with embeds
         processing.fix_seed(p)
diff --git a/scripts/resadapter.py b/scripts/resadapter.py
index 58162f9ab..45e2900b0 100644
--- a/scripts/resadapter.py
+++ b/scripts/resadapter.py
@@ -1,7 +1,7 @@
 from safetensors.torch import load_file
 from huggingface_hub import hf_hub_download
 import gradio as gr
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 
 
 repo = 'jiaxiangc/res-adapter'
@@ -17,7 +17,7 @@ models = {
     'SDXL v1 interpolation': 'resadapter_v1_sdxl_interpolation',
 }
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'ResAdapter: Domain Consistent Resolution'
 
diff --git a/scripts/sd_upscale.py b/scripts/sd_upscale.py
index 7ac31b603..3665bcfc5 100644
--- a/scripts/sd_upscale.py
+++ b/scripts/sd_upscale.py
@@ -1,13 +1,12 @@
 import math
 import gradio as gr
 from PIL import Image
-import modules.scripts as scripts
-from modules import processing, shared, images, devices
+from modules import processing, shared, images, devices, scripts_manager
 from modules.processing import Processed
 from modules.shared import opts, state, log
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return "SD Upscale"
 
diff --git a/scripts/skip_layer_guidance.py b/scripts/skip_layer_guidance.py
index 4196db037..e1b2add37 100644
--- a/scripts/skip_layer_guidance.py
+++ b/scripts/skip_layer_guidance.py
@@ -1,12 +1,12 @@
 import sys
 import gradio as gr
-from modules import scripts, processing, shared
+from modules import scripts_manager, processing, shared
 
 
 registered = False
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.register()
diff --git a/scripts/softfill.py b/scripts/softfill.py
index 7b90a845d..821b4386b 100644
--- a/scripts/softfill.py
+++ b/scripts/softfill.py
@@ -1604,10 +1604,10 @@ class StableDiffusionXLSoftFillPipeline(
 
 import gradio as gr
 from installer import install
-from modules import shared, scripts, processing, sd_models
+from modules import shared, scripts_manager, processing, sd_models
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     orig_pipeline = None
 
     def title(self):
diff --git a/scripts/stablevideodiffusion.py b/scripts/stablevideodiffusion.py
index 20b302ff6..1d581eba7 100644
--- a/scripts/stablevideodiffusion.py
+++ b/scripts/stablevideodiffusion.py
@@ -5,7 +5,7 @@ Additional params for StableVideoDiffusion
 import os
 import torch
 import gradio as gr
-from modules import scripts, processing, shared, sd_models, images, modelloader
+from modules import scripts_manager, processing, shared, sd_models, images, modelloader
 
 
 models = {
@@ -14,7 +14,7 @@ models = {
     "SVD XT 1.1": "stabilityai/stable-video-diffusion-img2vid-xt-1-1",
 }
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: Stable Video Diffusion'
 
@@ -62,7 +62,7 @@ class Script(scripts.Script):
         if model_name != model_loaded or c != 'StableVideoDiffusionPipeline':
             shared.opts.sd_model_checkpoint = model_path
             sd_models.reload_model_weights()
-            shared.sd_model = shared.sd_model.to(torch.float32) # TODO svd: runs in fp32 due to dtype mismatch
+            shared.sd_model = shared.sd_model.to(torch.float32) # must run in fp32 due to dtype mismatch
 
         # set params
         if override_resolution:
diff --git a/modules/style_aligned/inversion.py b/scripts/style_aligned/inversion.py
similarity index 100%
rename from modules/style_aligned/inversion.py
rename to scripts/style_aligned/inversion.py
diff --git a/modules/style_aligned/sa_handler.py b/scripts/style_aligned/sa_handler.py
similarity index 100%
rename from modules/style_aligned/sa_handler.py
rename to scripts/style_aligned/sa_handler.py
diff --git a/scripts/style_aligned.py b/scripts/style_aligned_ext.py
similarity index 96%
rename from scripts/style_aligned.py
rename to scripts/style_aligned_ext.py
index 7e236972c..75e586971 100644
--- a/scripts/style_aligned.py
+++ b/scripts/style_aligned_ext.py
@@ -2,7 +2,7 @@ import gradio as gr
 import torch
 import numpy as np
 import diffusers
-from modules import scripts, processing, shared, devices
+from modules import scripts_manager, processing, shared, devices
 
 
 handler = None
@@ -11,7 +11,7 @@ supported_model_list = ['sdxl']
 orig_prompt_attention = None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Style Aligned Image Generation'
 
@@ -27,9 +27,9 @@ class Script(scripts.Script):
     def preset(self, preset):
         if preset == 'text':
             return [['attention', 'adain_queries', 'adain_keys'], 1.0, 0, 0.0]
-        if preset == 'image':
+        elif preset == 'image':
             return [['group_norm', 'layer_norm', 'attention', 'adain_queries', 'adain_keys'], 1.0, 2, 0.0]
-        if preset == 'all':
+        else:
             return [['group_norm', 'layer_norm', 'attention', 'adain_queries', 'adain_keys', 'adain_values', 'full_attention_share'], 1.0, 1, 0.5]
 
     def ui(self, _is_img2img): # ui elements
@@ -64,7 +64,7 @@ class Script(scripts.Script):
             shared.log.warning(f'SA: class={shared.sd_model.__class__.__name__} model={shared.sd_model_type} required={supported_model_list}')
             return None
 
-        from modules.style_aligned import sa_handler, inversion
+        from scripts.style_aligned import sa_handler, inversion
 
         handler = sa_handler.Handler(shared.sd_model)
         sa_args = sa_handler.StyleAlignedArgs(
@@ -108,6 +108,7 @@ class Script(scripts.Script):
             p.task_args['callback_on_step_end'] = inversion_callback
 
         shared.log.info(f'SA: batch={p.batch_size} type={"image" if zts is not None else "text"} config={sa_args.__dict__}')
+        return None
 
     def after(self, p: processing.StableDiffusionProcessing, *args): # pylint: disable=unused-argument
         global handler # pylint: disable=global-statement
diff --git a/scripts/t_gate.py b/scripts/t_gate.py
index 3808a796d..7bce40c59 100644
--- a/scripts/t_gate.py
+++ b/scripts/t_gate.py
@@ -1,9 +1,9 @@
 import gradio as gr
-from modules import scripts, processing, shared, sd_models, devices
+from modules import scripts_manager, processing, shared, sd_models, devices
 from installer import install
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'T-Gate: Accelerate via Gating Attention'
 
diff --git a/scripts/text2video.py b/scripts/text2video.py
index 4a5f71f2e..3a6146280 100644
--- a/scripts/text2video.py
+++ b/scripts/text2video.py
@@ -7,7 +7,7 @@ TODO text2video items:
 """
 
 import gradio as gr
-from modules import scripts, processing, shared, images, sd_models, modelloader
+from modules import scripts_manager, processing, shared, images, sd_models, modelloader
 
 
 MODELS = [
@@ -21,7 +21,7 @@ MODELS = [
 ]
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'Video: ModelScope'
 
@@ -55,7 +55,7 @@ class Script(scripts.Script):
 
     def run(self, p: processing.StableDiffusionProcessing, model_name, use_default, num_frames, video_type, duration, gif_loop, mp4_pad, mp4_interpolate): # pylint: disable=arguments-differ, unused-argument
         if model_name == 'None':
-            return
+            return None
         model = [m for m in MODELS if m['name'] == model_name][0]
         shared.log.debug(f'Text2Video: model={model} defaults={use_default} frames={num_frames}, video={video_type} duration={duration} loop={gif_loop} pad={mp4_pad} interpolate={mp4_interpolate}')
 
@@ -69,7 +69,7 @@ class Script(scripts.Script):
                 sd_models.list_models()
             if checkpoint is None:
                 shared.log.error(f'Text2Video: failed to find model={model["path"]}')
-                return
+                return None
             shared.log.debug(f'Text2Video loading: model={checkpoint}')
             shared.opts.sd_model_checkpoint = checkpoint.name
             sd_models.reload_model_weights(op='model')
@@ -84,7 +84,7 @@ class Script(scripts.Script):
             p.task_args['num_frames'] = num_frames
         else:
             shared.log.error('Text2Video: invalid number of frames')
-            return
+            return None
 
         shared.sd_model = sd_models.set_diffuser_pipe(shared.sd_model, sd_models.DiffusersTaskType.TEXT_2_IMAGE)
         shared.log.debug(f'Text2Video: args={p.task_args}')
diff --git a/scripts/tiling.py b/scripts/tiling.py
index 60c234dcf..8c76119d4 100644
--- a/scripts/tiling.py
+++ b/scripts/tiling.py
@@ -6,7 +6,7 @@ from diffusers.models.lora import LoRACompatibleConv
 from torch import Tensor
 from torch.nn import functional as F
 from torch.nn.modules.utils import _pair
-from modules import scripts, processing, shared
+from modules import scripts_manager, processing, shared
 
 
 modex = 'constant'
@@ -21,7 +21,7 @@ def asymmetricConv2DConvForward(self, input: Tensor, weight: Tensor, bias: Optio
     return F.conv2d(working, weight, bias, self.stride, _pair(0), self.dilation, self.groups)
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def __init__(self):
         super().__init__()
         self.orig_pipe = None
@@ -71,7 +71,7 @@ class Script(scripts.Script):
                 cl._orig_conv_forward = cl._conv_forward # pylint: disable=protected-access
             cl._conv_forward = asymmetricConv2DConvForward.__get__(cl, torch.nn.Conv2d) # pylint: disable=protected-access, no-value-for-parameter
         shared.log.info(f'Tiling: x={tilex}:{numx} y={tiley}:{numy}')
-
+        return None
 
     def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, tilex:bool=False, numx:int=1, tiley:bool=False, numy:int=1): # pylint: disable=arguments-differ, unused-argument
         if len(self.conv_layers) == 0:
diff --git a/modules/xadapter/adapter.py b/scripts/xadapter/adapter.py
similarity index 100%
rename from modules/xadapter/adapter.py
rename to scripts/xadapter/adapter.py
diff --git a/modules/xadapter/pipeline_sd_xl_adapter.py b/scripts/xadapter/pipeline_sd_xl_adapter.py
similarity index 100%
rename from modules/xadapter/pipeline_sd_xl_adapter.py
rename to scripts/xadapter/pipeline_sd_xl_adapter.py
diff --git a/modules/xadapter/pipeline_sd_xl_adapter_controlnet.py b/scripts/xadapter/pipeline_sd_xl_adapter_controlnet.py
similarity index 100%
rename from modules/xadapter/pipeline_sd_xl_adapter_controlnet.py
rename to scripts/xadapter/pipeline_sd_xl_adapter_controlnet.py
diff --git a/modules/xadapter/pipeline_sd_xl_adapter_controlnet_img2img.py b/scripts/xadapter/pipeline_sd_xl_adapter_controlnet_img2img.py
similarity index 100%
rename from modules/xadapter/pipeline_sd_xl_adapter_controlnet_img2img.py
rename to scripts/xadapter/pipeline_sd_xl_adapter_controlnet_img2img.py
diff --git a/modules/xadapter/unet_adapter.py b/scripts/xadapter/unet_adapter.py
similarity index 100%
rename from modules/xadapter/unet_adapter.py
rename to scripts/xadapter/unet_adapter.py
diff --git a/modules/xadapter/utils.py b/scripts/xadapter/utils.py
similarity index 100%
rename from modules/xadapter/utils.py
rename to scripts/xadapter/utils.py
diff --git a/modules/xadapter/xadapter_hijacks.py b/scripts/xadapter/xadapter_hijacks.py
similarity index 100%
rename from modules/xadapter/xadapter_hijacks.py
rename to scripts/xadapter/xadapter_hijacks.py
diff --git a/scripts/x_adapter.py b/scripts/xadapter_ext.py
similarity index 94%
rename from scripts/x_adapter.py
rename to scripts/xadapter_ext.py
index 08874aac9..fdd5dc470 100644
--- a/scripts/x_adapter.py
+++ b/scripts/xadapter_ext.py
@@ -4,13 +4,13 @@ import torch
 import diffusers
 import gradio as gr
 import huggingface_hub as hf
-from modules import errors, shared, devices, scripts, processing, sd_models, sd_samplers
+from modules import errors, shared, devices, scripts_manager, processing, sd_models, sd_samplers
 
 
 adapter = None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     def title(self):
         return 'X-Adapter'
 
@@ -35,11 +35,11 @@ class Script(scripts.Script):
         return model, sampler, width, height, start, scale, lora
 
     def run(self, p: processing.StableDiffusionProcessing, model, sampler, width, height, start, scale, lora): # pylint: disable=arguments-differ, unused-argument
-        from modules.xadapter.xadapter_hijacks import PositionNet
+        from scripts.xadapter.xadapter_hijacks import PositionNet
         diffusers.models.embeddings.PositionNet = PositionNet # patch diffusers==0.26 from diffusers==0.20
-        from modules.xadapter.adapter import Adapter_XL
-        from modules.xadapter.pipeline_sd_xl_adapter import StableDiffusionXLAdapterPipeline
-        from modules.xadapter.unet_adapter import UNet2DConditionModel as UNet2DConditionModelAdapter
+        from scripts.xadapter.adapter import Adapter_XL
+        from scripts.xadapter.pipeline_sd_xl_adapter import StableDiffusionXLAdapterPipeline
+        from scripts.xadapter.unet_adapter import UNet2DConditionModel as UNet2DConditionModelAdapter
 
         global adapter # pylint: disable=global-statement
         if model == 'None':
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index c79ce6909..22938e3d8 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -14,7 +14,7 @@ from scripts.xyz_grid_shared import str_permutations, list_to_csv_string, re_ran
 from scripts.xyz_grid_classes import axis_options, AxisOption, SharedSettingsStackHelper # pylint: disable=no-name-in-module
 from scripts.xyz_grid_draw import draw_xyz_grid # pylint: disable=no-name-in-module
 from scripts.xyz_grid_shared import apply_field, apply_task_args, apply_setting, apply_prompt, apply_order, apply_sampler, apply_hr_sampler_name, confirm_samplers, apply_checkpoint, apply_refiner, apply_unet, apply_dict, apply_clip_skip, apply_vae, list_lora, apply_lora, apply_lora_strength, apply_te, apply_styles, apply_upscaler, apply_context, apply_detailer, apply_override, apply_processing, apply_options, apply_seed, format_value_add_label, format_value, format_value_join_list, do_nothing, format_nothing # pylint: disable=no-name-in-module, unused-import
-from modules import shared, errors, scripts, images, processing
+from modules import shared, errors, scripts_manager, images, processing
 from modules.ui_components import ToolButton
 from modules.ui_sections import create_video_inputs
 import modules.ui_symbols as symbols
@@ -23,7 +23,7 @@ import modules.ui_symbols as symbols
 debug = shared.log.trace if os.environ.get('SD_XYZ_DEBUG', None) is not None else lambda *args, **kwargs: None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     current_axis_options = []
 
     def title(self):
diff --git a/scripts/xyz_grid_classes.py b/scripts/xyz_grid_classes.py
index 289059afb..7f7209605 100644
--- a/scripts/xyz_grid_classes.py
+++ b/scripts/xyz_grid_classes.py
@@ -24,7 +24,7 @@ class AxisOptionTxt2Img(AxisOption):
         self.is_img2img = False
 
 
-class SharedSettingsStackHelper(object):
+class SharedSettingsStackHelper():
     sd_model_checkpoint = None
     sd_model_refiner = None
     sd_model_dict = None
diff --git a/scripts/xyz_grid_on.py b/scripts/xyz_grid_on.py
index 5e070ce8b..c9e2755e2 100644
--- a/scripts/xyz_grid_on.py
+++ b/scripts/xyz_grid_on.py
@@ -13,7 +13,7 @@ import gradio as gr
 from scripts.xyz_grid_shared import str_permutations, list_to_csv_string, re_range # pylint: disable=no-name-in-module
 from scripts.xyz_grid_classes import axis_options, AxisOption, SharedSettingsStackHelper # pylint: disable=no-name-in-module
 from scripts.xyz_grid_draw import draw_xyz_grid # pylint: disable=no-name-in-module
-from modules import shared, errors, scripts, images, processing
+from modules import shared, errors, scripts_manager, images, processing
 from modules.ui_components import ToolButton
 from modules.ui_sections import create_video_inputs
 import modules.ui_symbols as symbols
@@ -24,11 +24,11 @@ xyz_results_cache = None
 debug = shared.log.trace if os.environ.get('SD_XYZ_DEBUG', None) is not None else lambda *args, **kwargs: None
 
 
-class Script(scripts.Script):
+class Script(scripts_manager.Script):
     current_axis_options = []
 
     def show(self, is_img2img):
-        return scripts.AlwaysVisible
+        return scripts_manager.AlwaysVisible
 
     def title(self):
         return "XYZ Grid"
@@ -178,7 +178,7 @@ class Script(scripts.Script):
         global active, xyz_results_cache # pylint: disable=W0603
         xyz_results_cache = None
         if not enabled or active:
-            return
+            return None
         active = True
         if not no_fixed_seeds:
             processing.fix_seed(p)
diff --git a/webui.py b/webui.py
index 6dd8e1c40..69f9a1ade 100644
--- a/webui.py
+++ b/webui.py
@@ -19,7 +19,7 @@ import modules.devices
 import modules.sd_checkpoint
 import modules.sd_samplers
 import modules.lowvram
-import modules.scripts
+import modules.scripts_manager
 import modules.sd_models
 import modules.sd_vae
 import modules.sd_unet
@@ -109,7 +109,7 @@ def initialize():
     timer.startup.record("extensions")
 
     log.info('Load extensions')
-    t_timer, t_total = modules.scripts.load_scripts()
+    t_timer, t_total = modules.scripts_manager.load_scripts()
     timer.startup.record("extensions")
     timer.startup.records["extensions"] = t_total # scripts can reset the time
     log.debug(f'Extensions init time: {t_timer.summary()}')
@@ -352,11 +352,11 @@ def start_ui():
     modules.script_callbacks.app_started_callback(shared.demo, app)
     timer.startup.record("app-started")
 
-    time_sorted = sorted(modules.scripts.time_setup.items(), key=lambda x: x[1], reverse=True)
+    time_sorted = sorted(modules.scripts_manager.time_setup.items(), key=lambda x: x[1], reverse=True)
     time_script = [f'{k}:{round(v,3)}' for (k,v) in time_sorted if v > 0.03]
-    time_total = sum(modules.scripts.time_setup.values())
+    time_total = sum(modules.scripts_manager.time_setup.values())
     shared.log.debug(f'Scripts setup: time={time_total:.3f} {time_script}')
-    time_component = [f'{k}:{round(v,3)}' for (k,v) in modules.scripts.time_component.items() if v > 0.005]
+    time_component = [f'{k}:{round(v,3)}' for (k,v) in modules.scripts_manager.time_component.items() if v > 0.005]
     if len(time_component) > 0:
         shared.log.debug(f'Scripts components: {time_component}')
     return app
@@ -381,10 +381,10 @@ def webui(restart=False):
             shared.log.debug(f'Registered callbacks: {k}={len(v)} {[c.script for c in v]}')
     debug = log.trace if os.environ.get('SD_SCRIPT_DEBUG', None) is not None else lambda *args, **kwargs: None
     debug('Trace: SCRIPTS')
-    for m in modules.scripts.scripts_data:
+    for m in modules.scripts_manager.scripts_data:
         debug(f'  {m}')
     debug('Loaded postprocessing scripts:')
-    for m in modules.scripts.postprocessing_scripts_data:
+    for m in modules.scripts_manager.postprocessing_scripts_data:
         debug(f'  {m}')
     modules.script_callbacks.print_timers()