diff --git a/usegalaxy.org/machine_learning.yml b/usegalaxy.org/classical_ml_and_automl.yml
similarity index 74%
rename from usegalaxy.org/machine_learning.yml
rename to usegalaxy.org/classical_ml_and_automl.yml
index c155574e6..0c7a5f0e0 100644
--- a/usegalaxy.org/machine_learning.yml
+++ b/usegalaxy.org/classical_ml_and_automl.yml
@@ -1,88 +1,66 @@
-tool_panel_section_label: Machine Learning
+tool_panel_section_label: Classical ML and AutoML
 tools:
-- name: multimodal_learner
-  owner: goeckslab
-- name: image_learner
-  owner: goeckslab
 - name: tabular_learner
   owner: goeckslab
 - name: pycaret_compare
   owner: goeckslab
 - name: pycaret_predict
   owner: goeckslab
-- name: model_prediction
+- name: sklearn_sample_generator
   owner: bgruening
-- name: keras_model_config
+- name: sklearn_train_test_split
   owner: bgruening
-- name: keras_model_builder
+- name: sklearn_data_preprocess
   owner: bgruening
-- name: keras_batch_models
+- name: sklearn_to_categorical
   owner: bgruening
-- name: sklearn_stacking_ensemble_models
+- name: scipy_sparse
   owner: bgruening
-- name: sklearn_train_test_eval
+- name: sklearn_feature_selection
   owner: bgruening
-- name: sklearn_estimator_attributes
+- name: sklearn_build_pipeline
   owner: bgruening
-- name: sklearn_model_validation
+- name: sklearn_model_fit
   owner: bgruening
-- name: sklearn_svm_classifier
+- name: sklearn_train_test_eval
   owner: bgruening
-- name: sklearn_sample_generator
+- name: sklearn_model_validation
   owner: bgruening
 - name: sklearn_searchcv
   owner: bgruening
-- name: sklearn_build_pipeline
+- name: sklearn_generalized_linear
   owner: bgruening
-- name: sklearn_pairwise_metrics
+- name: sklearn_svm_classifier
   owner: bgruening
 - name: sklearn_nn_classifier
   owner: bgruening
-- name: sklearn_numeric_clustering
-  owner: bgruening
 - name: sklearn_ensemble
   owner: bgruening
-- name: sklearn_feature_selection
-  owner: bgruening
-- name: sklearn_data_preprocess
+- name: sklearn_stacking_ensemble_models
   owner: bgruening
-- name: sklearn_clf_metrics
+- name: sklearn_lightgbm
   owner: bgruening
-- name: sklearn_regression_metrics
+- name: sklearn_numeric_clustering
   owner: bgruening
 - name: sklearn_discriminant_classifier
   owner: bgruening
-- name: sklearn_generalized_linear
-  owner: bgruening
-- name: sklearn_model_fit
-  owner: bgruening
-- name: sklearn_train_test_split
+- name: model_prediction
   owner: bgruening
 - name: sklearn_fitted_model_eval
   owner: bgruening
-- name: sklearn_to_categorical
-  owner: bgruening
-- name: ml_visualization_ex
+- name: sklearn_clf_metrics
   owner: bgruening
-- name: sklearn_lightgbm
+- name: sklearn_regression_metrics
   owner: bgruening
-- name: sklearn_pca
+- name: sklearn_pairwise_metrics
   owner: bgruening
-- name: keras_train_and_eval
+- name: sklearn_estimator_attributes
   owner: bgruening
-- name: scipy_sparse
+- name: sklearn_pca
   owner: bgruening
-- name: create_tool_recommendation_model
+- name: ml_visualization_ex
   owner: bgruening
 - name: chopin2
   owner: iuc
-- name: flexynesis
-  owner: bgruening
-- name: flexynesis_cbioportal_import
-  owner: bgruening
-- name: flexynesis_infer
-  owner: bgruening
-- name: flexynesis_plot
-  owner: bgruening
-- name: flexynesis_utils
+- name: create_tool_recommendation_model
   owner: bgruening
diff --git a/usegalaxy.org/machine_learning.yml.lock b/usegalaxy.org/classical_ml_and_automl.yml.lock
similarity index 60%
rename from usegalaxy.org/machine_learning.yml.lock
rename to usegalaxy.org/classical_ml_and_automl.yml.lock
index daf0ca66b..569f5f995 100644
--- a/usegalaxy.org/machine_learning.yml.lock
+++ b/usegalaxy.org/classical_ml_and_automl.yml.lock
@@ -1,44 +1,8 @@
 install_repository_dependencies: false
 install_resolver_dependencies: false
 install_tool_dependencies: false
-tool_panel_section_label: Machine Learning
+tool_panel_section_label: Classical ML and AutoML
 tools:
