diff --git a/mypy.ini b/mypy.ini
index a576a8267..7985b2068 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -1,5 +1,2 @@
 [mypy-ruamel.*]
 ignore_errors = True
-
-[mypy-schema_salad.*]
-ignore_errors = True
\ No newline at end of file
diff --git a/typeshed/2.7/galaxy/__init__.pyi b/typeshed/2and3/galaxy/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/__init__.pyi
rename to typeshed/2and3/galaxy/__init__.pyi
diff --git a/typeshed/2.7/galaxy/exceptions/__init__.pyi b/typeshed/2and3/galaxy/exceptions/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/exceptions/__init__.pyi
rename to typeshed/2and3/galaxy/exceptions/__init__.pyi
diff --git a/typeshed/2.7/galaxy/exceptions/error_codes.pyi b/typeshed/2and3/galaxy/exceptions/error_codes.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/exceptions/error_codes.pyi
rename to typeshed/2and3/galaxy/exceptions/error_codes.pyi
diff --git a/typeshed/2.7/galaxy/jobs/__init__.pyi b/typeshed/2and3/galaxy/jobs/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/__init__.pyi
rename to typeshed/2and3/galaxy/jobs/__init__.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/__init__.pyi b/typeshed/2and3/galaxy/jobs/metrics/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/__init__.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/__init__.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/collectl/__init__.pyi b/typeshed/2and3/galaxy/jobs/metrics/collectl/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/collectl/__init__.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/collectl/__init__.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/collectl/cli.pyi b/typeshed/2and3/galaxy/jobs/metrics/collectl/cli.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/collectl/cli.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/collectl/cli.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/collectl/processes.pyi b/typeshed/2and3/galaxy/jobs/metrics/collectl/processes.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/collectl/processes.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/collectl/processes.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/collectl/stats.pyi b/typeshed/2and3/galaxy/jobs/metrics/collectl/stats.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/collectl/stats.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/collectl/stats.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/collectl/subsystems.pyi b/typeshed/2and3/galaxy/jobs/metrics/collectl/subsystems.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/collectl/subsystems.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/collectl/subsystems.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/formatting.pyi b/typeshed/2and3/galaxy/jobs/metrics/formatting.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/formatting.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/formatting.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/__init__.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/__init__.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/__init__.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/collectl.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/collectl.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/collectl.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/collectl.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/core.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/core.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/core.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/core.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/cpuinfo.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/cpuinfo.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/cpuinfo.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/cpuinfo.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/env.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/env.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/env.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/env.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/meminfo.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/meminfo.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/meminfo.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/meminfo.pyi
diff --git a/typeshed/2.7/galaxy/jobs/metrics/instrumenters/uname.pyi b/typeshed/2and3/galaxy/jobs/metrics/instrumenters/uname.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/jobs/metrics/instrumenters/uname.pyi
rename to typeshed/2and3/galaxy/jobs/metrics/instrumenters/uname.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/__init__.pyi b/typeshed/2and3/galaxy/objectstore/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/__init__.pyi
rename to typeshed/2and3/galaxy/objectstore/__init__.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/azure_blob.pyi b/typeshed/2and3/galaxy/objectstore/azure_blob.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/azure_blob.pyi
rename to typeshed/2and3/galaxy/objectstore/azure_blob.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/pulsar.pyi b/typeshed/2and3/galaxy/objectstore/pulsar.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/pulsar.pyi
rename to typeshed/2and3/galaxy/objectstore/pulsar.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/rods.pyi b/typeshed/2and3/galaxy/objectstore/rods.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/rods.pyi
rename to typeshed/2and3/galaxy/objectstore/rods.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/s3.pyi b/typeshed/2and3/galaxy/objectstore/s3.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/s3.pyi
rename to typeshed/2and3/galaxy/objectstore/s3.pyi
diff --git a/typeshed/2.7/galaxy/objectstore/s3_multipart_upload.pyi b/typeshed/2and3/galaxy/objectstore/s3_multipart_upload.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/objectstore/s3_multipart_upload.pyi
rename to typeshed/2and3/galaxy/objectstore/s3_multipart_upload.pyi
diff --git a/typeshed/2.7/galaxy/tools/__init__.pyi b/typeshed/2and3/galaxy/tools/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/__init__.pyi
rename to typeshed/2and3/galaxy/tools/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/__init__.pyi b/typeshed/2and3/galaxy/tools/cwl/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/__init__.pyi
rename to typeshed/2and3/galaxy/tools/cwl/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/cwltool_deps.pyi b/typeshed/2and3/galaxy/tools/cwl/cwltool_deps.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/cwltool_deps.pyi
rename to typeshed/2and3/galaxy/tools/cwl/cwltool_deps.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/parser.pyi b/typeshed/2and3/galaxy/tools/cwl/parser.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/parser.pyi
rename to typeshed/2and3/galaxy/tools/cwl/parser.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/representation.pyi b/typeshed/2and3/galaxy/tools/cwl/representation.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/representation.pyi
rename to typeshed/2and3/galaxy/tools/cwl/representation.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/runtime_actions.pyi b/typeshed/2and3/galaxy/tools/cwl/runtime_actions.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/runtime_actions.pyi
rename to typeshed/2and3/galaxy/tools/cwl/runtime_actions.pyi
diff --git a/typeshed/2.7/galaxy/tools/cwl/schema.pyi b/typeshed/2and3/galaxy/tools/cwl/schema.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/cwl/schema.pyi
rename to typeshed/2and3/galaxy/tools/cwl/schema.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/__init__.pyi b/typeshed/2and3/galaxy/tools/deps/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/__init__.pyi
rename to typeshed/2and3/galaxy/tools/deps/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/brew_exts.pyi b/typeshed/2and3/galaxy/tools/deps/brew_exts.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/brew_exts.pyi
rename to typeshed/2and3/galaxy/tools/deps/brew_exts.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/brew_util.pyi b/typeshed/2and3/galaxy/tools/deps/brew_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/brew_util.pyi
rename to typeshed/2and3/galaxy/tools/deps/brew_util.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/commands.pyi b/typeshed/2and3/galaxy/tools/deps/commands.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/commands.pyi
rename to typeshed/2and3/galaxy/tools/deps/commands.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/conda_compat.pyi b/typeshed/2and3/galaxy/tools/deps/conda_compat.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/conda_compat.pyi
rename to typeshed/2and3/galaxy/tools/deps/conda_compat.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/conda_util.pyi b/typeshed/2and3/galaxy/tools/deps/conda_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/conda_util.pyi
rename to typeshed/2and3/galaxy/tools/deps/conda_util.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/container_resolvers/__init__.pyi b/typeshed/2and3/galaxy/tools/deps/container_resolvers/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/container_resolvers/__init__.pyi
rename to typeshed/2and3/galaxy/tools/deps/container_resolvers/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/container_resolvers/explicit.pyi b/typeshed/2and3/galaxy/tools/deps/container_resolvers/explicit.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/container_resolvers/explicit.pyi
rename to typeshed/2and3/galaxy/tools/deps/container_resolvers/explicit.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/container_resolvers/mulled.pyi b/typeshed/2and3/galaxy/tools/deps/container_resolvers/mulled.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/container_resolvers/mulled.pyi
rename to typeshed/2and3/galaxy/tools/deps/container_resolvers/mulled.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/containers.pyi b/typeshed/2and3/galaxy/tools/deps/containers.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/containers.pyi
rename to typeshed/2and3/galaxy/tools/deps/containers.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/dependencies.pyi b/typeshed/2and3/galaxy/tools/deps/dependencies.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/dependencies.pyi
rename to typeshed/2and3/galaxy/tools/deps/dependencies.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/docker_util.pyi b/typeshed/2and3/galaxy/tools/deps/docker_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/docker_util.pyi
rename to typeshed/2and3/galaxy/tools/deps/docker_util.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/dockerfiles.pyi b/typeshed/2and3/galaxy/tools/deps/dockerfiles.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/dockerfiles.pyi
rename to typeshed/2and3/galaxy/tools/deps/dockerfiles.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/installable.pyi b/typeshed/2and3/galaxy/tools/deps/installable.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/installable.pyi
rename to typeshed/2and3/galaxy/tools/deps/installable.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/__init__.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/__init__.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/_cli.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/_cli.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/_cli.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/_cli.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/mulled_build.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/mulled_build.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/mulled_build.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/mulled_build.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_channel.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_channel.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_channel.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_channel.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_files.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_files.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_files.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_files.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_tool.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_tool.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/mulled_build_tool.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/mulled_build_tool.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/mulled_search.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/mulled_search.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/mulled_search.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/mulled_search.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/mulled/util.pyi b/typeshed/2and3/galaxy/tools/deps/mulled/util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/mulled/util.pyi
rename to typeshed/2and3/galaxy/tools/deps/mulled/util.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/requirements.pyi b/typeshed/2and3/galaxy/tools/deps/requirements.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/requirements.pyi
rename to typeshed/2and3/galaxy/tools/deps/requirements.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/__init__.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/__init__.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/brewed_tool_shed_packages.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/conda.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/conda.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/conda.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/conda.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/galaxy_packages.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/galaxy_packages.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/galaxy_packages.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/galaxy_packages.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/homebrew.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/homebrew.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/homebrew.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/homebrew.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/modules.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/modules.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/modules.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/modules.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/resolver_mixins.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/resolver_mixins.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/resolver_mixins.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/resolver_mixins.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/tool_shed_packages.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/tool_shed_packages.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/tool_shed_packages.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/tool_shed_packages.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.pyi b/typeshed/2and3/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.pyi
rename to typeshed/2and3/galaxy/tools/deps/resolvers/unlinked_tool_shed_packages.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/singularity_util.pyi b/typeshed/2and3/galaxy/tools/deps/singularity_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/singularity_util.pyi
rename to typeshed/2and3/galaxy/tools/deps/singularity_util.pyi
diff --git a/typeshed/2.7/galaxy/tools/deps/views.pyi b/typeshed/2and3/galaxy/tools/deps/views.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/deps/views.pyi
rename to typeshed/2and3/galaxy/tools/deps/views.pyi
diff --git a/typeshed/2.7/galaxy/tools/fetcher.pyi b/typeshed/2and3/galaxy/tools/fetcher.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/fetcher.pyi
rename to typeshed/2and3/galaxy/tools/fetcher.pyi
diff --git a/typeshed/2.7/galaxy/tools/lint.pyi b/typeshed/2and3/galaxy/tools/lint.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/lint.pyi
rename to typeshed/2and3/galaxy/tools/lint.pyi
diff --git a/typeshed/2.7/galaxy/tools/lint_util.pyi b/typeshed/2and3/galaxy/tools/lint_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/lint_util.pyi
rename to typeshed/2and3/galaxy/tools/lint_util.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/__init__.pyi b/typeshed/2and3/galaxy/tools/linters/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/__init__.pyi
rename to typeshed/2and3/galaxy/tools/linters/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/citations.pyi b/typeshed/2and3/galaxy/tools/linters/citations.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/citations.pyi
rename to typeshed/2and3/galaxy/tools/linters/citations.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/command.pyi b/typeshed/2and3/galaxy/tools/linters/command.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/command.pyi
rename to typeshed/2and3/galaxy/tools/linters/command.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/cwl.pyi b/typeshed/2and3/galaxy/tools/linters/cwl.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/cwl.pyi
rename to typeshed/2and3/galaxy/tools/linters/cwl.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/general.pyi b/typeshed/2and3/galaxy/tools/linters/general.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/general.pyi
rename to typeshed/2and3/galaxy/tools/linters/general.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/help.pyi b/typeshed/2and3/galaxy/tools/linters/help.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/help.pyi
rename to typeshed/2and3/galaxy/tools/linters/help.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/inputs.pyi b/typeshed/2and3/galaxy/tools/linters/inputs.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/inputs.pyi
rename to typeshed/2and3/galaxy/tools/linters/inputs.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/outputs.pyi b/typeshed/2and3/galaxy/tools/linters/outputs.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/outputs.pyi
rename to typeshed/2and3/galaxy/tools/linters/outputs.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/stdio.pyi b/typeshed/2and3/galaxy/tools/linters/stdio.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/stdio.pyi
rename to typeshed/2and3/galaxy/tools/linters/stdio.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/tests.pyi b/typeshed/2and3/galaxy/tools/linters/tests.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/tests.pyi
rename to typeshed/2and3/galaxy/tools/linters/tests.pyi
diff --git a/typeshed/2.7/galaxy/tools/linters/xml_order.pyi b/typeshed/2and3/galaxy/tools/linters/xml_order.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/linters/xml_order.pyi
rename to typeshed/2and3/galaxy/tools/linters/xml_order.pyi
diff --git a/typeshed/2.7/galaxy/tools/loader.pyi b/typeshed/2and3/galaxy/tools/loader.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/loader.pyi
rename to typeshed/2and3/galaxy/tools/loader.pyi
diff --git a/typeshed/2.7/galaxy/tools/loader_directory.pyi b/typeshed/2and3/galaxy/tools/loader_directory.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/loader_directory.pyi
rename to typeshed/2and3/galaxy/tools/loader_directory.pyi
diff --git a/typeshed/2.7/galaxy/tools/locations/__init__.pyi b/typeshed/2and3/galaxy/tools/locations/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/locations/__init__.pyi
rename to typeshed/2and3/galaxy/tools/locations/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/locations/dockstore.pyi b/typeshed/2and3/galaxy/tools/locations/dockstore.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/locations/dockstore.pyi
rename to typeshed/2and3/galaxy/tools/locations/dockstore.pyi
diff --git a/typeshed/2.7/galaxy/tools/locations/file.pyi b/typeshed/2and3/galaxy/tools/locations/file.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/locations/file.pyi
rename to typeshed/2and3/galaxy/tools/locations/file.pyi
diff --git a/typeshed/2.7/galaxy/tools/locations/http.pyi b/typeshed/2and3/galaxy/tools/locations/http.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/locations/http.pyi
rename to typeshed/2and3/galaxy/tools/locations/http.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/__init__.pyi b/typeshed/2and3/galaxy/tools/parser/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/__init__.pyi
rename to typeshed/2and3/galaxy/tools/parser/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/cwl.pyi b/typeshed/2and3/galaxy/tools/parser/cwl.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/cwl.pyi
rename to typeshed/2and3/galaxy/tools/parser/cwl.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/factory.pyi b/typeshed/2and3/galaxy/tools/parser/factory.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/factory.pyi
rename to typeshed/2and3/galaxy/tools/parser/factory.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/interface.pyi b/typeshed/2and3/galaxy/tools/parser/interface.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/interface.pyi
rename to typeshed/2and3/galaxy/tools/parser/interface.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/output_actions.pyi b/typeshed/2and3/galaxy/tools/parser/output_actions.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/output_actions.pyi
rename to typeshed/2and3/galaxy/tools/parser/output_actions.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/output_collection_def.pyi b/typeshed/2and3/galaxy/tools/parser/output_collection_def.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/output_collection_def.pyi
rename to typeshed/2and3/galaxy/tools/parser/output_collection_def.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/output_objects.pyi b/typeshed/2and3/galaxy/tools/parser/output_objects.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/output_objects.pyi
rename to typeshed/2and3/galaxy/tools/parser/output_objects.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/util.pyi b/typeshed/2and3/galaxy/tools/parser/util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/util.pyi
rename to typeshed/2and3/galaxy/tools/parser/util.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/xml.pyi b/typeshed/2and3/galaxy/tools/parser/xml.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/xml.pyi
rename to typeshed/2and3/galaxy/tools/parser/xml.pyi
diff --git a/typeshed/2.7/galaxy/tools/parser/yaml.pyi b/typeshed/2and3/galaxy/tools/parser/yaml.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/parser/yaml.pyi
rename to typeshed/2and3/galaxy/tools/parser/yaml.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/__init__.pyi b/typeshed/2and3/galaxy/tools/verify/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/__init__.pyi
rename to typeshed/2and3/galaxy/tools/verify/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/asserts/__init__.pyi b/typeshed/2and3/galaxy/tools/verify/asserts/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/asserts/__init__.pyi
rename to typeshed/2and3/galaxy/tools/verify/asserts/__init__.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/asserts/tabular.pyi b/typeshed/2and3/galaxy/tools/verify/asserts/tabular.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/asserts/tabular.pyi
rename to typeshed/2and3/galaxy/tools/verify/asserts/tabular.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/asserts/text.pyi b/typeshed/2and3/galaxy/tools/verify/asserts/text.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/asserts/text.pyi
rename to typeshed/2and3/galaxy/tools/verify/asserts/text.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/asserts/xml.pyi b/typeshed/2and3/galaxy/tools/verify/asserts/xml.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/asserts/xml.pyi
rename to typeshed/2and3/galaxy/tools/verify/asserts/xml.pyi
diff --git a/typeshed/2.7/galaxy/tools/verify/test_data.pyi b/typeshed/2and3/galaxy/tools/verify/test_data.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/tools/verify/test_data.pyi
rename to typeshed/2and3/galaxy/tools/verify/test_data.pyi
diff --git a/typeshed/2.7/galaxy/util/__init__.pyi b/typeshed/2and3/galaxy/util/__init__.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/__init__.pyi
rename to typeshed/2and3/galaxy/util/__init__.pyi
diff --git a/typeshed/2.7/galaxy/util/aliaspickler.pyi b/typeshed/2and3/galaxy/util/aliaspickler.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/aliaspickler.pyi
rename to typeshed/2and3/galaxy/util/aliaspickler.pyi
diff --git a/typeshed/2.7/galaxy/util/bunch.pyi b/typeshed/2and3/galaxy/util/bunch.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/bunch.pyi
rename to typeshed/2and3/galaxy/util/bunch.pyi
diff --git a/typeshed/2.7/galaxy/util/checkers.pyi b/typeshed/2and3/galaxy/util/checkers.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/checkers.pyi
rename to typeshed/2and3/galaxy/util/checkers.pyi
diff --git a/typeshed/2.7/galaxy/util/compression_utils.pyi b/typeshed/2and3/galaxy/util/compression_utils.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/compression_utils.pyi
rename to typeshed/2and3/galaxy/util/compression_utils.pyi
diff --git a/typeshed/2.7/galaxy/util/dictifiable.pyi b/typeshed/2and3/galaxy/util/dictifiable.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/dictifiable.pyi
rename to typeshed/2and3/galaxy/util/dictifiable.pyi
diff --git a/typeshed/2.7/galaxy/util/expressions.pyi b/typeshed/2and3/galaxy/util/expressions.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/expressions.pyi
rename to typeshed/2and3/galaxy/util/expressions.pyi
diff --git a/typeshed/2.7/galaxy/util/filelock.pyi b/typeshed/2and3/galaxy/util/filelock.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/filelock.pyi
rename to typeshed/2and3/galaxy/util/filelock.pyi
diff --git a/typeshed/2.7/galaxy/util/hash_util.pyi b/typeshed/2and3/galaxy/util/hash_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/hash_util.pyi
rename to typeshed/2and3/galaxy/util/hash_util.pyi
diff --git a/typeshed/2.7/galaxy/util/heartbeat.pyi b/typeshed/2and3/galaxy/util/heartbeat.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/heartbeat.pyi
rename to typeshed/2and3/galaxy/util/heartbeat.pyi
diff --git a/typeshed/2.7/galaxy/util/image_util.pyi b/typeshed/2and3/galaxy/util/image_util.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/image_util.pyi
rename to typeshed/2and3/galaxy/util/image_util.pyi
diff --git a/typeshed/2.7/galaxy/util/inflection.pyi b/typeshed/2and3/galaxy/util/inflection.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/inflection.pyi
rename to typeshed/2and3/galaxy/util/inflection.pyi
diff --git a/typeshed/2.7/galaxy/util/json.pyi b/typeshed/2and3/galaxy/util/json.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/json.pyi
rename to typeshed/2and3/galaxy/util/json.pyi
diff --git a/typeshed/2.7/galaxy/util/lazy_process.pyi b/typeshed/2and3/galaxy/util/lazy_process.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/lazy_process.pyi
rename to typeshed/2and3/galaxy/util/lazy_process.pyi
diff --git a/typeshed/2.7/galaxy/util/object_wrapper.pyi b/typeshed/2and3/galaxy/util/object_wrapper.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/object_wrapper.pyi
rename to typeshed/2and3/galaxy/util/object_wrapper.pyi
diff --git a/typeshed/2.7/galaxy/util/odict.pyi b/typeshed/2and3/galaxy/util/odict.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/odict.pyi
rename to typeshed/2and3/galaxy/util/odict.pyi
diff --git a/typeshed/2.7/galaxy/util/oset.pyi b/typeshed/2and3/galaxy/util/oset.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/oset.pyi
rename to typeshed/2and3/galaxy/util/oset.pyi
diff --git a/typeshed/2.7/galaxy/util/plugin_config.pyi b/typeshed/2and3/galaxy/util/plugin_config.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/plugin_config.pyi
rename to typeshed/2and3/galaxy/util/plugin_config.pyi
diff --git a/typeshed/2.7/galaxy/util/properties.pyi b/typeshed/2and3/galaxy/util/properties.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/properties.pyi
rename to typeshed/2and3/galaxy/util/properties.pyi
diff --git a/typeshed/2.7/galaxy/util/simplegraph.pyi b/typeshed/2and3/galaxy/util/simplegraph.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/simplegraph.pyi
rename to typeshed/2and3/galaxy/util/simplegraph.pyi
diff --git a/typeshed/2.7/galaxy/util/sleeper.pyi b/typeshed/2and3/galaxy/util/sleeper.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/sleeper.pyi
rename to typeshed/2and3/galaxy/util/sleeper.pyi
diff --git a/typeshed/2.7/galaxy/util/sockets.pyi b/typeshed/2and3/galaxy/util/sockets.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/sockets.pyi
rename to typeshed/2and3/galaxy/util/sockets.pyi
diff --git a/typeshed/2.7/galaxy/util/specs.pyi b/typeshed/2and3/galaxy/util/specs.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/specs.pyi
rename to typeshed/2and3/galaxy/util/specs.pyi
diff --git a/typeshed/2.7/galaxy/util/sqlite.pyi b/typeshed/2and3/galaxy/util/sqlite.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/sqlite.pyi
rename to typeshed/2and3/galaxy/util/sqlite.pyi
diff --git a/typeshed/2.7/galaxy/util/submodules.pyi b/typeshed/2and3/galaxy/util/submodules.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/submodules.pyi
rename to typeshed/2and3/galaxy/util/submodules.pyi
diff --git a/typeshed/2.7/galaxy/util/topsort.pyi b/typeshed/2and3/galaxy/util/topsort.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/topsort.pyi
rename to typeshed/2and3/galaxy/util/topsort.pyi
diff --git a/typeshed/2.7/galaxy/util/xml_macros.pyi b/typeshed/2and3/galaxy/util/xml_macros.pyi
similarity index 100%
rename from typeshed/2.7/galaxy/util/xml_macros.pyi
rename to typeshed/2and3/galaxy/util/xml_macros.pyi