-- name: multimodal_learner
-  owner: goeckslab
-  revisions:
-  - 00ca2dfe9254
-  - 25bb80df7c0c
-  - 31e251cca67d
-  - 3719606b94af
-  - 375c36923da1
-  - 499a039871d0
-  - 871957823d0c
-  - 975512caae22
-  - a48e750cfd25
-  - a5404f55ee6a
-  - a92f200d296e
-  - b905deb2f1b4
-  - dbf05afb8e6c
-  - de753cf07008
-  - ed2fefc8d892
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: image_learner
-  owner: goeckslab
-  revisions:
-  - 13b9963b3e24
-  - 2c6624cae3c5
-  - 328ff3a13078
-  - 8729f69e9207
-  - 94cd9ac4a9b1
-  - bbf30253c99f
-  - c460abae83eb
-  - c5150cceab47
-  - ccbcc012d78d
-  - d17e3a1b8659
-  - d5c582cf74bc
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
 - name: tabular_learner
   owner: goeckslab
   revisions:
@@ -61,16 +25,16 @@ tools:
   - edd515746388
   - f38427fed1f9
   - f6a65e05d6ec
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: pycaret_compare
   owner: goeckslab
   revisions:
   - 009b18a75dc3
   - 02f7746e7772
   - 4aa511539199
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: pycaret_predict
   owner: goeckslab
   revisions:
@@ -94,93 +58,148 @@ tools:
   - f2877a8b54e4
   - f4cb41f458fd
   - f5b713d70f1a
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: model_prediction
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_sample_generator
   owner: bgruening
   revisions:
-  - 1e088aa741eb
-  - 25b46af53232
-  - 29e4122c90de
-  - 475b5171945f
-  - 60c726f5cc5e
-  - 65820fb7257b
-  - 83228baae3c5
-  - 948eca2af157
-  - 980bf31faa05
-  - 9991c4ddde14
-  - b237f27a8afc
-  - b6c2289292fa
-  - ce00f1cccb03
-  - eae46976fbb8
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: keras_model_config
+  - 04b160a26690
+  - 0f460421b212
+  - 1fe020b2108f
+  - 6cf2a66c46f1
+  - 7068b5fcd623
+  - 7c2e71e4acf3
+  - 86c5b627ddb6
+  - ab2c393080f9
+  - ab9977548806
+  - b4ba9602a36e
+  - db7eb7302fc9
+  - e99cccc3ca13
+  - eb41d87cb1de
+  - fed1850f01c3
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_train_test_split
   owner: bgruening
   revisions:
-  - 00b2ee48b412
-  - 00d1889e9ecc
-  - 01131463df86
-  - 0c933465d70e
-  - 2a853a2d2e72
-  - 2b8d85927742
-  - 2d8478144bb2
-  - 4d81e3e2fb63
-  - 61a6132df9e0
-  - 8a794e6d3388
-  - 94d91334c787
-  - b9906ce4756c
-  - bedbda03c573
-  - f22a9297440f
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: keras_model_builder
+  - 03611d7232f6
+  - 0985b0dd6f1a
+  - 145208b3579d
+  - 3312fb686ffb
+  - 33c564caa3c4
+  - 6e25381dad5c
+  - a2e3cf2f9f40
+  - adc5e53d4297
+  - b6f5443c4f58
+  - ce2fd1edbc6e
+  - e10ffa9e0b90
+  - e8639f65c883
+  - fc0f9ba14aaa
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_data_preprocess
   owner: bgruening
   revisions:
-  - 053570bac5ea
-  - 1f0c955fabc7
-  - 20cd4269deb2
-  - 522137aaa9c4
-  - 5b35833076f0
-  - 66d7efc06000
-  - 772e0e89fc68
-  - 9b6faa256f15
-  - beeeda757eba
-  - c51571d0a0b1
-  - e4af79bffd57
-  - f7ecdde4b201
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: keras_batch_models
+  - 045faa05e712
+  - 0ff864fabfe9
+  - 1b5cd2d16fb1
+  - 1bef885255e0
+  - 50b3e080cef0
+  - 6c030fe29722
+  - 761269451e98
+  - 80074b842ebd
+  - 826c3e68e7a9
+  - a5c2ce4ea328
+  - add3c3a7c2b4
+  - eb9da067ab26
+  - f2234165a453
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_to_categorical
   owner: bgruening
   revisions:
-  - 03533fa14e77
-  - 0dc3027df8f4
-  - 1252578525d1
-  - 305c1229ac99
-  - 3814a92c1416
-  - 3b8fa4ea9727
-  - 4a5266c96889
-  - 508ce0649bec
-  - 61b2d8f8811e
-  - 679e4ede1191
-  - 77c04469e8b8
-  - 7f6079deac6f
-  - 9d77b259ef27
-  - a98b60c639af
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_stacking_ensemble_models
+  - 14180f9c831e
+  - 2d53571c2f00
+  - 612ca26c197d
+  - 61634a87efc7
+  - 6b59e9b96071
+  - 89f11e2b0673
+  - a4f18bbb4eca
+  - caeb57858702
+  - f86c0419af43
+  - f93f0cdbaf18
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: scipy_sparse
   owner: bgruening
   revisions:
-  - 253b3aaf0d91
-  - ae4b593c99f8
-  - b78007bf1cb8
-  - b8378d4791b7
-  - b94babda32e4
-  - d25127d5f4e0
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 233aab4c1be8
+  - 29200ecec39d
+  - 42b513bed40b
+  - 4efac966af2a
+  - 6d1a9fae57eb
+  - 92e09b827300
+  - 9f9cf31e3111
+  - b7e93c1deb3f
+  - e6893a4bcb7b
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_feature_selection
+  owner: bgruening
+  revisions:
+  - 07b34d5284f6
+  - 4483b84310ec
+  - 5276bdb49315
+  - 5773e98921fc
+  - 5bcf779d901f
+  - 6d21b03e00a1
+  - 74adae8d7b0f
+  - 96bb4c49e30e
+  - 9e0e31bd8392
+  - a7c667ff83fe
+  - ae0fafb53c1d
+  - c2cd3219543a
+  - d84b3a229a52
+  - fcadeadd51ae
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_build_pipeline
+  owner: bgruening
+  revisions:
+  - 0c74d3164ac8
+  - 118e230e85ce
+  - 1ed23c988ff6
+  - 3f25f37ee3db
+  - 43a859a0fab5
+  - 4c4ec859c31a
+  - 7388ffedf12c
+  - 7442b94d6a1e
+  - 840f29aad145
+  - 9160cb4069c2
+  - 97dce66fe158
+  - 9c3e1d3235c8
+  - b1eda492f063
+  - bc0117538945
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_model_fit
+  owner: bgruening
+  revisions:
+  - 17999807dc1b
+  - 1c25f305db70
+  - 4cea939d7b31
+  - 734c66aa945a
+  - 8e447b95e6a8
+  - 9084156b2bb5
+  - a293d7937700
+  - adb084b901cc
+  - f0ede473a7e8
+  - fb17e19b62a4
+  - fc2e64a27e90
+  - fc70bf5c3b58
+  - fe4e36598917
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_train_test_eval
   owner: bgruening
   revisions:
@@ -198,27 +217,8 @@ tools:
   - e03a58b31c12
   - e23cfe4be9d4
   - f6ea9fc38223
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_estimator_attributes
-  owner: bgruening
-  revisions:
-  - 07843f917990
-  - 0a43c856e1d8
-  - 30d21a6041f6
-  - 3881482e568e
-  - 5a125d1ac9b9
-  - 5ae00d2908f2
-  - 867caa39eaa4
-  - 89deaf399ff7
-  - 9fda0b82f419
-  - adaf2457d6ec
-  - bd27a211182a
-  - c9ddd20d25d0
-  - d0352e8b4c10
-  - e19359b23e54
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_model_validation
   owner: bgruening
   revisions:
@@ -235,45 +235,8 @@ tools:
   - bacc38e0a29e
   - bfc7bdfcb423
   - e06ab1e112cc
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_svm_classifier
-  owner: bgruening
-  revisions:
-  - 02d2be90dedb
-  - 0630258dcf35
-  - 14fa42b095c4
-  - 61461e52c923
-  - 6d23883e0b94
-  - 73d2ef652879
-  - 80852884053f
-  - b7c3e9a3b954
-  - d2afc87db26b
-  - de94341feadb
-  - f458724cc317
-  - f9639b488779
-  - fa9d6a4d95ad
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_sample_generator
-  owner: bgruening
-  revisions:
-  - 04b160a26690
-  - 0f460421b212
-  - 1fe020b2108f
-  - 6cf2a66c46f1
-  - 7068b5fcd623
-  - 7c2e71e4acf3
-  - 86c5b627ddb6
-  - ab2c393080f9
-  - ab9977548806
-  - b4ba9602a36e
-  - db7eb7302fc9
-  - e99cccc3ca13
-  - eb41d87cb1de
-  - fed1850f01c3
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_searchcv
   owner: bgruening
   revisions:
@@ -291,45 +254,45 @@ tools:
   - e5a5ad882f1f
   - f0d2e8a3c575
   - f484f41ea0dd
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_build_pipeline
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_generalized_linear
   owner: bgruening
   revisions:
-  - 0c74d3164ac8
-  - 118e230e85ce
-  - 1ed23c988ff6
-  - 3f25f37ee3db
-  - 43a859a0fab5
-  - 4c4ec859c31a
-  - 7388ffedf12c
-  - 7442b94d6a1e
-  - 840f29aad145
-  - 9160cb4069c2
-  - 97dce66fe158
-  - 9c3e1d3235c8
-  - b1eda492f063
-  - bc0117538945
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_pairwise_metrics
+  - 14f0ccc85505
+  - 3e4a7684d402
+  - 40f4447733b2
+  - 57938c2f6ef5
+  - 63417d0acc72
+  - 913bf1c4c7bb
+  - 91c4e3331208
+  - 927586a18553
+  - a3495337ab56
+  - c648d0716fb0
+  - c9969328b42f
+  - d3fe6fcc6bf4
+  - d4808d5b83da
+  - dc4b5fd604a6
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_svm_classifier
   owner: bgruening
   revisions:
-  - 053e7f32d37e
-  - 09bfbef3dd90
-  - 1682b64aad9e
-  - 226524df8c6c
-  - 2a1afd3481ce
-  - 5bd0866dbc7a
-  - 7366e5108e9f
-  - 7614281473da
-  - b07416ec8d16
-  - c84ab9ca4e5c
-  - df87a7702f97
-  - e79200975daf
-  - f24deab884d0
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 02d2be90dedb
+  - 0630258dcf35
+  - 14fa42b095c4
+  - 61461e52c923
+  - 6d23883e0b94
+  - 73d2ef652879
+  - 80852884053f
+  - b7c3e9a3b954
+  - d2afc87db26b
+  - de94341feadb
+  - f458724cc317
+  - f9639b488779
+  - fa9d6a4d95ad
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_nn_classifier
   owner: bgruening
   revisions:
@@ -347,27 +310,9 @@ tools:
   - aa83e7e3c398
   - cd02bf168d23
   - d33d37f32e54
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_numeric_clustering
-  owner: bgruening
-  revisions:
-  - 1bdac8249aa1
-  - 1dd433d2c92c
-  - 2d7c60aa6c62
-  - 73e7f1c76ece
-  - 7dd3fb35904f
-  - 86d4c2b66e16
-  - 8eed73e8e04d
-  - 981a0328d6bb
-  - ad7e0b4291ee
-  - aeca97d9a214
-  - bb9fc9d46ea4
-  - e10e776f2109
-  - e13a7c05b3a4
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_ensemble
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_ensemble
   owner: bgruening
   revisions:
   - 00f01f713c3c
@@ -384,83 +329,52 @@ tools:
   - cab63604ca1d
   - d868914bce73
   - f3dfa4bdf87e
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_feature_selection
-  owner: bgruening
-  revisions:
-  - 07b34d5284f6
-  - 4483b84310ec
-  - 5276bdb49315
-  - 5773e98921fc
-  - 5bcf779d901f
-  - 6d21b03e00a1
-  - 74adae8d7b0f
-  - 96bb4c49e30e
-  - 9e0e31bd8392
-  - a7c667ff83fe
-  - ae0fafb53c1d
-  - c2cd3219543a
-  - d84b3a229a52
-  - fcadeadd51ae
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_data_preprocess
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_stacking_ensemble_models
   owner: bgruening
   revisions:
-  - 045faa05e712
-  - 0ff864fabfe9
-  - 1b5cd2d16fb1
-  - 1bef885255e0
-  - 50b3e080cef0
-  - 6c030fe29722
-  - 761269451e98
-  - 80074b842ebd
-  - 826c3e68e7a9
-  - a5c2ce4ea328
-  - add3c3a7c2b4
-  - eb9da067ab26
-  - f2234165a453
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_clf_metrics
+  - 253b3aaf0d91
+  - ae4b593c99f8
+  - b78007bf1cb8
+  - b8378d4791b7
+  - b94babda32e4
+  - d25127d5f4e0
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_lightgbm
   owner: bgruening
   revisions:
-  - 048d7bd59326
-  - 0ee984c1cbd6
-  - 15bcf1a7543b
-  - 55703205546f
-  - 6ffedbe712c0
-  - 80ca74b1cb36
-  - a0061a087409
-  - adc6137e7c73
-  - ae69f6918abe
-  - c8547d3993c0
-  - daaa56720686
-  - e54382561bd4
-  - e56721f44020
-  - e9821a426d75
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_regression_metrics
+  - 16c442ecd6bf
+  - 1b7ab45c7858
+  - 27f8bd20a936
+  - 3045d322d4ac
+  - 74f96ebc5554
+  - 8e95b68b178b
+  - b7d104ede67e
+  - c48ffc96fe79
+  - d562708bb095
+  - f04f39a6825d
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_numeric_clustering
   owner: bgruening
   revisions:
-  - 146133e04fbc
-  - 1e98dbb8d5bc
-  - 4e6ada84d334
-  - 5c9fb40ae174
-  - 6000c1589f33
-  - 627be0156505
-  - 6db5c1dfb076
-  - 70c5a9127f99
-  - 7d98dfb04d27
-  - 8ced2fac52f4
-  - c78a5fc9e758
-  - dc17e2878dc1
-  - f04a2405f3fe
-  - f5dcb87fd14e
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 1bdac8249aa1
+  - 1dd433d2c92c
+  - 2d7c60aa6c62
+  - 73e7f1c76ece
+  - 7dd3fb35904f
+  - 86d4c2b66e16
+  - 8eed73e8e04d
+  - 981a0328d6bb
+  - ad7e0b4291ee
+  - aeca97d9a214
+  - bb9fc9d46ea4
+  - e10e776f2109
+  - e13a7c05b3a4
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_discriminant_classifier
   owner: bgruening
   revisions:
@@ -478,63 +392,27 @@ tools:
   - dea38330b78a
   - e76f6dfea5c9
   - fc48ce12454b
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_generalized_linear
-  owner: bgruening
-  revisions:
-  - 14f0ccc85505
-  - 3e4a7684d402
-  - 40f4447733b2
-  - 57938c2f6ef5
-  - 63417d0acc72
-  - 913bf1c4c7bb
-  - 91c4e3331208
-  - 927586a18553
-  - a3495337ab56
-  - c648d0716fb0
-  - c9969328b42f
-  - d3fe6fcc6bf4
-  - d4808d5b83da
-  - dc4b5fd604a6
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_model_fit
-  owner: bgruening
-  revisions:
-  - 17999807dc1b
-  - 1c25f305db70
-  - 4cea939d7b31
-  - 734c66aa945a
-  - 8e447b95e6a8
-  - 9084156b2bb5
-  - a293d7937700
-  - adb084b901cc
-  - f0ede473a7e8
-  - fb17e19b62a4
-  - fc2e64a27e90
-  - fc70bf5c3b58
-  - fe4e36598917
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_train_test_split
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: model_prediction
   owner: bgruening
   revisions:
-  - 03611d7232f6
-  - 0985b0dd6f1a
-  - 145208b3579d
-  - 3312fb686ffb
-  - 33c564caa3c4
-  - 6e25381dad5c
-  - a2e3cf2f9f40
-  - adc5e53d4297
-  - b6f5443c4f58
-  - ce2fd1edbc6e
-  - e10ffa9e0b90
-  - e8639f65c883
-  - fc0f9ba14aaa
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 1e088aa741eb
+  - 25b46af53232
+  - 29e4122c90de
+  - 475b5171945f
+  - 60c726f5cc5e
+  - 65820fb7257b
+  - 83228baae3c5
+  - 948eca2af157
+  - 980bf31faa05
+  - 9991c4ddde14
+  - b237f27a8afc
+  - b6c2289292fa
+  - ce00f1cccb03
+  - eae46976fbb8
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_fitted_model_eval
   owner: bgruening
   revisions:
@@ -551,55 +429,83 @@ tools:
   - eaddff553324
   - f5e6fb49e9ee
   - f73a2b68a37b
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_to_categorical
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_clf_metrics
   owner: bgruening
   revisions:
-  - 14180f9c831e
-  - 2d53571c2f00
-  - 612ca26c197d
-  - 61634a87efc7
-  - 6b59e9b96071
-  - 89f11e2b0673
-  - a4f18bbb4eca
-  - caeb57858702
-  - f86c0419af43
-  - f93f0cdbaf18
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ml_visualization_ex
+  - 048d7bd59326
+  - 0ee984c1cbd6
+  - 15bcf1a7543b
+  - 55703205546f
+  - 6ffedbe712c0
+  - 80ca74b1cb36
+  - a0061a087409
+  - adc6137e7c73
+  - ae69f6918abe
+  - c8547d3993c0
+  - daaa56720686
+  - e54382561bd4
+  - e56721f44020
+  - e9821a426d75
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_regression_metrics
   owner: bgruening
   revisions:
-  - 05143043ca13
-  - 1588f9076e32
-  - 21730620a849
-  - 222c02df5d55
-  - 4a229a7ad638
-  - 5f9c0e99016f
-  - 6fabdcde0214
-  - 8334dc98c48e
-  - a536d2736c2d
-  - c7655b5a94af
-  - c80db5d6fd8c
-  - e88c782a127d
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: sklearn_lightgbm
+  - 146133e04fbc
+  - 1e98dbb8d5bc
+  - 4e6ada84d334
+  - 5c9fb40ae174
+  - 6000c1589f33
+  - 627be0156505
+  - 6db5c1dfb076
+  - 70c5a9127f99
+  - 7d98dfb04d27
+  - 8ced2fac52f4
+  - c78a5fc9e758
+  - dc17e2878dc1
+  - f04a2405f3fe
+  - f5dcb87fd14e
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_pairwise_metrics
   owner: bgruening
   revisions:
-  - 16c442ecd6bf
-  - 1b7ab45c7858
-  - 27f8bd20a936
-  - 3045d322d4ac
-  - 74f96ebc5554
-  - 8e95b68b178b
-  - b7d104ede67e
-  - c48ffc96fe79
-  - d562708bb095
-  - f04f39a6825d
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 053e7f32d37e
+  - 09bfbef3dd90
+  - 1682b64aad9e
+  - 226524df8c6c
+  - 2a1afd3481ce
+  - 5bd0866dbc7a
+  - 7366e5108e9f
+  - 7614281473da
+  - b07416ec8d16
+  - c84ab9ca4e5c
+  - df87a7702f97
+  - e79200975daf
+  - f24deab884d0
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: sklearn_estimator_attributes
+  owner: bgruening
+  revisions:
+  - 07843f917990
+  - 0a43c856e1d8
+  - 30d21a6041f6
+  - 3881482e568e
+  - 5a125d1ac9b9
+  - 5ae00d2908f2
+  - 867caa39eaa4
+  - 89deaf399ff7
+  - 9fda0b82f419
+  - adaf2457d6ec
+  - bd27a211182a
+  - c9ddd20d25d0
+  - d0352e8b4c10
+  - e19359b23e54
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: sklearn_pca
   owner: bgruening
   revisions:
@@ -612,80 +518,38 @@ tools:
   - caf164dd0e18
   - f06ad033c114
   - fbf485fc2d30
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: keras_train_and_eval
-  owner: bgruening
-  revisions:
-  - 0af678661e20
-  - 2af1346e68c9
-  - 470aed90aa41
-  - 6ecb3d77d46e
-  - 818f9b69d8a0
-  - aeee74692508
-  - e1317b5502fa
-  - e29894cdea47
-  - ead8f1822587
-  - f1b9a42d6809
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: scipy_sparse
-  owner: bgruening
-  revisions:
-  - 233aab4c1be8
-  - 29200ecec39d
-  - 42b513bed40b
-  - 4efac966af2a
-  - 6d1a9fae57eb
-  - 92e09b827300
-  - 9f9cf31e3111
-  - b7e93c1deb3f
-  - e6893a4bcb7b
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: create_tool_recommendation_model
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: ml_visualization_ex
   owner: bgruening
   revisions:
-  - 4f7e6612906b
-  - afec8c595124
-  - e94dc7945639
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 05143043ca13
+  - 1588f9076e32
+  - 21730620a849
+  - 222c02df5d55
+  - 4a229a7ad638
+  - 5f9c0e99016f
+  - 6fabdcde0214
+  - 8334dc98c48e
+  - a536d2736c2d
+  - c7655b5a94af
+  - c80db5d6fd8c
+  - e88c782a127d
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
 - name: chopin2
   owner: iuc
   revisions:
   - 693bfd012601
   - d49893faf877
   - ee6c2152e092
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: flexynesis
-  owner: bgruening
-  revisions:
-  - d1dc88960179
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: flexynesis_cbioportal_import
-  owner: bgruening
-  revisions:
-  - e6c626b3013b
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: flexynesis_infer
-  owner: bgruening
-  revisions:
-  - 7a1bae3c974a
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: flexynesis_plot
-  owner: bgruening
-  revisions:
-  - 5f69690716cb
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: flexynesis_utils
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
+- name: create_tool_recommendation_model
   owner: bgruening
   revisions:
-  - 0e86b191f856
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
+  - 4f7e6612906b
+  - afec8c595124
+  - e94dc7945639
+  tool_panel_section_id: classical_ml_and_automl
+  tool_panel_section_label: Classical ML and AutoML
diff --git a/usegalaxy.org/deep_learning.yml b/usegalaxy.org/deep_learning.yml
new file mode 100644
index 000000000..6b3f48e47
--- /dev/null
+++ b/usegalaxy.org/deep_learning.yml
@@ -0,0 +1,30 @@
+tool_panel_section_label: Deep Learning
+tools:
+- name: image_learner
+  owner: goeckslab
+- name: multimodal_learner
+  owner: goeckslab
+- name: ludwig_train
+  owner: goeckslab
+- name: ludwig_hyperopt
+  owner: goeckslab
+- name: ludwig_visualize
+  owner: goeckslab
+- name: ludwig_predict
+  owner: goeckslab
+- name: ludwig_experiment
+  owner: goeckslab
+- name: ludwig_render_config
+  owner: goeckslab
+- name: ludwig_evaluate
+  owner: goeckslab
+- name: ludwig_config_generator
+  owner: goeckslab
+- name: keras_model_config
+  owner: bgruening
+- name: keras_model_builder
+  owner: bgruening
+- name: keras_train_and_eval
+  owner: bgruening
+- name: keras_batch_models
+  owner: bgruening
diff --git a/usegalaxy.org/deep_learning.yml.lock b/usegalaxy.org/deep_learning.yml.lock
new file mode 100644
index 000000000..7093e160a
--- /dev/null
+++ b/usegalaxy.org/deep_learning.yml.lock
@@ -0,0 +1,206 @@
+install_repository_dependencies: false
+install_resolver_dependencies: false
+install_tool_dependencies: false
+tool_panel_section_label: Deep Learning
+tools:
+- name: image_learner
+  owner: goeckslab
+  revisions:
+  - 13b9963b3e24
+  - 2c6624cae3c5
+  - 328ff3a13078
+  - 8729f69e9207
+  - 94cd9ac4a9b1
+  - bbf30253c99f
+  - c460abae83eb
+  - c5150cceab47
+  - ccbcc012d78d
+  - d17e3a1b8659
+  - d5c582cf74bc
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: multimodal_learner
+  owner: goeckslab
+  revisions:
+  - 00ca2dfe9254
+  - 25bb80df7c0c
+  - 31e251cca67d
+  - 3719606b94af
+  - 375c36923da1
+  - 499a039871d0
+  - 871957823d0c
+  - 975512caae22
+  - a48e750cfd25
+  - a5404f55ee6a
+  - a92f200d296e
+  - b905deb2f1b4
+  - dbf05afb8e6c
+  - de753cf07008
+  - ed2fefc8d892
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_train
+  owner: goeckslab
+  revisions:
+  - 26fed0deef67
+  - 3f587f0e5a6d
+  - 4d12452c5361
+  - 650639a4a75f
+  - 9abf329ff045
+  - ad2cceec6268
+  - d5a7ca6bc640
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_hyperopt
+  owner: goeckslab
+  revisions:
+  - 12cd5a6fc2ba
+  - 271ecb35891e
+  - 4a63b50a8634
+  - a1b91224afb9
+  - b486ca953371
+  - d76cac7bae15
+  - fed9b5eaa829
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_visualize
+  owner: goeckslab
+  revisions:
+  - 197c8cc761aa
+  - 488d878c1c1f
+  - a930e68bdffe
+  - b6953aa083ed
+  - b81fe4d92236
+  - d93e52cf97c7
+  - ef7124ab6b02
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_predict
+  owner: goeckslab
+  revisions:
+  - 11b1f328f312
+  - afb22d7a0757
+  - afc8ed4a1838
+  - b0627acfa4f4
+  - cda3d431d237
+  - d6606c4d0d9a
+  - f13455263ac8
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_experiment
+  owner: goeckslab
+  revisions:
+  - 0ee0bc6736a2
+  - 124eb5e5c5fc
+  - 44267c11e02b
+  - 4d0d8859a0f2
+  - 5a39f429fad1
+  - 78b1e3921576
+  - e1c7d044b759
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_render_config
+  owner: goeckslab
+  revisions:
+  - 56c4f4c0c6df
+  - 65c50cd5aa13
+  - 7447ba518af1
+  - 93ebd9b0f159
+  - d5d69c29d537
+  - dd663701df49
+  - e3c63770083d
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_evaluate
+  owner: goeckslab
+  revisions:
+  - 29ee176f839b
+  - 777be50bc321
+  - 7cb9e77d9909
+  - b58d8857082c
+  - cbea2960cca2
+  - e55790a3e8a7
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: ludwig_config_generator
+  owner: goeckslab
+  revisions:
+  - 11d3377511bb
+  - 36c5fcc49286
+  - 4bcd6c3a025e
+  - 779d91d78ecf
+  - b7ed0e483e4d
+  - bf21ab331fe6
+  - ec4b9244f930
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: keras_model_config
+  owner: bgruening
+  revisions:
+  - 00b2ee48b412
+  - 00d1889e9ecc
+  - 01131463df86
+  - 0c933465d70e
+  - 2a853a2d2e72
+  - 2b8d85927742
+  - 2d8478144bb2
+  - 4d81e3e2fb63
+  - 61a6132df9e0
+  - 8a794e6d3388
+  - 94d91334c787
+  - b9906ce4756c
+  - bedbda03c573
+  - f22a9297440f
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: keras_model_builder
+  owner: bgruening
+  revisions:
+  - 053570bac5ea
+  - 1f0c955fabc7
+  - 20cd4269deb2
+  - 522137aaa9c4
+  - 5b35833076f0
+  - 66d7efc06000
+  - 772e0e89fc68
+  - 9b6faa256f15
+  - beeeda757eba
+  - c51571d0a0b1
+  - e4af79bffd57
+  - f7ecdde4b201
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: keras_train_and_eval
+  owner: bgruening
+  revisions:
+  - 0af678661e20
+  - 2af1346e68c9
+  - 470aed90aa41
+  - 6ecb3d77d46e
+  - 818f9b69d8a0
+  - aeee74692508
+  - e1317b5502fa
+  - e29894cdea47
+  - ead8f1822587
+  - f1b9a42d6809
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
+- name: keras_batch_models
+  owner: bgruening
+  revisions:
+  - 03533fa14e77
+  - 0dc3027df8f4
+  - 1252578525d1
+  - 305c1229ac99
+  - 3814a92c1416
+  - 3b8fa4ea9727
+  - 4a5266c96889
+  - 508ce0649bec
+  - 61b2d8f8811e
+  - 679e4ede1191
+  - 77c04469e8b8
+  - 7f6079deac6f
+  - 9d77b259ef27
+  - a98b60c639af
+  tool_panel_section_id: deep_learning
+  tool_panel_section_label: Deep Learning
diff --git a/usegalaxy.org/ludwig_applications.yml b/usegalaxy.org/ludwig_applications.yml
deleted file mode 100644
index 10a9257d1..000000000
--- a/usegalaxy.org/ludwig_applications.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-tool_panel_section_label: Machine Learning
-tools:
-  - name: ludwig_train
-    owner: goeckslab
-  - name: ludwig_hyperopt
-    owner: goeckslab
-  - name: ludwig_visualize
-    owner: goeckslab
-  - name: ludwig_predict
-    owner: goeckslab
-  - name: ludwig_experiment
-    owner: goeckslab
-  - name: ludwig_render_config
-    owner: goeckslab
-  - name: ludwig_evaluate
-    owner: goeckslab
-  - name: ludwig_config_generator
-    owner: goeckslab
diff --git a/usegalaxy.org/ludwig_applications.yml.lock b/usegalaxy.org/ludwig_applications.yml.lock
deleted file mode 100644
index 269b324fd..000000000
--- a/usegalaxy.org/ludwig_applications.yml.lock
+++ /dev/null
@@ -1,100 +0,0 @@
-install_repository_dependencies: false
-install_resolver_dependencies: false
-install_tool_dependencies: false
-tool_panel_section_label: Machine Learning
-tools:
-- name: ludwig_train
-  owner: goeckslab
-  revisions:
-  - 26fed0deef67
-  - 3f587f0e5a6d
-  - 4d12452c5361
-  - 650639a4a75f
-  - 9abf329ff045
-  - ad2cceec6268
-  - d5a7ca6bc640
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_hyperopt
-  owner: goeckslab
-  revisions:
-  - 12cd5a6fc2ba
-  - 271ecb35891e
-  - 4a63b50a8634
-  - a1b91224afb9
-  - b486ca953371
-  - d76cac7bae15
-  - fed9b5eaa829
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_visualize
-  owner: goeckslab
-  revisions:
-  - 197c8cc761aa
-  - 488d878c1c1f
-  - a930e68bdffe
-  - b6953aa083ed
-  - b81fe4d92236
-  - d93e52cf97c7
-  - ef7124ab6b02
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_predict
-  owner: goeckslab
-  revisions:
-  - 11b1f328f312
-  - afb22d7a0757
-  - afc8ed4a1838
-  - b0627acfa4f4
-  - cda3d431d237
-  - d6606c4d0d9a
-  - f13455263ac8
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_experiment
-  owner: goeckslab
-  revisions:
-  - 0ee0bc6736a2
-  - 124eb5e5c5fc
-  - 44267c11e02b
-  - 4d0d8859a0f2
-  - 5a39f429fad1
-  - 78b1e3921576
-  - e1c7d044b759
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_render_config
-  owner: goeckslab
-  revisions:
-  - 56c4f4c0c6df
-  - 65c50cd5aa13
-  - 7447ba518af1
-  - 93ebd9b0f159
-  - d5d69c29d537
-  - dd663701df49
-  - e3c63770083d
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_evaluate
-  owner: goeckslab
-  revisions:
-  - 29ee176f839b
-  - 777be50bc321
-  - 7cb9e77d9909
-  - b58d8857082c
-  - cbea2960cca2
-  - e55790a3e8a7
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
-- name: ludwig_config_generator
-  owner: goeckslab
-  revisions:
-  - 11d3377511bb
-  - 36c5fcc49286
-  - 4bcd6c3a025e
-  - 779d91d78ecf
-  - b7ed0e483e4d
-  - bf21ab331fe6
-  - ec4b9244f930
-  tool_panel_section_id: machine_learning
-  tool_panel_section_label: Machine Learning
diff --git a/usegalaxy.org/multi_omics_ml.yml b/usegalaxy.org/multi_omics_ml.yml
new file mode 100644
index 000000000..fb5ce5c51
--- /dev/null
+++ b/usegalaxy.org/multi_omics_ml.yml
@@ -0,0 +1,12 @@
+tool_panel_section_label: Multi-omics ML
+tools:
+- name: flexynesis_cbioportal_import
+  owner: bgruening
+- name: flexynesis
+  owner: bgruening
+- name: flexynesis_infer
+  owner: bgruening
+- name: flexynesis_plot
+  owner: bgruening
+- name: flexynesis_utils
+  owner: bgruening
diff --git a/usegalaxy.org/multi_omics_ml.yml.lock b/usegalaxy.org/multi_omics_ml.yml.lock
new file mode 100644
index 000000000..886509c40
--- /dev/null
+++ b/usegalaxy.org/multi_omics_ml.yml.lock
@@ -0,0 +1,35 @@
+install_repository_dependencies: false
+install_resolver_dependencies: false
+install_tool_dependencies: false
+tool_panel_section_label: Multi-omics ML
+tools:
+- name: flexynesis_cbioportal_import
+  owner: bgruening
+  revisions:
+  - e6c626b3013b
+  tool_panel_section_id: multi_omics_ml
+  tool_panel_section_label: Multi-omics ML
+- name: flexynesis
+  owner: bgruening
+  revisions:
+  - d1dc88960179
+  tool_panel_section_id: multi_omics_ml
+  tool_panel_section_label: Multi-omics ML
+- name: flexynesis_infer
+  owner: bgruening
+  revisions:
+  - 7a1bae3c974a
+  tool_panel_section_id: multi_omics_ml
+  tool_panel_section_label: Multi-omics ML
+- name: flexynesis_plot
+  owner: bgruening
+  revisions:
+  - 5f69690716cb
+  tool_panel_section_id: multi_omics_ml
+  tool_panel_section_label: Multi-omics ML
+- name: flexynesis_utils
+  owner: bgruening
+  revisions:
+  - 0e86b191f856
+  tool_panel_section_id: multi_omics_ml
+  tool_panel_section_label: Multi-omics ML