From 805fbd5edb0d611236722d7c9a1f9ebe32524f56 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 30 Aug 2022 23:03:39 +0200
Subject: [PATCH] Expand tutorial on equipmenthandler

---
 docs/source/Coding/Coding-Introduction.md     |   4 +-
 docs/source/Components/Command-Sets.md        |   4 +-
 docs/source/Components/Command-System.md      |   2 +-
 docs/source/Components/Commands.md            |   2 +-
 docs/source/Evennia-Introduction.md           |   6 +-
 docs/source/Glossary.md                       |   2 +-
 docs/source/Howtos/A-Sittable-Object.md       |   2 +-
 docs/source/Howtos/Arxcode-Installation.md    |   2 +-
 ...d => Beginner-Tutorial-Adding-Commands.md} |   2 +-
 ... Beginner-Tutorial-Building-Quickstart.md} |   2 +-
 ...d => Beginner-Tutorial-Creating-Things.md} |   0
 ...md => Beginner-Tutorial-Django-queries.md} |   0
 ...nner-Tutorial-Evennia-Library-Overview.md} |   0
 ... => Beginner-Tutorial-Gamedir-Overview.md} |   2 +-
 ...Beginner-Tutorial-Learning-Typeclasses.md} |   4 +-
 ... => Beginner-Tutorial-More-on-Commands.md} |   4 +-
 .../Part1/Beginner-Tutorial-Part1-Intro.md    |  48 +-
 ...ner-Tutorial-Python-basic-introduction.md} |   0
 ... => Beginner-Tutorial-Searching-Things.md} |   0
 ...md => Beginner-Tutorial-Tutorial-World.md} |   0
 .../Part1/Python-classes-and-objects.md       |   4 +-
 ....md => Beginner-Tutorial-Game-Planning.md} |   0
 .../Part2/Beginner-Tutorial-Part2-Intro.md    |  12 +-
 ...er-Tutorial-Planning-The-Tutorial-Game.md} |   2 +-
 ...ner-Tutorial-Planning-Where-Do-I-Begin.md} |   0
 .../Part3/Beginner-Tutorial-Characters.md     |  56 +++
 .../Part3/Beginner-Tutorial-Equipment.md      | 459 +++++++++++++++++-
 .../Part3/Beginner-Tutorial-Objects.md        |  26 +
 .../Part3/Beginner-Tutorial-Utilities.md      |   8 +-
 docs/source/Howtos/Coding-FAQ.md              |   4 +-
 docs/source/Howtos/Default-Exit-Errors.md     |   2 +-
 docs/source/Howtos/Evennia-for-MUSH-Users.md  |   2 +-
 .../Evennia-for-roleplaying-sessions.md       |   2 +-
 .../Howtos/Parsing-commands-tutorial.md       |   4 +-
 docs/source/Howtos/Static-In-Game-Map.md      |   2 +-
 .../source/Howtos/Turn-based-Combat-System.md |   2 +-
 .../Tutorial-for-basic-MUSH-like-game.md      |   2 +-
 .../How-to-connect-Evennia-to-Twitter.md      |   2 +-
 docs/source/Setup/Installation.md             |   2 +-
 docs/source/api/evennia-api.rst               |   7 -
 docs/source/api/evennia.accounts.accounts.rst |   7 -
 docs/source/api/evennia.accounts.bots.rst     |   7 -
 docs/source/api/evennia.accounts.manager.rst  |   7 -
 docs/source/api/evennia.accounts.models.rst   |   7 -
 docs/source/api/evennia.accounts.rst          |  17 -
 .../api/evennia.commands.cmdhandler.rst       |   7 -
 .../source/api/evennia.commands.cmdparser.rst |   7 -
 docs/source/api/evennia.commands.cmdset.rst   |   7 -
 .../api/evennia.commands.cmdsethandler.rst    |   7 -
 docs/source/api/evennia.commands.command.rst  |   7 -
 .../api/evennia.commands.default.account.rst  |   7 -
 .../api/evennia.commands.default.admin.rst    |   7 -
 .../evennia.commands.default.batchprocess.rst |   7 -
 .../api/evennia.commands.default.building.rst |   7 -
 ...vennia.commands.default.cmdset_account.rst |   7 -
 ...nnia.commands.default.cmdset_character.rst |   7 -
 ...vennia.commands.default.cmdset_session.rst |   7 -
 ...nia.commands.default.cmdset_unloggedin.rst |   7 -
 .../api/evennia.commands.default.comms.rst    |   7 -
 .../api/evennia.commands.default.general.rst  |   7 -
 .../api/evennia.commands.default.help.rst     |   7 -
 .../evennia.commands.default.muxcommand.rst   |   7 -
 docs/source/api/evennia.commands.default.rst  |  29 --
 .../evennia.commands.default.syscommands.rst  |   7 -
 .../api/evennia.commands.default.system.rst   |   7 -
 .../api/evennia.commands.default.tests.rst    |   7 -
 .../evennia.commands.default.unloggedin.rst   |   7 -
 docs/source/api/evennia.commands.rst          |  24 -
 docs/source/api/evennia.comms.comms.rst       |   7 -
 docs/source/api/evennia.comms.managers.rst    |   7 -
 docs/source/api/evennia.comms.models.rst      |   7 -
 docs/source/api/evennia.comms.rst             |  16 -
 ...rib.base_systems.awsstorage.aws_s3_cdn.rst |   7 -
 ...vennia.contrib.base_systems.awsstorage.rst |  15 -
 ....contrib.base_systems.awsstorage.tests.rst |   7 -
 ...se_systems.building_menu.building_menu.rst |   7 -
 ...nia.contrib.base_systems.building_menu.rst |  15 -
 ...ntrib.base_systems.building_menu.tests.rst |   7 -
 ...se_systems.color_markups.color_markups.rst |   7 -
 ...nia.contrib.base_systems.color_markups.rst |  15 -
 ...ntrib.base_systems.color_markups.tests.rst |   7 -
 ...trib.base_systems.components.component.rst |   7 -
 ...ontrib.base_systems.components.dbfield.rst |   7 -
 ...contrib.base_systems.components.holder.rst |   7 -
 ...vennia.contrib.base_systems.components.rst |  18 -
 ...ontrib.base_systems.components.signals.rst |   7 -
 ....contrib.base_systems.components.tests.rst |   7 -
 ...ystems.custom_gametime.custom_gametime.rst |   7 -
 ...a.contrib.base_systems.custom_gametime.rst |  15 -
 ...rib.base_systems.custom_gametime.tests.rst |   7 -
 ...systems.email_login.connection_screens.rst |   7 -
 ...b.base_systems.email_login.email_login.rst |   7 -
 ...ennia.contrib.base_systems.email_login.rst |  16 -
 ...contrib.base_systems.email_login.tests.rst |   7 -
 ..._systems.ingame_python.callbackhandler.rst |   7 -
 ...ib.base_systems.ingame_python.commands.rst |   7 -
 ....base_systems.ingame_python.eventfuncs.rst |   7 -
 ...nia.contrib.base_systems.ingame_python.rst |  20 -
 ...rib.base_systems.ingame_python.scripts.rst |   7 -
 ...ntrib.base_systems.ingame_python.tests.rst |   7 -
 ...base_systems.ingame_python.typeclasses.rst |   7 -
 ...ntrib.base_systems.ingame_python.utils.rst |   7 -
 ..._systems.menu_login.connection_screens.rst |   7 -
 ...rib.base_systems.menu_login.menu_login.rst |   7 -
 ...vennia.contrib.base_systems.menu_login.rst |  16 -
 ....contrib.base_systems.menu_login.tests.rst |   7 -
 ..._systems.mux_comms_cmds.mux_comms_cmds.rst |   7 -
 ...ia.contrib.base_systems.mux_comms_cmds.rst |  15 -
 ...trib.base_systems.mux_comms_cmds.tests.rst |   7 -
 .../api/evennia.contrib.base_systems.rst      |  22 -
 ...ennia.contrib.base_systems.unixcommand.rst |  15 -
 ...contrib.base_systems.unixcommand.tests.rst |   7 -
 ...b.base_systems.unixcommand.unixcommand.rst |   7 -
 ...trib.full_systems.evscaperoom.commands.rst |   7 -
 ....contrib.full_systems.evscaperoom.menu.rst |   7 -
 ...ntrib.full_systems.evscaperoom.objects.rst |   7 -
 ....contrib.full_systems.evscaperoom.room.rst |   7 -
 ...ennia.contrib.full_systems.evscaperoom.rst |  21 -
 ...ntrib.full_systems.evscaperoom.scripts.rst |   7 -
 ...contrib.full_systems.evscaperoom.state.rst |   7 -
 ...contrib.full_systems.evscaperoom.tests.rst |   7 -
 ...contrib.full_systems.evscaperoom.utils.rst |   7 -
 .../api/evennia.contrib.full_systems.rst      |  13 -
 ...nia.contrib.game_systems.barter.barter.rst |   7 -
 .../evennia.contrib.game_systems.barter.rst   |  15 -
 ...nnia.contrib.game_systems.barter.tests.rst |   7 -
 ...contrib.game_systems.clothing.clothing.rst |   7 -
 .../evennia.contrib.game_systems.clothing.rst |  15 -
 ...ia.contrib.game_systems.clothing.tests.rst |   7 -
 ...ntrib.game_systems.cooldowns.cooldowns.rst |   7 -
 ...evennia.contrib.game_systems.cooldowns.rst |  15 -
 ...a.contrib.game_systems.cooldowns.tests.rst |   7 -
 ...contrib.game_systems.crafting.crafting.rst |   7 -
 ....game_systems.crafting.example_recipes.rst |   7 -
 .../evennia.contrib.game_systems.crafting.rst |  16 -
 ...ia.contrib.game_systems.crafting.tests.rst |   7 -
 ...ntrib.game_systems.gendersub.gendersub.rst |   7 -
 ...evennia.contrib.game_systems.gendersub.rst |  15 -
 ...a.contrib.game_systems.gendersub.tests.rst |   7 -
 ...evennia.contrib.game_systems.mail.mail.rst |   7 -
 .../api/evennia.contrib.game_systems.mail.rst |  15 -
 ...vennia.contrib.game_systems.mail.tests.rst |   7 -
 ...b.game_systems.multidescer.multidescer.rst |   7 -
 ...ennia.contrib.game_systems.multidescer.rst |  15 -
 ...contrib.game_systems.multidescer.tests.rst |   7 -
 ...a.contrib.game_systems.puzzles.puzzles.rst |   7 -
 .../evennia.contrib.game_systems.puzzles.rst  |  15 -
 ...nia.contrib.game_systems.puzzles.tests.rst |   7 -
 .../api/evennia.contrib.game_systems.rst      |  21 -
 ...vennia.contrib.game_systems.turnbattle.rst |  19 -
 ...ntrib.game_systems.turnbattle.tb_basic.rst |   7 -
 ...ntrib.game_systems.turnbattle.tb_equip.rst |   7 -
 ...ntrib.game_systems.turnbattle.tb_items.rst |   7 -
 ...ntrib.game_systems.turnbattle.tb_magic.rst |   7 -
 ...ntrib.game_systems.turnbattle.tb_range.rst |   7 -
 ....contrib.game_systems.turnbattle.tests.rst |   7 -
 ...ntrib.grid.extended_room.extended_room.rst |   7 -
 .../evennia.contrib.grid.extended_room.rst    |  15 -
 ...ennia.contrib.grid.extended_room.tests.rst |   7 -
 ...nia.contrib.grid.mapbuilder.mapbuilder.rst |   7 -
 .../api/evennia.contrib.grid.mapbuilder.rst   |  15 -
 .../evennia.contrib.grid.mapbuilder.tests.rst |   7 -
 docs/source/api/evennia.contrib.grid.rst      |  18 -
 .../api/evennia.contrib.grid.simpledoor.rst   |  15 -
 ...nia.contrib.grid.simpledoor.simpledoor.rst |   7 -
 .../evennia.contrib.grid.simpledoor.tests.rst |   7 -
 .../api/evennia.contrib.grid.slow_exit.rst    |  15 -
 ...ennia.contrib.grid.slow_exit.slow_exit.rst |   7 -
 .../evennia.contrib.grid.slow_exit.tests.rst  |   7 -
 .../api/evennia.contrib.grid.wilderness.rst   |  15 -
 .../evennia.contrib.grid.wilderness.tests.rst |   7 -
 ...nia.contrib.grid.wilderness.wilderness.rst |   7 -
 .../evennia.contrib.grid.xyzgrid.commands.rst |   7 -
 .../evennia.contrib.grid.xyzgrid.example.rst  |   7 -
 ...evennia.contrib.grid.xyzgrid.launchcmd.rst |   7 -
 ...vennia.contrib.grid.xyzgrid.prototypes.rst |   7 -
 .../api/evennia.contrib.grid.xyzgrid.rst      |  23 -
 .../evennia.contrib.grid.xyzgrid.tests.rst    |   7 -
 .../evennia.contrib.grid.xyzgrid.utils.rst    |   7 -
 .../evennia.contrib.grid.xyzgrid.xymap.rst    |   7 -
 ...nnia.contrib.grid.xyzgrid.xymap_legend.rst |   7 -
 .../evennia.contrib.grid.xyzgrid.xyzgrid.rst  |   7 -
 .../evennia.contrib.grid.xyzgrid.xyzroom.rst  |   7 -
 .../api/evennia.contrib.rpg.buffs.buff.rst    |   7 -
 docs/source/api/evennia.contrib.rpg.buffs.rst |  16 -
 .../evennia.contrib.rpg.buffs.samplebuffs.rst |   7 -
 .../api/evennia.contrib.rpg.buffs.tests.rst   |   7 -
 .../api/evennia.contrib.rpg.dice.dice.rst     |   7 -
 docs/source/api/evennia.contrib.rpg.dice.rst  |  15 -
 .../api/evennia.contrib.rpg.dice.tests.rst    |   7 -
 ...nnia.contrib.rpg.health_bar.health_bar.rst |   7 -
 .../api/evennia.contrib.rpg.health_bar.rst    |  15 -
 .../evennia.contrib.rpg.health_bar.tests.rst  |   7 -
 ...vennia.contrib.rpg.rpsystem.rplanguage.rst |   7 -
 .../evennia.contrib.rpg.rpsystem.rpsystem.rst |   7 -
 .../api/evennia.contrib.rpg.rpsystem.rst      |  16 -
 .../evennia.contrib.rpg.rpsystem.tests.rst    |   7 -
 docs/source/api/evennia.contrib.rpg.rst       |  17 -
 .../source/api/evennia.contrib.rpg.traits.rst |  15 -
 .../api/evennia.contrib.rpg.traits.tests.rst  |   7 -
 .../api/evennia.contrib.rpg.traits.traits.rst |   7 -
 docs/source/api/evennia.contrib.rst           |  19 -
 ...ials.batchprocessor.example_batch_code.rst |   7 -
 ...ennia.contrib.tutorials.batchprocessor.rst |  14 -
 ....tutorials.bodyfunctions.bodyfunctions.rst |   7 -
 ...vennia.contrib.tutorials.bodyfunctions.rst |  15 -
 ....contrib.tutorials.bodyfunctions.tests.rst |   7 -
 ...b.tutorials.evadventure.build_techdemo.rst |   7 -
 ...trib.tutorials.evadventure.build_world.rst |   7 -
 ...ntrib.tutorials.evadventure.characters.rst |   7 -
 ...tutorials.evadventure.combat_turnbased.rst |   7 -
 ...contrib.tutorials.evadventure.commands.rst |   7 -
 ....contrib.tutorials.evadventure.dungeon.rst |   7 -
 ...ia.contrib.tutorials.evadventure.enums.rst |   7 -
 ...ontrib.tutorials.evadventure.equipment.rst |   7 -
 ...nia.contrib.tutorials.evadventure.npcs.rst |   7 -
 ....contrib.tutorials.evadventure.objects.rst |   7 -
 ...a.contrib.tutorials.evadventure.quests.rst |   7 -
 ...ib.tutorials.evadventure.random_tables.rst |   7 -
 ...ia.contrib.tutorials.evadventure.rooms.rst |   7 -
 .../evennia.contrib.tutorials.evadventure.rst |  35 --
 ...ia.contrib.tutorials.evadventure.rules.rst |   7 -
 ...ia.contrib.tutorials.evadventure.shops.rst |   7 -
 ...nia.contrib.tutorials.evadventure.tests.md |   1 +
 ...rib.tutorials.evadventure.tests.mixins.rst |   7 -
 ...ia.contrib.tutorials.evadventure.tests.rst |  21 -
 ...ials.evadventure.tests.test_characters.rst |   7 -
 ...utorials.evadventure.tests.test_combat.rst |   7 -
 ...orials.evadventure.tests.test_commands.rst |   7 -
 ...rials.evadventure.tests.test_equipment.md} |   9 +-
 ...utorials.evadventure.tests.test_quests.rst |   7 -
 ...tutorials.evadventure.tests.test_rules.rst |   7 -
 ...tutorials.evadventure.tests.test_utils.rst |   7 -
 ...ia.contrib.tutorials.evadventure.utils.rst |   7 -
 ...vennia.contrib.tutorials.mirror.mirror.rst |   7 -
 .../api/evennia.contrib.tutorials.mirror.rst  |  14 -
 ...ontrib.tutorials.red_button.red_button.rst |   7 -
 .../evennia.contrib.tutorials.red_button.rst  |  14 -
 docs/source/api/evennia.contrib.tutorials.rst |  19 -
 .../evennia.contrib.tutorials.talking_npc.rst |  15 -
 ...trib.tutorials.talking_npc.talking_npc.rst |   7 -
 ...ia.contrib.tutorials.talking_npc.tests.rst |   7 -
 ...ib.tutorials.tutorial_world.intro_menu.rst |   7 -
 ...a.contrib.tutorials.tutorial_world.mob.rst |   7 -
 ...ntrib.tutorials.tutorial_world.objects.rst |   7 -
 ...contrib.tutorials.tutorial_world.rooms.rst |   7 -
 ...ennia.contrib.tutorials.tutorial_world.rst |  18 -
 ...contrib.tutorials.tutorial_world.tests.rst |   7 -
 ...evennia.contrib.utils.auditing.outputs.rst |   7 -
 .../api/evennia.contrib.utils.auditing.rst    |  16 -
 .../evennia.contrib.utils.auditing.server.rst |   7 -
 .../evennia.contrib.utils.auditing.tests.rst  |   7 -
 ...nnia.contrib.utils.fieldfill.fieldfill.rst |   7 -
 .../api/evennia.contrib.utils.fieldfill.rst   |  14 -
 ...ring_generator.random_string_generator.rst |   7 -
 ....contrib.utils.random_string_generator.rst |  15 -
 ...ib.utils.random_string_generator.tests.rst |   7 -
 docs/source/api/evennia.contrib.utils.rst     |  16 -
 .../api/evennia.contrib.utils.tree_select.rst |  15 -
 ...vennia.contrib.utils.tree_select.tests.rst |   7 -
 ....contrib.utils.tree_select.tree_select.rst |   7 -
 docs/source/api/evennia.help.filehelp.rst     |   7 -
 docs/source/api/evennia.help.manager.rst      |   7 -
 docs/source/api/evennia.help.models.rst       |   7 -
 docs/source/api/evennia.help.rst              |  17 -
 docs/source/api/evennia.help.utils.rst        |   7 -
 docs/source/api/evennia.locks.lockfuncs.rst   |   7 -
 docs/source/api/evennia.locks.lockhandler.rst |   7 -
 docs/source/api/evennia.locks.rst             |  15 -
 docs/source/api/evennia.objects.manager.rst   |   7 -
 docs/source/api/evennia.objects.models.rst    |   7 -
 docs/source/api/evennia.objects.objects.rst   |   7 -
 docs/source/api/evennia.objects.rst           |  16 -
 docs/source/api/evennia.prototypes.menus.rst  |   7 -
 .../api/evennia.prototypes.protfuncs.rst      |   7 -
 .../api/evennia.prototypes.prototypes.rst     |   7 -
 docs/source/api/evennia.prototypes.rst        |  17 -
 .../source/api/evennia.prototypes.spawner.rst |   7 -
 docs/source/api/evennia.rst                   |  32 --
 docs/source/api/evennia.scripts.manager.rst   |   7 -
 docs/source/api/evennia.scripts.models.rst    |   7 -
 .../api/evennia.scripts.monitorhandler.rst    |   7 -
 docs/source/api/evennia.scripts.rst           |  20 -
 .../api/evennia.scripts.scripthandler.rst     |   7 -
 docs/source/api/evennia.scripts.scripts.rst   |   7 -
 .../api/evennia.scripts.taskhandler.rst       |   7 -
 .../api/evennia.scripts.tickerhandler.rst     |   7 -
 docs/source/api/evennia.server.amp_client.rst |   7 -
 .../api/evennia.server.connection_wizard.rst  |   7 -
 .../api/evennia.server.deprecations.rst       |   7 -
 .../api/evennia.server.evennia_launcher.rst   |   7 -
 ...vennia.server.game_index_client.client.rst |   7 -
 .../api/evennia.server.game_index_client.rst  |  15 -
 ...ennia.server.game_index_client.service.rst |   7 -
 .../api/evennia.server.initial_setup.rst      |   7 -
 docs/source/api/evennia.server.inputfuncs.rst |   7 -
 docs/source/api/evennia.server.manager.rst    |   7 -
 docs/source/api/evennia.server.models.rst     |   7 -
 docs/source/api/evennia.server.portal.amp.rst |   7 -
 .../api/evennia.server.portal.amp_server.rst  |   7 -
 .../api/evennia.server.portal.grapevine.rst   |   7 -
 docs/source/api/evennia.server.portal.irc.rst |   7 -
 .../source/api/evennia.server.portal.mccp.rst |   7 -
 .../source/api/evennia.server.portal.mssp.rst |   7 -
 docs/source/api/evennia.server.portal.mxp.rst |   7 -
 .../source/api/evennia.server.portal.naws.rst |   7 -
 .../api/evennia.server.portal.portal.rst      |   7 -
 ...nia.server.portal.portalsessionhandler.rst |   7 -
 docs/source/api/evennia.server.portal.rss.rst |   7 -
 docs/source/api/evennia.server.portal.rst     |  34 --
 docs/source/api/evennia.server.portal.ssh.rst |   7 -
 docs/source/api/evennia.server.portal.ssl.rst |   7 -
 .../api/evennia.server.portal.suppress_ga.rst |   7 -
 .../api/evennia.server.portal.telnet.rst      |   7 -
 .../api/evennia.server.portal.telnet_oob.rst  |   7 -
 .../api/evennia.server.portal.telnet_ssl.rst  |   7 -
 .../api/evennia.server.portal.tests.rst       |   7 -
 .../api/evennia.server.portal.ttype.rst       |   7 -
 .../api/evennia.server.portal.webclient.rst   |   7 -
 .../evennia.server.portal.webclient_ajax.rst  |   7 -
 .../evennia.server.profiling.dummyrunner.rst  |   7 -
 ....server.profiling.dummyrunner_settings.rst |   7 -
 .../api/evennia.server.profiling.memplot.rst  |   7 -
 docs/source/api/evennia.server.profiling.rst  |  20 -
 ...vennia.server.profiling.settings_mixin.rst |   7 -
 .../evennia.server.profiling.test_queries.rst |   7 -
 .../api/evennia.server.profiling.tests.rst    |   7 -
 .../evennia.server.profiling.timetrace.rst    |   7 -
 docs/source/api/evennia.server.rst            |  37 --
 docs/source/api/evennia.server.server.rst     |   7 -
 .../api/evennia.server.serversession.rst      |   7 -
 docs/source/api/evennia.server.session.rst    |   7 -
 .../api/evennia.server.sessionhandler.rst     |   7 -
 docs/source/api/evennia.server.signals.rst    |   7 -
 docs/source/api/evennia.server.throttle.rst   |   7 -
 docs/source/api/evennia.server.validators.rst |   7 -
 docs/source/api/evennia.server.webserver.rst  |   7 -
 docs/source/api/evennia.settings_default.rst  |   7 -
 .../api/evennia.typeclasses.attributes.rst    |   7 -
 .../api/evennia.typeclasses.managers.rst      |   7 -
 .../source/api/evennia.typeclasses.models.rst |   7 -
 docs/source/api/evennia.typeclasses.rst       |  17 -
 docs/source/api/evennia.typeclasses.tags.rst  |   7 -
 docs/source/api/evennia.utils.ansi.rst        |   7 -
 .../api/evennia.utils.batchprocessors.rst     |   7 -
 docs/source/api/evennia.utils.containers.rst  |   7 -
 docs/source/api/evennia.utils.create.rst      |   7 -
 docs/source/api/evennia.utils.dbserialize.rst |   7 -
 docs/source/api/evennia.utils.eveditor.rst    |   7 -
 docs/source/api/evennia.utils.evform.rst      |   7 -
 docs/source/api/evennia.utils.evmenu.rst      |   7 -
 docs/source/api/evennia.utils.evmore.rst      |   7 -
 docs/source/api/evennia.utils.evtable.rst     |   7 -
 docs/source/api/evennia.utils.funcparser.rst  |   7 -
 docs/source/api/evennia.utils.gametime.rst    |   7 -
 .../api/evennia.utils.idmapper.manager.rst    |   7 -
 .../api/evennia.utils.idmapper.models.rst     |   7 -
 docs/source/api/evennia.utils.idmapper.rst    |  16 -
 .../api/evennia.utils.idmapper.tests.rst      |   7 -
 docs/source/api/evennia.utils.logger.rst      |   7 -
 .../api/evennia.utils.optionclasses.rst       |   7 -
 .../api/evennia.utils.optionhandler.rst       |   7 -
 docs/source/api/evennia.utils.picklefield.rst |   7 -
 docs/source/api/evennia.utils.rst             |  41 --
 docs/source/api/evennia.utils.search.rst      |   7 -
 .../api/evennia.utils.test_resources.rst      |   7 -
 docs/source/api/evennia.utils.text2html.rst   |   7 -
 docs/source/api/evennia.utils.utils.rst       |   7 -
 .../api/evennia.utils.validatorfuncs.rst      |   7 -
 ...ennia.utils.verb_conjugation.conjugate.rst |   7 -
 ...vennia.utils.verb_conjugation.pronouns.rst |   7 -
 .../api/evennia.utils.verb_conjugation.rst    |  16 -
 .../evennia.utils.verb_conjugation.tests.rst  |   7 -
 .../source/api/evennia.web.admin.accounts.rst |   7 -
 .../api/evennia.web.admin.attributes.rst      |   7 -
 docs/source/api/evennia.web.admin.comms.rst   |   7 -
 .../api/evennia.web.admin.frontpage.rst       |   7 -
 docs/source/api/evennia.web.admin.help.rst    |   7 -
 docs/source/api/evennia.web.admin.objects.rst |   7 -
 docs/source/api/evennia.web.admin.rst         |  24 -
 docs/source/api/evennia.web.admin.scripts.rst |   7 -
 docs/source/api/evennia.web.admin.server.rst  |   7 -
 docs/source/api/evennia.web.admin.tags.rst    |   7 -
 docs/source/api/evennia.web.admin.urls.rst    |   7 -
 docs/source/api/evennia.web.admin.utils.rst   |   7 -
 docs/source/api/evennia.web.api.filters.rst   |   7 -
 .../api/evennia.web.api.permissions.rst       |   7 -
 docs/source/api/evennia.web.api.root.rst      |   7 -
 docs/source/api/evennia.web.api.rst           |  20 -
 .../api/evennia.web.api.serializers.rst       |   7 -
 docs/source/api/evennia.web.api.tests.rst     |   7 -
 docs/source/api/evennia.web.api.urls.rst      |   7 -
 docs/source/api/evennia.web.api.views.rst     |   7 -
 docs/source/api/evennia.web.rst               |  25 -
 .../api/evennia.web.templatetags.addclass.rst |   7 -
 docs/source/api/evennia.web.templatetags.rst  |  14 -
 docs/source/api/evennia.web.urls.rst          |   7 -
 .../api/evennia.web.utils.adminsite.rst       |   7 -
 .../source/api/evennia.web.utils.backends.rst |   7 -
 .../api/evennia.web.utils.general_context.rst |   7 -
 .../api/evennia.web.utils.middleware.rst      |   7 -
 docs/source/api/evennia.web.utils.rst         |  18 -
 docs/source/api/evennia.web.utils.tests.rst   |   7 -
 docs/source/api/evennia.web.webclient.rst     |  15 -
 .../source/api/evennia.web.webclient.urls.rst |   7 -
 .../api/evennia.web.webclient.views.rst       |   7 -
 docs/source/api/evennia.web.website.forms.rst |   7 -
 docs/source/api/evennia.web.website.rst       |  22 -
 docs/source/api/evennia.web.website.tests.rst |   7 -
 docs/source/api/evennia.web.website.urls.rst  |   7 -
 .../evennia.web.website.views.accounts.rst    |   7 -
 .../evennia.web.website.views.channels.rst    |   7 -
 .../evennia.web.website.views.characters.rst  |   7 -
 .../api/evennia.web.website.views.errors.rst  |   7 -
 .../api/evennia.web.website.views.help.rst    |   7 -
 .../api/evennia.web.website.views.index.rst   |   7 -
 .../api/evennia.web.website.views.mixins.rst  |   7 -
 .../api/evennia.web.website.views.objects.rst |   7 -
 docs/source/api/evennia.web.website.views.rst |  21 -
 .../tutorials/evadventure/combat_turnbased.py |  10 +-
 .../tutorials/evadventure/equipment.py        |  31 +-
 .../tutorials/evadventure/tests/mixins.py     |   4 -
 .../evadventure/tests/test_equipment.py       |  58 +++
 423 files changed, 689 insertions(+), 3613 deletions(-)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Adding-Commands.md => Beginner-Tutorial-Adding-Commands.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Building-Quickstart.md => Beginner-Tutorial-Building-Quickstart.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Creating-Things.md => Beginner-Tutorial-Creating-Things.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Django-queries.md => Beginner-Tutorial-Django-queries.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Evennia-Library-Overview.md => Beginner-Tutorial-Evennia-Library-Overview.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Gamedir-Overview.md => Beginner-Tutorial-Gamedir-Overview.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Learning-Typeclasses.md => Beginner-Tutorial-Learning-Typeclasses.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{More-on-Commands.md => Beginner-Tutorial-More-on-Commands.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Python-basic-introduction.md => Beginner-Tutorial-Python-basic-introduction.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Searching-Things.md => Beginner-Tutorial-Searching-Things.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part1/{Tutorial-World.md => Beginner-Tutorial-Tutorial-World.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part2/{Game-Planning.md => Beginner-Tutorial-Game-Planning.md} (100%)
 rename docs/source/Howtos/Beginner-Tutorial/Part2/{Planning-The-Tutorial-Game.md => Beginner-Tutorial-Planning-The-Tutorial-Game.md} (99%)
 rename docs/source/Howtos/Beginner-Tutorial/Part2/{Planning-Where-Do-I-Begin.md => Beginner-Tutorial-Planning-Where-Do-I-Begin.md} (100%)
 delete mode 100644 docs/source/api/evennia-api.rst
 delete mode 100644 docs/source/api/evennia.accounts.accounts.rst
 delete mode 100644 docs/source/api/evennia.accounts.bots.rst
 delete mode 100644 docs/source/api/evennia.accounts.manager.rst
 delete mode 100644 docs/source/api/evennia.accounts.models.rst
 delete mode 100644 docs/source/api/evennia.accounts.rst
 delete mode 100644 docs/source/api/evennia.commands.cmdhandler.rst
 delete mode 100644 docs/source/api/evennia.commands.cmdparser.rst
 delete mode 100644 docs/source/api/evennia.commands.cmdset.rst
 delete mode 100644 docs/source/api/evennia.commands.cmdsethandler.rst
 delete mode 100644 docs/source/api/evennia.commands.command.rst
 delete mode 100644 docs/source/api/evennia.commands.default.account.rst
 delete mode 100644 docs/source/api/evennia.commands.default.admin.rst
 delete mode 100644 docs/source/api/evennia.commands.default.batchprocess.rst
 delete mode 100644 docs/source/api/evennia.commands.default.building.rst
 delete mode 100644 docs/source/api/evennia.commands.default.cmdset_account.rst
 delete mode 100644 docs/source/api/evennia.commands.default.cmdset_character.rst
 delete mode 100644 docs/source/api/evennia.commands.default.cmdset_session.rst
 delete mode 100644 docs/source/api/evennia.commands.default.cmdset_unloggedin.rst
 delete mode 100644 docs/source/api/evennia.commands.default.comms.rst
 delete mode 100644 docs/source/api/evennia.commands.default.general.rst
 delete mode 100644 docs/source/api/evennia.commands.default.help.rst
 delete mode 100644 docs/source/api/evennia.commands.default.muxcommand.rst
 delete mode 100644 docs/source/api/evennia.commands.default.rst
 delete mode 100644 docs/source/api/evennia.commands.default.syscommands.rst
 delete mode 100644 docs/source/api/evennia.commands.default.system.rst
 delete mode 100644 docs/source/api/evennia.commands.default.tests.rst
 delete mode 100644 docs/source/api/evennia.commands.default.unloggedin.rst
 delete mode 100644 docs/source/api/evennia.commands.rst
 delete mode 100644 docs/source/api/evennia.comms.comms.rst
 delete mode 100644 docs/source/api/evennia.comms.managers.rst
 delete mode 100644 docs/source/api/evennia.comms.models.rst
 delete mode 100644 docs/source/api/evennia.comms.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.awsstorage.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.awsstorage.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.building_menu.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.building_menu.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.color_markups.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.color_markups.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.component.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.dbfield.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.holder.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.signals.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.components.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.custom_gametime.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.email_login.email_login.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.email_login.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.email_login.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.commands.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.ingame_python.utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.menu_login.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.menu_login.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.unixcommand.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.unixcommand.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.room.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.state.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.full_systems.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.barter.barter.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.barter.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.barter.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.clothing.clothing.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.clothing.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.clothing.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.cooldowns.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.cooldowns.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.crafting.crafting.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.crafting.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.crafting.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.gendersub.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.gendersub.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.mail.mail.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.mail.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.mail.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.multidescer.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.multidescer.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.puzzles.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.puzzles.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.rst
 delete mode 100644 docs/source/api/evennia.contrib.game_systems.turnbattle.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.extended_room.extended_room.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.extended_room.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.extended_room.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.mapbuilder.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.mapbuilder.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.simpledoor.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.simpledoor.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.slow_exit.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.slow_exit.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.wilderness.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.wilderness.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.wilderness.wilderness.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.commands.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.example.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.xymap.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.rst
 delete mode 100644 docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.buffs.buff.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.buffs.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.buffs.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.dice.dice.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.dice.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.dice.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.health_bar.health_bar.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.health_bar.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.health_bar.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.rpsystem.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.rpsystem.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.traits.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.traits.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.rpg.traits.traits.rst
 delete mode 100644 docs/source/api/evennia.contrib.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.batchprocessor.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.bodyfunctions.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.build_world.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.characters.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.commands.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.enums.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.equipment.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.npcs.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.objects.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.quests.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.rooms.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.rules.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.shops.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.rst
 rename docs/source/api/{evennia.contrib.tutorials.evadventure.tests.test_dungeon.rst => evennia.contrib.tutorials.evadventure.tests.test_equipment.md} (66%)
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.evadventure.utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.mirror.mirror.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.mirror.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.red_button.red_button.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.red_button.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.talking_npc.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.talking_npc.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.rst
 delete mode 100644 docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.auditing.outputs.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.auditing.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.auditing.server.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.auditing.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.fieldfill.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.random_string_generator.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.random_string_generator.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.tree_select.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.tree_select.tests.rst
 delete mode 100644 docs/source/api/evennia.contrib.utils.tree_select.tree_select.rst
 delete mode 100644 docs/source/api/evennia.help.filehelp.rst
 delete mode 100644 docs/source/api/evennia.help.manager.rst
 delete mode 100644 docs/source/api/evennia.help.models.rst
 delete mode 100644 docs/source/api/evennia.help.rst
 delete mode 100644 docs/source/api/evennia.help.utils.rst
 delete mode 100644 docs/source/api/evennia.locks.lockfuncs.rst
 delete mode 100644 docs/source/api/evennia.locks.lockhandler.rst
 delete mode 100644 docs/source/api/evennia.locks.rst
 delete mode 100644 docs/source/api/evennia.objects.manager.rst
 delete mode 100644 docs/source/api/evennia.objects.models.rst
 delete mode 100644 docs/source/api/evennia.objects.objects.rst
 delete mode 100644 docs/source/api/evennia.objects.rst
 delete mode 100644 docs/source/api/evennia.prototypes.menus.rst
 delete mode 100644 docs/source/api/evennia.prototypes.protfuncs.rst
 delete mode 100644 docs/source/api/evennia.prototypes.prototypes.rst
 delete mode 100644 docs/source/api/evennia.prototypes.rst
 delete mode 100644 docs/source/api/evennia.prototypes.spawner.rst
 delete mode 100644 docs/source/api/evennia.rst
 delete mode 100644 docs/source/api/evennia.scripts.manager.rst
 delete mode 100644 docs/source/api/evennia.scripts.models.rst
 delete mode 100644 docs/source/api/evennia.scripts.monitorhandler.rst
 delete mode 100644 docs/source/api/evennia.scripts.rst
 delete mode 100644 docs/source/api/evennia.scripts.scripthandler.rst
 delete mode 100644 docs/source/api/evennia.scripts.scripts.rst
 delete mode 100644 docs/source/api/evennia.scripts.taskhandler.rst
 delete mode 100644 docs/source/api/evennia.scripts.tickerhandler.rst
 delete mode 100644 docs/source/api/evennia.server.amp_client.rst
 delete mode 100644 docs/source/api/evennia.server.connection_wizard.rst
 delete mode 100644 docs/source/api/evennia.server.deprecations.rst
 delete mode 100644 docs/source/api/evennia.server.evennia_launcher.rst
 delete mode 100644 docs/source/api/evennia.server.game_index_client.client.rst
 delete mode 100644 docs/source/api/evennia.server.game_index_client.rst
 delete mode 100644 docs/source/api/evennia.server.game_index_client.service.rst
 delete mode 100644 docs/source/api/evennia.server.initial_setup.rst
 delete mode 100644 docs/source/api/evennia.server.inputfuncs.rst
 delete mode 100644 docs/source/api/evennia.server.manager.rst
 delete mode 100644 docs/source/api/evennia.server.models.rst
 delete mode 100644 docs/source/api/evennia.server.portal.amp.rst
 delete mode 100644 docs/source/api/evennia.server.portal.amp_server.rst
 delete mode 100644 docs/source/api/evennia.server.portal.grapevine.rst
 delete mode 100644 docs/source/api/evennia.server.portal.irc.rst
 delete mode 100644 docs/source/api/evennia.server.portal.mccp.rst
 delete mode 100644 docs/source/api/evennia.server.portal.mssp.rst
 delete mode 100644 docs/source/api/evennia.server.portal.mxp.rst
 delete mode 100644 docs/source/api/evennia.server.portal.naws.rst
 delete mode 100644 docs/source/api/evennia.server.portal.portal.rst
 delete mode 100644 docs/source/api/evennia.server.portal.portalsessionhandler.rst
 delete mode 100644 docs/source/api/evennia.server.portal.rss.rst
 delete mode 100644 docs/source/api/evennia.server.portal.rst
 delete mode 100644 docs/source/api/evennia.server.portal.ssh.rst
 delete mode 100644 docs/source/api/evennia.server.portal.ssl.rst
 delete mode 100644 docs/source/api/evennia.server.portal.suppress_ga.rst
 delete mode 100644 docs/source/api/evennia.server.portal.telnet.rst
 delete mode 100644 docs/source/api/evennia.server.portal.telnet_oob.rst
 delete mode 100644 docs/source/api/evennia.server.portal.telnet_ssl.rst
 delete mode 100644 docs/source/api/evennia.server.portal.tests.rst
 delete mode 100644 docs/source/api/evennia.server.portal.ttype.rst
 delete mode 100644 docs/source/api/evennia.server.portal.webclient.rst
 delete mode 100644 docs/source/api/evennia.server.portal.webclient_ajax.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.dummyrunner.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.dummyrunner_settings.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.memplot.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.settings_mixin.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.test_queries.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.tests.rst
 delete mode 100644 docs/source/api/evennia.server.profiling.timetrace.rst
 delete mode 100644 docs/source/api/evennia.server.rst
 delete mode 100644 docs/source/api/evennia.server.server.rst
 delete mode 100644 docs/source/api/evennia.server.serversession.rst
 delete mode 100644 docs/source/api/evennia.server.session.rst
 delete mode 100644 docs/source/api/evennia.server.sessionhandler.rst
 delete mode 100644 docs/source/api/evennia.server.signals.rst
 delete mode 100644 docs/source/api/evennia.server.throttle.rst
 delete mode 100644 docs/source/api/evennia.server.validators.rst
 delete mode 100644 docs/source/api/evennia.server.webserver.rst
 delete mode 100644 docs/source/api/evennia.settings_default.rst
 delete mode 100644 docs/source/api/evennia.typeclasses.attributes.rst
 delete mode 100644 docs/source/api/evennia.typeclasses.managers.rst
 delete mode 100644 docs/source/api/evennia.typeclasses.models.rst
 delete mode 100644 docs/source/api/evennia.typeclasses.rst
 delete mode 100644 docs/source/api/evennia.typeclasses.tags.rst
 delete mode 100644 docs/source/api/evennia.utils.ansi.rst
 delete mode 100644 docs/source/api/evennia.utils.batchprocessors.rst
 delete mode 100644 docs/source/api/evennia.utils.containers.rst
 delete mode 100644 docs/source/api/evennia.utils.create.rst
 delete mode 100644 docs/source/api/evennia.utils.dbserialize.rst
 delete mode 100644 docs/source/api/evennia.utils.eveditor.rst
 delete mode 100644 docs/source/api/evennia.utils.evform.rst
 delete mode 100644 docs/source/api/evennia.utils.evmenu.rst
 delete mode 100644 docs/source/api/evennia.utils.evmore.rst
 delete mode 100644 docs/source/api/evennia.utils.evtable.rst
 delete mode 100644 docs/source/api/evennia.utils.funcparser.rst
 delete mode 100644 docs/source/api/evennia.utils.gametime.rst
 delete mode 100644 docs/source/api/evennia.utils.idmapper.manager.rst
 delete mode 100644 docs/source/api/evennia.utils.idmapper.models.rst
 delete mode 100644 docs/source/api/evennia.utils.idmapper.rst
 delete mode 100644 docs/source/api/evennia.utils.idmapper.tests.rst
 delete mode 100644 docs/source/api/evennia.utils.logger.rst
 delete mode 100644 docs/source/api/evennia.utils.optionclasses.rst
 delete mode 100644 docs/source/api/evennia.utils.optionhandler.rst
 delete mode 100644 docs/source/api/evennia.utils.picklefield.rst
 delete mode 100644 docs/source/api/evennia.utils.rst
 delete mode 100644 docs/source/api/evennia.utils.search.rst
 delete mode 100644 docs/source/api/evennia.utils.test_resources.rst
 delete mode 100644 docs/source/api/evennia.utils.text2html.rst
 delete mode 100644 docs/source/api/evennia.utils.utils.rst
 delete mode 100644 docs/source/api/evennia.utils.validatorfuncs.rst
 delete mode 100644 docs/source/api/evennia.utils.verb_conjugation.conjugate.rst
 delete mode 100644 docs/source/api/evennia.utils.verb_conjugation.pronouns.rst
 delete mode 100644 docs/source/api/evennia.utils.verb_conjugation.rst
 delete mode 100644 docs/source/api/evennia.utils.verb_conjugation.tests.rst
 delete mode 100644 docs/source/api/evennia.web.admin.accounts.rst
 delete mode 100644 docs/source/api/evennia.web.admin.attributes.rst
 delete mode 100644 docs/source/api/evennia.web.admin.comms.rst
 delete mode 100644 docs/source/api/evennia.web.admin.frontpage.rst
 delete mode 100644 docs/source/api/evennia.web.admin.help.rst
 delete mode 100644 docs/source/api/evennia.web.admin.objects.rst
 delete mode 100644 docs/source/api/evennia.web.admin.rst
 delete mode 100644 docs/source/api/evennia.web.admin.scripts.rst
 delete mode 100644 docs/source/api/evennia.web.admin.server.rst
 delete mode 100644 docs/source/api/evennia.web.admin.tags.rst
 delete mode 100644 docs/source/api/evennia.web.admin.urls.rst
 delete mode 100644 docs/source/api/evennia.web.admin.utils.rst
 delete mode 100644 docs/source/api/evennia.web.api.filters.rst
 delete mode 100644 docs/source/api/evennia.web.api.permissions.rst
 delete mode 100644 docs/source/api/evennia.web.api.root.rst
 delete mode 100644 docs/source/api/evennia.web.api.rst
 delete mode 100644 docs/source/api/evennia.web.api.serializers.rst
 delete mode 100644 docs/source/api/evennia.web.api.tests.rst
 delete mode 100644 docs/source/api/evennia.web.api.urls.rst
 delete mode 100644 docs/source/api/evennia.web.api.views.rst
 delete mode 100644 docs/source/api/evennia.web.rst
 delete mode 100644 docs/source/api/evennia.web.templatetags.addclass.rst
 delete mode 100644 docs/source/api/evennia.web.templatetags.rst
 delete mode 100644 docs/source/api/evennia.web.urls.rst
 delete mode 100644 docs/source/api/evennia.web.utils.adminsite.rst
 delete mode 100644 docs/source/api/evennia.web.utils.backends.rst
 delete mode 100644 docs/source/api/evennia.web.utils.general_context.rst
 delete mode 100644 docs/source/api/evennia.web.utils.middleware.rst
 delete mode 100644 docs/source/api/evennia.web.utils.rst
 delete mode 100644 docs/source/api/evennia.web.utils.tests.rst
 delete mode 100644 docs/source/api/evennia.web.webclient.rst
 delete mode 100644 docs/source/api/evennia.web.webclient.urls.rst
 delete mode 100644 docs/source/api/evennia.web.webclient.views.rst
 delete mode 100644 docs/source/api/evennia.web.website.forms.rst
 delete mode 100644 docs/source/api/evennia.web.website.rst
 delete mode 100644 docs/source/api/evennia.web.website.tests.rst
 delete mode 100644 docs/source/api/evennia.web.website.urls.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.accounts.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.channels.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.characters.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.errors.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.help.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.index.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.mixins.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.objects.rst
 delete mode 100644 docs/source/api/evennia.web.website.views.rst
 create mode 100644 evennia/contrib/tutorials/evadventure/tests/test_equipment.py

diff --git a/docs/source/Coding/Coding-Introduction.md b/docs/source/Coding/Coding-Introduction.md
index b6aca1e59b..8e43cbc43b 100644
--- a/docs/source/Coding/Coding-Introduction.md
+++ b/docs/source/Coding/Coding-Introduction.md
@@ -14,7 +14,7 @@ you only the beginning or some part of it, it covers much of the things needed t
 
 Evennia is developed using Python. Even if you are more of a designer than a coder, it is wise to
 learn how to read and understand basic Python code. If you are new to Python, or need a refresher,
-take a look at our [Python introduction](../Howtos/Beginner-Tutorial/Part1/Python-basic-introduction.md).
+take a look at our [Python introduction](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Python-basic-introduction.md).
 
 ## Explore Evennia interactively
 
@@ -91,7 +91,7 @@ using such a checker can be a good start to weed out the simple problems.
 
 ## Plan before you code
 
-Before you start coding away at your dream game, take a look at our [Game Planning](../Howtos/Beginner-Tutorial/Part2/Game-Planning.md)
+Before you start coding away at your dream game, take a look at our [Game Planning](../Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Game-Planning.md)
 page. It might hopefully help you avoid some common pitfalls and time sinks.
 
 ## Code in your game folder, not in the evennia/ repository
diff --git a/docs/source/Components/Command-Sets.md b/docs/source/Components/Command-Sets.md
index 1f98839bb4..22c8bdbd91 100644
--- a/docs/source/Components/Command-Sets.md
+++ b/docs/source/Components/Command-Sets.md
@@ -26,7 +26,7 @@ on. The tutorial world included with Evennia showcases a dark room that replaces
 commands with its own versions because the Character cannot see.
 
 If you want a quick start into defining your first commands and using them with command sets, you
-can head over to the [Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Adding-Commands.md) which steps through things
+can head over to the [Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md) which steps through things
 without the explanations.
 
 ## Defining Command Sets
@@ -112,7 +112,7 @@ back even if all other cmdsets fail or are removed. It is always persistent and
 by `cmdset.delete()`. To remove a default cmdset you must explicitly call `cmdset.remove_default()`.
 
 Command sets are often added to an object in its `at_object_creation` method. For more examples of
-adding commands, read the [Step by step tutorial](../Howtos/Beginner-Tutorial/Part1/Adding-Commands.md). Generally you can
+adding commands, read the [Step by step tutorial](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md). Generally you can
 customize which command sets are added to your objects by using `self.cmdset.add()` or
 `self.cmdset.add_default()`.
 
diff --git a/docs/source/Components/Command-System.md b/docs/source/Components/Command-System.md
index db13dbd69b..c5ce240427 100644
--- a/docs/source/Components/Command-System.md
+++ b/docs/source/Components/Command-System.md
@@ -6,4 +6,4 @@
 
 See also:
 - [Default Commands](./Default-Commands.md)
-- [Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Adding-Commands.md)
+- [Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md)
diff --git a/docs/source/Components/Commands.md b/docs/source/Components/Commands.md
index 328144650d..d172abb730 100644
--- a/docs/source/Components/Commands.md
+++ b/docs/source/Components/Commands.md
@@ -29,7 +29,7 @@ object in various ways. Consider a "Tree" object with a cmdset defining the comm
 
 This page goes into full detail about how to use Commands. To fully use them you must also read the
 page detailing [Command Sets](./Command-Sets.md).  There is also a step-by-step
-[Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Adding-Commands.md) that will get you started quickly without the
+[Adding Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md) that will get you started quickly without the
 extra explanations.
 
 ## Defining Commands
diff --git a/docs/source/Evennia-Introduction.md b/docs/source/Evennia-Introduction.md
index 3e8ab813cf..843a9eaf51 100644
--- a/docs/source/Evennia-Introduction.md
+++ b/docs/source/Evennia-Introduction.md
@@ -49,7 +49,7 @@ connect to the demo via your telnet client you can do so at `demo.evennia.com`,
 
 Once you installed Evennia yourself it comes with its own tutorial - this shows off some of the
 possibilities _and_ gives you a small single-player quest to play. The tutorial takes only one
-single in-game command to install as explained [here](Howtos/Beginner-Tutorial/Part1/Tutorial-World.md).
+single in-game command to install as explained [here](Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md).
 
 ## What you need to know to work with Evennia
 
@@ -72,7 +72,7 @@ online](https://github.com/evennia/evennia). We also have a comprehensive [onlin
 manual](https://evennia.com/docs) with lots of examples. But while Python is
 considered a very easy programming language to get into, you do have a learning curve to climb if
 you are new to programming. Evennia's [Starting-tutorial](Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Part1-Intro.md) has a [basic introduction
-to Python](Howtos/Beginner-Tutorial/Part1/Python-basic-introduction.md) but you should probably also sit down 
+to Python](Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Python-basic-introduction.md) but you should probably also sit down 
 with a full Python beginner's tutorial at some point (there are plenty of them on
 the web if you look around). See also our [link
 page](./Links.md) for some reading suggestions. To efficiently code your dream game in
@@ -124,7 +124,7 @@ chat](https://webchat.freenode.net/?channels=evennia&uio=MT1mYWxzZSY5PXRydWUmMTE
 on IRC. This allows you to chat directly with other developers new and old as well as with the devs
 of Evennia itself. This chat is logged (you can find links on https://www.evennia.com) and can also
 be searched from the same place for discussion topics you are interested in.
-2. Read the [Game Planning](Howtos/Beginner-Tutorial/Part2/Game-Planning.md) wiki page. It gives some ideas for your work flow and the
+2. Read the [Game Planning](Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Game-Planning.md) wiki page. It gives some ideas for your work flow and the
 state of mind you should aim for - including cutting down the scope of your game for its first
 release.
 3. Do the [Tutorial for basic MUSH-like game](Howtos/Tutorial-for-basic-MUSH-like-game.md) carefully from
diff --git a/docs/source/Glossary.md b/docs/source/Glossary.md
index 304733dd4f..ad08a0e45f 100644
--- a/docs/source/Glossary.md
+++ b/docs/source/Glossary.md
@@ -100,7 +100,7 @@ There is usually no need to know the details of Django's database handling in or
 it will handle most of the complexity for you under the hood using what we call
 [typeclasses](./Glossary.md#typeclass). But should you need the power of Django you can always get it.
 Most commonly people want to use "raw" Django when doing more advanced/custom database queries than
-offered by Evennia's [default search functions](Howtos/Beginner-Tutorial/Part1/Searching-Things.md). One will then need
+offered by Evennia's [default search functions](Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Searching-Things.md). One will then need
 to read about Django's _querysets_. Querysets are Python method calls on a special form that lets
 you build complex queries. They get converted into optimized SQL queries under the hood, suitable
 for your current database. [Here is our tutorial/explanation of Django queries](Tutorial-Searching-
diff --git a/docs/source/Howtos/A-Sittable-Object.md b/docs/source/Howtos/A-Sittable-Object.md
index 5dfc9d081c..49d13014b3 100644
--- a/docs/source/Howtos/A-Sittable-Object.md
+++ b/docs/source/Howtos/A-Sittable-Object.md
@@ -753,7 +753,7 @@ class CmdStand2(Command):
 ```
 
 This forced us to to use the full power of the `caller.search` method. If we wanted to search for something
-more complex we would likely need to break out a [Django query](Beginner-Tutorial/Part1/Django-queries.md) to do it. The key here is that
+more complex we would likely need to break out a [Django query](Beginner-Tutorial/Part1/Beginner-Tutorial-Django-queries.md) to do it. The key here is that
 we know that the object we are looking for is a `Sittable` and that it must have an Attribute named `sitter`
 which should be set to us, the one sitting on/in the thing. Once we have that we just call `.do_stand` on it
 and let the Typeclass handle the rest.
diff --git a/docs/source/Howtos/Arxcode-Installation.md b/docs/source/Howtos/Arxcode-Installation.md
index 24ec39c62c..0d923827d5 100644
--- a/docs/source/Howtos/Arxcode-Installation.md
+++ b/docs/source/Howtos/Arxcode-Installation.md
@@ -54,7 +54,7 @@ A new folder `myarx` should appear next to the ones you already had. You could r
 something else if you want.
 
 `cd` into `myarx`. If you wonder about the structure of the game dir, you can
-[read more about it here](Beginner-Tutorial/Part1/Gamedir-Overview.md).
+[read more about it here](Beginner-Tutorial/Part1/Beginner-Tutorial-Gamedir-Overview.md).
 
 ### Clean up settings
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Adding-Commands.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Adding-Commands.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md
index 404f252b5f..c8d3cce659 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Adding-Commands.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md
@@ -181,7 +181,7 @@ class CmdEcho(Command):
 First we added a docstring. This is always a good thing to do in general, but for a Command class, it will also
 automatically become the in-game help entry! Next we add the `func` method. It has one active line where it
 makes use of some of those variables we found the Command offers to us. If you did the
-[basic Python tutorial](./Python-basic-introduction.md), you will recognize `.msg` - this will send a message
+[basic Python tutorial](./Beginner-Tutorial-Python-basic-introduction.md), you will recognize `.msg` - this will send a message
 to the object it is attached to us - in this case `self.caller`, that is, us. We grab `self.args` and includes
 that in the message.
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Building-Quickstart.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Building-Quickstart.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Building-Quickstart.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Building-Quickstart.md
index c1f8daa202..bb3cc35fac 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Building-Quickstart.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Building-Quickstart.md
@@ -149,7 +149,7 @@ the raw description of your current room (including color codes), so that you ca
 set its description to something else.
 
 You create new Commands (or modify existing ones) in Python outside the game. We will get to that
-later, in the [Commands tutorial](./Adding-Commands.md).
+later, in the [Commands tutorial](./Beginner-Tutorial-Adding-Commands.md).
 
 ## Get a Personality
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Creating-Things.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Creating-Things.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Creating-Things.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Creating-Things.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Django-queries.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Django-queries.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Django-queries.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Django-queries.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Evennia-Library-Overview.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Evennia-Library-Overview.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Evennia-Library-Overview.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Evennia-Library-Overview.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Gamedir-Overview.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Gamedir-Overview.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Gamedir-Overview.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Gamedir-Overview.md
index 834fa3f546..dfbda6a446 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Gamedir-Overview.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Gamedir-Overview.md
@@ -200,7 +200,7 @@ people change and re-structure this in various ways to better fit their ideas.
 
 - [batch_cmds.ev](github:evennia/game_template/world/batch_cmds.ev) - This is an `.ev` file, which is essentially
     just a list of Evennia commands to execute in sequence. This one is empty and ready to expand on. The 
-    [Tutorial World](./Tutorial-World.md) was built with such a batch-file.
+    [Tutorial World](./Beginner-Tutorial-Tutorial-World.md) was built with such a batch-file.
 - [prototypes.py](github:evennia/game_template/world/prototypes.py) - A [prototype](../../../Components/Prototypes.md) is a way
     to easily vary objects without changing their base typeclass. For example, one could use prototypes to 
     tell that Two goblins, while both of the class 'Goblin' (so they follow the same code logic), should have different 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Learning-Typeclasses.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Learning-Typeclasses.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Learning-Typeclasses.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Learning-Typeclasses.md
index ec48e49845..95e146a3f6 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Learning-Typeclasses.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Learning-Typeclasses.md
@@ -251,7 +251,7 @@ You are specifying exactly which typeclass you want to use to build the Giantess
      desc = You see nothing special. 
     ------------------------------------------------------------------------------- 
 
-We used the `examine` command briefly in the [lesson about building in-game](./Building-Quickstart.md). Now these lines
+We used the `examine` command briefly in the [lesson about building in-game](./Beginner-Tutorial-Building-Quickstart.md). Now these lines
 may be more useful to us:
 - **Name/key** - The name of this thing. The value `(#14)` is probably different for you. This is the 
     unique 'primary key' or _dbref_ for this entity in the database.
@@ -357,7 +357,7 @@ You got a lot longer output this time. You have a lot more going on than a simpl
 - **Session id(s)**: This identifies the _Session_ (that is, the individual connection to a player's game client).
 - **Account** shows, well the `Account` object associated with this Character and Session.
 - **Stored/Merged Cmdsets** and **Commands available** is related to which _Commands_ are stored on you. We will
-    get to them in the [next lesson](./Adding-Commands.md). For now it's enough to know these consitute all the 
+    get to them in the [next lesson](./Beginner-Tutorial-Adding-Commands.md). For now it's enough to know these consitute all the 
     commands available to you at a given moment. 
 - **Non-Persistent attributes** are Attributes that are only stored temporarily and will go away on next reload.
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/More-on-Commands.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-More-on-Commands.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/More-on-Commands.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-More-on-Commands.md
index 92b8f00f4b..100c23515b 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/More-on-Commands.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-More-on-Commands.md
@@ -143,8 +143,8 @@ change (no code changed, only stuff in the database).
 ## Adding a Command to an object
 
 The commands of a cmdset attached to an object with `obj.cmdset.add()` will by default be made available to that object
-but _also to those in the same location as that object_. If you did the [Building introduction](./Building-Quickstart.md)
-you've seen an example of this with the "Red Button" object. The [Tutorial world](./Tutorial-World.md)
+but _also to those in the same location as that object_. If you did the [Building introduction](./Beginner-Tutorial-Building-Quickstart.md)
+you've seen an example of this with the "Red Button" object. The [Tutorial world](./Beginner-Tutorial-Tutorial-World.md)
 also has many examples of objects with commands on them.
 
 To show how this could work, let's put our 'hit' Command on our simple `sword` object from the previous section.
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Part1-Intro.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Part1-Intro.md
index 483b35d92b..7d9cd186b5 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Part1-Intro.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Part1-Intro.md
@@ -30,18 +30,18 @@ these concepts in the context of Evennia before.
 :maxdepth: 1
 :numbered:
 
-Building-Quickstart
-Tutorial-World
-Python-basic-introduction
-Gamedir-Overview
-Python-classes-and-objects
-Evennia-Library-Overview
-Learning-Typeclasses
-Adding-Commands
-More-on-Commands
-Creating-Things
-Searching-Things
-Django-queries
+Beginner-Tutorial-Building-Quickstart
+Beginner-Tutorial-Tutorial-World
+Beginner-Tutorial-Python-basic-introduction
+Beginner-Tutorial-Gamedir-Overview
+Beginner-Tutorial-Python-classes-and-objects
+Beginner-Tutorial-Evennia-Library-Overview
+Beginner-Tutorial-Learning-Typeclasses
+Beginner-Tutorial-Adding-Commands
+Beginner-Tutorial-More-on-Commands
+Beginner-Tutorial-Creating-Things
+Beginner-Tutorial-Searching-Things
+Beginner-Tutorial-Django-queries
 
 ```
 
@@ -50,17 +50,17 @@ Django-queries
 ```{toctree}
 :maxdepth: 2
 
-Building-Quickstart
-Tutorial-World
-Python-basic-introduction
-Gamedir-Overview
-Python-classes-and-objects
-Evennia-Library-Overview
-Learning-Typeclasses
-Adding-Commands
-More-on-Commands
-Creating-Things
-Searching-Things
-Django-queries
+Beginner-Tutorial-Building-Quickstart
+Beginner-Tutorial-Tutorial-World
+Beginner-Tutorial-Python-basic-introduction
+Beginner-Tutorial-Gamedir-Overview
+Beginner-Tutorial-Python-classes-and-objects
+Beginner-Tutorial-Evennia-Library-Overview
+Beginner-Tutorial-Learning-Typeclasses
+Beginner-Tutorial-Adding-Commands
+Beginner-Tutorial-More-on-Commands
+Beginner-Tutorial-Creating-Things
+Beginner-Tutorial-Searching-Things
+Beginner-Tutorial-Django-queries
 
 ```
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Python-basic-introduction.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Python-basic-introduction.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Python-basic-introduction.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Python-basic-introduction.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Searching-Things.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Searching-Things.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Searching-Things.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Searching-Things.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Tutorial-World.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part1/Tutorial-World.md
rename to docs/source/Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part1/Python-classes-and-objects.md b/docs/source/Howtos/Beginner-Tutorial/Part1/Python-classes-and-objects.md
index 55e21357e7..4a1512fc42 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part1/Python-classes-and-objects.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part1/Python-classes-and-objects.md
@@ -93,7 +93,7 @@ The form `from ... import ... as ...` renames the import.
 > Avoid renaming unless it's to avoid a name-collistion like above - you want to make things as
 > easy to read as possible, and renaming adds another layer of potential confusion.
 
-In [the basic intro to Python](./Python-basic-introduction.md) we learned how to open the in-game
+In [the basic intro to Python](./Beginner-Tutorial-Python-basic-introduction.md) we learned how to open the in-game
 multi-line interpreter.
 
     > py
@@ -153,7 +153,7 @@ Next we have a `class` named `Object`, which _inherits_ from `DefaultObject`. Th
 actually do anything on its own, its only code (except the docstring) is `pass` which means,
 well, to pass and don't do anything.
 
-We will get back to this module in the [next lesson](./Learning-Typeclasses.md). First we need to do a
+We will get back to this module in the [next lesson](./Beginner-Tutorial-Learning-Typeclasses.md). First we need to do a
 little detour to understand what a 'class', an 'object' or 'instance' is. These are fundamental
 things to understand before you can use Evennia efficiently.
 ```{sidebar} OOP
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part2/Game-Planning.md b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Game-Planning.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part2/Game-Planning.md
rename to docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Game-Planning.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Part2-Intro.md b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Part2-Intro.md
index fc14f46a71..f1c357549b 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Part2-Intro.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Part2-Intro.md
@@ -29,16 +29,16 @@ and "what to think about" when creating a multiplayer online text game.
 ```{toctree}
 :maxdepth: 1
 
-Planning-Where-Do-I-Begin.md
-Game-Planning.md
-Planning-The-Tutorial-Game.md
+Beginner-Tutorial-Planning-Where-Do-I-Begin.md
+Beginner-Tutorial-Game-Planning.md
+Beginner-Tutorial-Planning-The-Tutorial-Game.md
 ```
 
 ## Table of Contents
 
 ```{toctree}
 
-Planning-Where-Do-I-Begin.md
-Game-Planning.md
-Planning-The-Tutorial-Game.md
+Beginner-Tutorial-Planning-Where-Do-I-Begin.md
+Beginner-Tutorial-Game-Planning.md
+Beginner-Tutorial-Planning-The-Tutorial-Game.md
 ```
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part2/Planning-The-Tutorial-Game.md b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Planning-The-Tutorial-Game.md
similarity index 99%
rename from docs/source/Howtos/Beginner-Tutorial/Part2/Planning-The-Tutorial-Game.md
rename to docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Planning-The-Tutorial-Game.md
index f73a41b566..48b87b4777 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part2/Planning-The-Tutorial-Game.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Planning-The-Tutorial-Game.md
@@ -32,7 +32,7 @@ Here's an overview of the topside camp for inspiration (quickly thrown together
 
 ![Last Step Camp](../../../_static/images/starting_tutorial/Dungeon_Merchant_Camp.jpg)
 
-For the rest of this lesson we'll answer and reason around the specific questions posed in the previous [Game Planning](./Game-Planning.md) lesson.
+For the rest of this lesson we'll answer and reason around the specific questions posed in the previous [Game Planning](./Beginner-Tutorial-Game-Planning.md) lesson.
 
 ## Administration
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part2/Planning-Where-Do-I-Begin.md b/docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Planning-Where-Do-I-Begin.md
similarity index 100%
rename from docs/source/Howtos/Beginner-Tutorial/Part2/Planning-Where-Do-I-Begin.md
rename to docs/source/Howtos/Beginner-Tutorial/Part2/Beginner-Tutorial-Planning-Where-Do-I-Begin.md
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Characters.md b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Characters.md
index ee7b053338..eb8b2f9baf 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Characters.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Characters.md
@@ -276,6 +276,34 @@ class EvAdventureRollEngine:
                 # ... 
 ```
 
+## Connecting the Character with Evennia 
+
+You can easily make yourself an `EvAdventureCharacter` in-game by using the 
+`type` command: 
+
+    type self = evadventure.characters.EvAdventureCharacter
+
+You can now do `examine self` to check your type updated. 
+
+If you want _all_ new Characters to be of this type you need to tell Evennia about it. Evennia 
+uses a global setting `BASE_CHARACTER_TYPECLASS` to know which typeclass to use when creating 
+Characters (when logging in, for example). This defaults to `typeclasses.characters.Character` (that is,
+the `Character` class in `mygame/typeclasses/characters.py`). 
+
+There are thus two ways to weave your new Character class into Evennia: 
+
+1. Change `mygame/server/conf/settings.py` and add `BASE_CHARACTER_CLASS = "evadventure.characters.EvAdventureCharacter"`.
+2. Or, change `typeclasses.characters.Character` to inherit from `EvAdventureCharacter`. 
+
+You must always reload the server for changes like this to take effect.
+
+```{important}
+In this tutorial we are making all changes in a folder `mygame/evadventure/`. This means we can isolate 
+our code but means we need to do some extra steps to tie the character (and other objects) into Evennia. 
+For your own game it would be just fine to start editing `mygame/typeclasses/characters.py` directly 
+instead.
+```
+
 
 ## Unit Testing 
 
@@ -329,6 +357,34 @@ For running the tests you do:
 
      evennia test --settings settings.py .evadventure.tests.test_character
 
+
+## About races and classes 
+
+_Knave_ doesn't have any D&D-style _classes_ (like Thief, Fighter etc). It also does not bother with 
+_races_ (like dwarves, elves etc). This makes the tutorial shorter, but you may ask yourself how you'd 
+add these functions. 
+
+In the framework we have sketched out for _Knave_, it would be simple - you'd add your race/class as 
+an Attribute on your Character: 
+
+```python
+# mygame/evadventure/characters.py
+
+from evennia import DefaultCharacter, AttributeProperty
+# ... 
+
+class EvAdventureCharacter(LivingMixin, DefaultCharacter):
+    
+    # ... 
+
+    charclass = AttributeProperty("Fighter")
+    charrace = AttributeProperty("Human")
+
+```
+We use `charclass` rather than `class` here, because `class` is a reserved Python keyword. Naming 
+`race` as `charrace` thus matches in style.
+
+
 ## Summary
 
 
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Equipment.md b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Equipment.md
index de28f42575..b1c6bcaa49 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Equipment.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Equipment.md
@@ -32,14 +32,13 @@ The BACKPACK is special - it contains any number of items (up to the maximum slo
 
 > Create a new module `mygame/evadventure/equipment.py`.
 
-In default Evennia, everything you pick up will end up "inside" your character object (that is, have
-you as its `.location`). This is called your _inventory_ and has no limit. We will keep 'moving items into us'
-when we pick them up, but we will add more functionality using an _Equipment handler_.
-
 ```{sidebar}
 If you want to understand more about behind how Evennia uses handlers, there is a 
 [dedicated tutorial](../../Tutorial-Persistent-Handler.md) talking about the principle.
 ```
+In default Evennia, everything you pick up will end up "inside" your character object (that is, have
+you as its `.location`). This is called your _inventory_ and has no limit. We will keep 'moving items into us'
+when we pick them up, but we will add more functionality using an _Equipment handler_.
 
 A handler is (for our purposes) an object that sits "on" another entity, containing functionality 
 for doing one specific thing (managing equipment, in our case).
@@ -101,13 +100,14 @@ class EvAdventureCharacter(LivingMixin, DefaultCharacter):
         return EquipmentHandler(self)
 ```
 
-After reloading the server, the equipment-handler will now be accessible on the character as
+After reloading the server, the equipment-handler will now be accessible on character-instances as
 
     character.equipment
 
-The `@lazy_property` works such that it will not load the handler until it is first accessed. When that 
-happens, we start up the handler and feed it `self` (the Character itself). This is what enters `__init__`
-as `.obj` in the `EquipmentHandler` code above.
+The `@lazy_property` works such that it will not load the handler until someone actually tries to 
+fetch it with `character.equipment`. When that 
+happens, we start up the handler and feed it `self` (the `Character` instance itself). This is what 
+enters `__init__` as `.obj` in the `EquipmentHandler` code above.
 
 So we now have a handler on the character, and the handler has a back-reference to the character it sits
 on. 
@@ -125,9 +125,36 @@ have one item except `WieldLocation.BACKPACK`, which is a list.
 
 ## Connecting the EquipmentHandler
 
-We already made `EquipmentHandler` available on the Character as `.equipment`. Now we want it to come into 
-play automatically whenever we pick up or drop something. To do this we need to override two hooks
-on the Character class: 
+Whenever an object leaves from one location to the next, Evennia will call a set of _hooks_ (methods) on the 
+object that moves, on the source-location and on its destination. This is the same for all moving things -
+whether it's a character moving between rooms or an item being dropping from your hand to the ground. 
+
+We need to tie our new `EquipmentHandler` into this system. By reading the doc page on [Objects](../../../Components/Objects.md),
+or looking at the [DefaultObject.move_to](evennia.objects.objects.DefaultObject.move_to) docstring, we'll 
+find out what hooks Evennia will call. Here `self` is the object being moved from 
+`source_location` to `destination`: 
+
+
+1. `self.at_pre_move(destination)` (abort if return False)
+2. `source_location.at_pre_object_leave(self, destination)` (abort if return False)
+3. `destination.at_pre_object_receive(self, source_location)` (abort if return False)
+4. `source_location.at_object_leave(self, destination)`
+5. `self.announce_move_from(destination)`
+6. (move happens here)
+7. `self.announce_move_to(source_location)`
+8. `destination.at_object_receive(self, source_location)`
+9. `self.at_post_move(source_location)`
+
+All of these hooks can be overridden to customize movement behavior. In this case we are interested in 
+controlling how items 'enter' and 'leave' our character - being 'inside' the character is the same as 
+them 'carrying' it. We have three good hook-candidates to use for this. 
+
+- `.at_pre_object_receive` - used to check if you can actually pick something up, or if your equipment-store is full.
+- `.at_object_receive` - used to add the item to the equipmenthandler
+- `.at_object_leave` - used to remove the item from the equipmenthandler
+
+You could also picture using `.at_pre_object_leave` to restrict dropping (cursed?) items, but 
+we will skip that for this tutorial.
 
 ```python 
 # mygame/evadventure/character.py 
@@ -143,7 +170,6 @@ class EvAdventureCharacter(LivingMixin, DefaultCharacter):
         if they pick up something). If it returns False, move is aborted.
         
         """ 
-        # we haven't written this yet!
         return self.equipment.validate_slot_usage(moved_object)
     
     def at_object_receive(self, moved_object, source_location, **kwargs): 
@@ -151,7 +177,7 @@ class EvAdventureCharacter(LivingMixin, DefaultCharacter):
         Called by Evennia when an object arrives 'in' the character.
         
         """
-        self.equipment.add(moved_object) 
+        self.equipment.add(moved_object)
 
     def at_object_leave(self, moved_object, destination, **kwargs):
         """ 
@@ -161,6 +187,413 @@ class EvAdventureCharacter(LivingMixin, DefaultCharacter):
         self.equipment.remove(moved_object)
 ```
 
+Above we have assumed the `EquipmentHandler` (`.equipment`) has methods `.validate_slot_usage`, 
+`.add` and `.remove`. But we haven't actually added them yet - we just put some reasonable names! Before 
+we can use this, we need to go actually adding those methods. 
+
+## Expanding the Equipmenthandler
+
+## `.validate_slot_usage`
+
+Let's start with implementing the first method we came up with above, `validate_slot_usage`:
+
+```python 
+# mygame/evadventure/equipment.py 
+
+from .enums import WieldLocation, Ability
+
+class EquipmentError(TypeError):
+    """All types of equipment-errors"""
+    pass
+
+class EquipmentHandler: 
+
+    # ... 
+    
+    @property
+    def max_slots(self):
+        """Max amount of slots, based on CON defense (CON + 10)""" 
+        return getattr(self.obj, Ability.CON.value, 1) + 10
+        
+    def count_slots(self):
+        """Count current slot usage""" 
+        slots = self.slots
+        wield_usage = sum(
+            getattr(slotobj, "size", 0) or 0
+            for slot, slotobj in slots.items()
+            if slot is not WieldLocation.BACKPACK
+        )
+        backpack_usage = sum(
+            getattr(slotobj, "size", 0) or 0 for slotobj in slots[WieldLocation.BACKPACK]
+        )
+        return wield_usage + backpack_usage
+    
+    def validate_slot_usage(self, obj):
+          """
+          Check if obj can fit in equipment, based on its size.
+          
+          """
+          if not inherits_from(obj, EvAdventureObject):
+              # in case we mix with non-evadventure objects
+              raise EquipmentError(f"{obj.key} is not something that can be equipped.")
+  
+         size = obj.size
+         max_slots = self.max_slots
+         current_slot_usage = self.count_slots()
+         return current_slot_usage + size <= max_slots:
+
+```
+
+```{sidebar}
+The `@property` decorator turns a method into a property so you don't need to 'call' it. 
+That is, you can access `.max_slots` instead of `.max_slots()`. In this case, it's just a 
+little less to type.
+```
+We add two helpers - the `max_slots` _property_ and `count_slots`, a method that calculate the current
+slots being in use. Let's figure out how they work. 
+
+### `.max_slots`
+
+For `max_slots`, remember that `.obj` on the handler is a back-reference to the `EvAdventureCharacter` we 
+put this handler on. `getattr` is a Python method for retrieving a named property on an object. 
+The `Enum` `Ability.CON.value` is the string `Constitution` (check out the 
+[first Utility and Enums tutorial](./Beginner-Tutorial-Utilities.md) if you don't recall).
+
+So to be clear, 
+
+```python 
+getattr(self.obj, Ability.CON.value) + 10
+```
+is the same as writing 
+
+```python 
+getattr(your_character, "Constitution") + 10 
+```
+
+which is the same as doing something like this: 
+
+```python 
+your_character.Constitution + 10 
+```
+
+In our code we write `getattr(self.obj, Ability.CON.value, 1)` - that extra `1`   means that if there 
+should happen to _not_ be a property "Constitution" on `self.obj`, we should not error out but just 
+return 1.
 
 
+### `.count_slots`
 
+In this helper we use two Python tools - the `sum()` function and a 
+[list comprehension](https://www.w3schools.com/python/python_lists_comprehension.asp). The former 
+simply adds the values of any iterable together. The latter is a more efficient way to create a list: 
+
+    new_list = [item for item in some_iterable if condition]
+    all_above_5 = [num for num in range(10) if num > 5]  # [6, 7, 8, 9]
+    all_below_5 = [num for num in range(10) if num < 5]  # [0, 1, 2, 3, 4]
+
+To make it easier to understand, try reading the last line above as "for every number in the range 0-9, 
+pick all with a value below 5 and make a list of them". You can also embed such comprehensions 
+directly in a function call like `sum()` without using `[]` around it. 
+
+In `count_slots` we have this code: 
+
+```python 
+wield_usage = sum(
+    getattr(slotobj, "size", 0)
+    for slot, slotobj in slots.items()
+    if slot is not WieldLocation.BACKPACK
+)
+```
+
+We should be able to follow all except `slots.items()`. Since `slots` is a `dict`, we can use `.items()`
+to get a sequence of `(key, value)` pairs. We store these in `slot` and `slotobj`. So the above can 
+be understood as "for every `slot` and `slotobj`-pair in `slots`, check which slot location it is. 
+If it is _not_ in the backpack, get its size and add it to the list. Sum over all these 
+sizes". 
+
+A less compact but maybe more readonable way to write this would be: 
+
+```python 
+backpack_item_sizes = [] 
+for slot, slotobj in slots.items(): 
+    if slot is not WieldLocation.BACKPACK:
+       size = getattr(slotobj, "size", 0) 
+       backpack_item_sizes.append(size)
+wield_usage = sum(backpack_item_sizes)
+```
+
+The same is done for the items actually in the BACKPACK slot. The total sizes are added 
+together. 
+
+### Validating slots 
+
+With these helpers in place, `validate_slot_usage` now becomes simple. We use `max_slots` to see how much we can carry. 
+We then get how many slots we are already using (with `count_slots`) and see if our new `obj`'s size 
+would be too much for us. 
+
+## `.add` and `.remove`
+
+We will make it so `.add` puts something in the `BACKPACK` location and `remove` drops it, wherever
+it is (even if it was in your hands).
+
+```python 
+# mygame/evadventure/equipment.py 
+
+from .enums import WieldLocation, Ability
+
+# ... 
+
+class EquipmentHandler: 
+
+    # ... 
+     
+    def add(self, obj):
+        """
+        Put something in the backpack.
+        """
+        self.validate_slot_usage(obj)
+        self.slots[WieldLocation.BACKPACK].append(obj)
+        self._save()
+
+    def remove(self, slot):
+        """
+        Remove contents of a particular slot, for
+        example `equipment.remove(WieldLocation.SHIELD_HAND)`
+        """
+        slots = self.slots
+        ret = []
+        if slot is WieldLocation.BACKPACK:
+            # empty entire backpack! 
+            ret.extend(slots[slot])
+            slots[slot] = []
+        else:
+            ret.append(slots[slot])
+            slots[slot] = None
+        if ret:
+            self._save()
+        return ret
+```
+
+Both of these should be straight forward to follow. In `.add`, we make use of `validate_slot_usage` to 
+double-check we can actually fit the thing, then we add the item to the backpack. 
+
+In `.delete`, we allow emptying by `WieldLocation` - we figure out what slot it is and return 
+the item within (if any). If we gave `BACKPACK` as the slot, we empty the backpack and 
+return all items. 
+
+Whenever we change the equipment loadout we must make sure to `._save()` the result, or it will 
+be lost after a server reload.
+
+## Moving things around 
+ 
+With the help of `.remove()` and `.add()`  we can get things in and out of the `BACKPACK` equipment 
+location. We also need to grab stuff from the backpack and wield or wear it. We add a `.move` method 
+on the `EquipmentHandler` to do this:
+
+```python 
+# mygame/evadventure/equipment.py 
+
+from .enums import WieldLocation, Ability
+
+# ... 
+
+class EquipmentHandler: 
+
+    # ... 
+    
+    def move(self, obj): 
+         """Move object from backpack to its intended `inventory_use_slot`.""" 
+         
+        # make sure to remove from equipment/backpack first, to avoid double-adding
+        self.remove(obj) 
+        
+        slots = self.slots
+        use_slot = getattr(obj, "inventory_use_slot", WieldLocation.BACKPACK)
+
+        to_backpack = []
+        if use_slot is WieldLocation.TWO_HANDS:
+            # two-handed weapons can't co-exist with weapon/shield-hand used items
+            to_backpack = [slots[WieldLocation.WEAPON_HAND], slots[WieldLocation.SHIELD_HAND]]
+            slots[WieldLocation.WEAPON_HAND] = slots[WieldLocation.SHIELD_HAND] = None
+            slots[use_slot] = obj
+        elif use_slot in (WieldLocation.WEAPON_HAND, WieldLocation.SHIELD_HAND):
+            # can't keep a two-handed weapon if adding a one-handed weapon or shield
+            to_backpack = [slots[WieldLocation.TWO_HANDS]]
+            slots[WieldLocation.TWO_HANDS] = None
+            slots[use_slot] = obj
+        elif use_slot is WieldLocation.BACKPACK:
+            # it belongs in backpack, so goes back to it
+            to_backpack = [obj]
+        else:
+            # for others (body, head), just replace whatever's there
+            replaced = [obj]
+            slots[use_slot] = obj
+       
+        for to_backpack_obj in to_backpack:
+            # put stuff in backpack
+            slots[use_slot].append(to_backpack_obj)
+       
+        # store new state
+        self._save() 
+``` 
+
+Here we remember that every `EvAdventureObject` has an `inventory_use_slot` property that tells us where
+it goes. So we just need to move the object to that slot, replacing whatever is in that place 
+from before. Anything we replace goes back to the backpack. 
+
+## Get everything 
+
+In order to visualize our inventory, we need some method to get everything we are carrying. 
+
+
+```python 
+# mygame/evadventure/equipment.py 
+
+from .enums import WieldLocation, Ability
+
+# ... 
+
+class EquipmentHandler: 
+
+    # ... 
+
+    def all(self):
+        """
+        Get all objects in inventory, regardless of location.
+        """
+        slots = self.slots
+        lst = [
+            (slots[WieldLocation.WEAPON_HAND], WieldLocation.WEAPON_HAND),
+            (slots[WieldLocation.SHIELD_HAND], WieldLocation.SHIELD_HAND),
+            (slots[WieldLocation.TWO_HANDS], WieldLocation.TWO_HANDS),
+            (slots[WieldLocation.BODY], WieldLocation.BODY),
+            (slots[WieldLocation.HEAD], WieldLocation.HEAD),
+        ] + [(item, WieldLocation.BACKPACK) for item in slots[WieldLocation.BACKPACK]]
+        return lst
+```
+
+Here we get all the equipment locations and add their contents together into a list of tuples 
+`[(item, WieldLocation), ...]`. This is convenient for display.
+
+## Weapon and armor 
+
+It's convenient to have the `EquipmentHandler` easily tell you what weapon is currently wielded 
+and what _armor_ level all worn equipment provides. Otherwise you'd need to figure out what item is 
+in which wield-slot and to add up armor slots manually every time you need to know. 
+
+
+```python 
+# mygame/evadventure/equipment.py 
+
+from .objects import WeaponEmptyHand
+from .enums import WieldLocation, Ability
+
+# ... 
+
+class EquipmentHandler: 
+
+    # ... 
+    
+    @property
+    def armor(self):
+        slots = self.slots
+        return sum(
+            (
+                # armor is listed using its defense, so we remove 10 from it
+                # (11 is base no-armor value in Knave)
+                getattr(slots[WieldLocation.BODY], "armor", 1),
+                # shields and helmets are listed by their bonus to armor
+                getattr(slots[WieldLocation.SHIELD_HAND], "armor", 0),
+                getattr(slots[WieldLocation.HEAD], "armor", 0),
+            )
+        )
+
+    @property
+    def weapon(self):
+        # first checks two-handed wield, then one-handed; the two
+        # should never appear simultaneously anyhow (checked in `move` method).
+        slots = self.slots
+        weapon = slots[WieldLocation.TWO_HANDS]
+        if not weapon:
+            weapon = slots[WieldLocation.WEAPON_HAND]
+        if not weapon:
+            weapon = WeaponEmptyHand()
+        return weapon
+
+```
+
+In the `.armor()` method we get the item (if any) out of each relevant wield-slot (body, shield, head), 
+and grab their `armor` Attribute. We then `sum()` them all up. 
+
+In `.weapon()`, we simply check which of the possible weapon slots (weapon-hand or two-hands) have 
+something in them. If not we fall back to the 'fake' weapon `WeaponEmptyHand` which is just a 'dummy' 
+object that represents your bare hands with damage and all.
+(created in [The Object tutorial](./Beginner-Tutorial-Objects.md#your-bare-hands) earlier).
+
+
+## Extra credits 
+
+This covers the basic functionality of the equipment handler. There are other useful methods that 
+can be added: 
+
+- Given an item, figure out which equipment slot it is currently in
+- Make a string representing the current loadout
+- Get everything in the backpack (only)
+- Get all wieldable items (weapons, shields) from backpack 
+- Get all usable items (items with a use-location of `BACKPACK`) from the backpack
+
+Experiment with adding those. A full example is found in 
+[evennia/contrib/tutorials/evadventure/equipment.py](evennia.contrib.tutorials.evadventure.equipment).
+
+## Unit Testing 
+
+> Create a new module `mygame/evadventure/tests/test_equipment.py`.
+
+```{sidebar}
+See [evennia/contrib/tutorials/evadventure/tests/test_equipment.py](evennia.contrib.tutorials.evadventure.tests.test_equipment)
+for a finished testing example.
+```
+
+To test the `EquipmentHandler`, easiest is create an `EvAdventureCharacter` (this should by now 
+have `EquipmentHandler` available on itself as `.equipment`) and a few test objects; then test 
+passing these into the handler's methods.
+
+
+```python 
+# mygame/evadventure/tests/test_equipment.py 
+
+from evennia.utils import create 
+from evennia.utils.test_resources import BaseEvenniaTest 
+
+from ..objects import EvAdventureRoom
+from ..enums import WieldLocation
+
+class TestEquipment(BaseEvenniaTest): 
+    
+    def setUp(self): 
+        self.character = create.create_object(EvAdventureCharacter, key='testchar')
+        self.helmet = create.create_object(EvAdventureHelmet, key="helmet") 
+        self.weapon = create.create_object(EvAdventureWeapon, key="weapon") 
+         
+    def test_add_remove): 
+        self.character.equipment.add(self.helmet)
+        self.assertEqual(
+            self.character.equipment.slots[WieldLocation.BACKPACK],
+            [self.helmet]
+        )
+        self.character.equipment.remove(self.helmet)
+        self.assertEqual(self.character.equipment.slots[WieldLocation.BACKPACK], []) 
+        
+    # ... 
+```
+
+## Summary 
+
+_Handlers_ are useful for grouping functionality together. Now that we spent our time making the 
+`EquipmentHandler`, we shouldn't need to worry about item-slots anymore - the handler 'handles' all 
+the details for us. As long as we call its methods, the details can be forgotten about.
+
+We also learned to use _hooks_ to tie _Knave_'s custom equipment handling into Evennia.
+
+With `Characters`, `Objects` and now `Equipment` in place, we should be able to move on to character
+generation - where players get to make their own character!
\ No newline at end of file
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Objects.md b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Objects.md
index acc153f36d..07b4f5f299 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Objects.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Objects.md
@@ -325,10 +325,36 @@ class EvAdventureHelmet(EvAdventureArmor):
     inventory_use_slot = WieldLocation.HEAD
 ``` 
 
+## Your Bare hands 
 
+This is a 'dummy' object that is not stored in the database. We will use this in the upcoming 
+[Equipment tutorial lesson](./Beginner-Tutorial-Equipment.md) to represent when you have 'nothing' 
+in your hands. This way we don't need to add any special case for this.
 
+```python
+class WeaponEmptyHand:
+     obj_type = ObjType.WEAPON
+     key = "Empty Fists"
+     inventory_use_slot = WieldLocation.WEAPON_HAND
+     attack_type = Ability.STR
+     defense_type = Ability.ARMOR
+     damage_roll = "1d4"
+     quality = 100000  # let's assume fists are always available ...
+ 
+     def __repr__(self):
+         return "<WeaponEmptyHand>"
+```
 
+## Testing and Extra credits 
 
+Remember the `get_obj_stats` function from the [Utility Tutorial](./Beginner-Tutorial-Utilities.md) earlier? 
+We had to use dummy-values since we didn't yet know how we would store properties on Objects in the game. 
 
+Well, we just figured out all we need! You can go back and update `get_obj_stats` to properly read the data 
+from the object it receives. 
 
+When you change this function you must also update the related unit test - so your existing test becomes a 
+nice way to test your new Objects as well! Add more tests showing the output of feeding different object-types
+to `get_obj_stats`.
 
+Try it out yourself. If you need help, a finished utility example is found in [evennia/contrib/tutorials/evadventure/utils.py](get_obj_stats).
\ No newline at end of file
diff --git a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Utilities.md b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Utilities.md
index cbe83da468..1cded5cc6f 100644
--- a/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Utilities.md
+++ b/docs/source/Howtos/Beginner-Tutorial/Part3/Beginner-Tutorial-Utilities.md
@@ -216,6 +216,12 @@ So we just set them to dummy values. We'll need to get back to this when we have
 
 ## Testing 
 
+```{important}
+It's useful for any game dev to know how to effectively test their code. So we'll try to include a 
+*Testing* section at the end of each of the implementation lessons to follow. Writing tests for your code 
+is optional but highly recommended; it can feel a little cumbersome at first, but you'll thank yourself later.
+```
+
 > create a new module `mygame/evadventure/tests/test_utils.py`
 
 How do you know if you made a typo in the code above? You could _manually_ test it by reloading your 
@@ -228,7 +234,7 @@ doing that test when you change this code later.
 
 ```{sidebar}
 In [evennia/contrib/evadventure/tests/test_utils.py](evennia.contrib.evadventure.tests.test_utils)
-is the final test module. To dive deeper into unit testing in Evennia, see the 
+is an example of the testing module. To dive deeper into unit testing in Evennia, see the 
 [Unit testing](../../../Coding/Unit-Testing.md) documentation.
 ```
 
diff --git a/docs/source/Howtos/Coding-FAQ.md b/docs/source/Howtos/Coding-FAQ.md
index 80f376f562..22cadef9c8 100644
--- a/docs/source/Howtos/Coding-FAQ.md
+++ b/docs/source/Howtos/Coding-FAQ.md
@@ -28,7 +28,7 @@ Character [Command Set](../Components/Command-Sets.md)?
 
 **A:** Go to `mygame/commands/default_cmdsets.py`. Find the `CharacterCmdSet` class. It has one
 method named `at_cmdset_creation`. At the end of that method, add the following line:
-`self.remove(default_cmds.CmdGet())`. See the [Adding Commands Tutorial](Beginner-Tutorial/Part1/Adding-Commands.md)
+`self.remove(default_cmds.CmdGet())`. See the [Adding Commands Tutorial](Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md)
 for more info.
 
 ## Preventing character from moving based on a condition
@@ -156,7 +156,7 @@ class CmdWerewolf(Command):
     def func(self):
         # ...
 ```
-Add this to the [default cmdset as usual](Beginner-Tutorial/Part1/Adding-Commands.md). The `is_full_moon` [lock
+Add this to the [default cmdset as usual](Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md). The `is_full_moon` [lock
 function](../Components/Locks.md#lock-functions) does not yet exist. We must create that:
 
 ```python
diff --git a/docs/source/Howtos/Default-Exit-Errors.md b/docs/source/Howtos/Default-Exit-Errors.md
index d1e4045e73..8d90a36e33 100644
--- a/docs/source/Howtos/Default-Exit-Errors.md
+++ b/docs/source/Howtos/Default-Exit-Errors.md
@@ -27,7 +27,7 @@ told us that we couldn't go there.
 ## Adding default error commands
 
 The way to do this is to give Evennia an _alternative_ Command to use when no Exit-Command is found
-in the room. See [Adding Commands](Beginner-Tutorial/Part1/Adding-Commands.md) for more info about the 
+in the room. See [Adding Commands](Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md) for more info about the 
 process of adding new Commands to Evennia.
 
 In this example all we'll do is echo an error message.
diff --git a/docs/source/Howtos/Evennia-for-MUSH-Users.md b/docs/source/Howtos/Evennia-for-MUSH-Users.md
index 006e6934b7..312e94d186 100644
--- a/docs/source/Howtos/Evennia-for-MUSH-Users.md
+++ b/docs/source/Howtos/Evennia-for-MUSH-Users.md
@@ -211,7 +211,7 @@ for-roleplaying-sessions) that can be of interest.
 An important aspect of making things more familiar for *Players* is adding new and tweaking existing
 commands. How this is done is covered by the [Tutorial on adding new commands](Adding-Command-
 Tutorial). You may also find it useful to shop through the `evennia/contrib/` folder. The 
-[Tutorial world](Beginner-Tutorial/Part1/Tutorial-World.md) is a small single-player quest you can try (it’s not very MUSH-
+[Tutorial world](Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md) is a small single-player quest you can try (it’s not very MUSH-
 like but it does show many Evennia concepts in action). Beyond that there are [many more tutorials](./Howtos-Overview.md) 
 to try out. If you feel you want a more visual overview you can also look at
 [Evennia in pictures](https://evennia.blogspot.se/2016/05/evennia-in-pictures.html).
diff --git a/docs/source/Howtos/Evennia-for-roleplaying-sessions.md b/docs/source/Howtos/Evennia-for-roleplaying-sessions.md
index 0bda191636..f0ee502e66 100644
--- a/docs/source/Howtos/Evennia-for-roleplaying-sessions.md
+++ b/docs/source/Howtos/Evennia-for-roleplaying-sessions.md
@@ -686,7 +686,7 @@ implemented.
 ## Rooms
 
 Evennia comes with rooms out of the box, so no extra work needed. A GM will automatically have all
-needed building commands available. A fuller go-through is found in the [Building tutorial](Beginner-Tutorial/Part1/Building-Quickstart.md).
+needed building commands available. A fuller go-through is found in the [Building tutorial](Beginner-Tutorial/Part1/Beginner-Tutorial-Building-Quickstart.md).
 Here are some useful highlights:
 
 * `@dig roomname;alias = exit_there;alias, exit_back;alias` - this is the basic command for digging
diff --git a/docs/source/Howtos/Parsing-commands-tutorial.md b/docs/source/Howtos/Parsing-commands-tutorial.md
index 8e3638a12b..c400de09ac 100644
--- a/docs/source/Howtos/Parsing-commands-tutorial.md
+++ b/docs/source/Howtos/Parsing-commands-tutorial.md
@@ -2,7 +2,7 @@
 
 
 This tutorial will elaborate on the many ways one can parse command arguments.  The first step after
-[adding a command](Beginner-Tutorial/Part1/Adding-Commands.md) usually is to parse its arguments.  There are lots of
+[adding a command](Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md) usually is to parse its arguments.  There are lots of
 ways to do it, but some are indeed better than others and this tutorial will try to present them.
 
 If you're a Python beginner, this tutorial might help you a lot.  If you're already familiar with
@@ -652,7 +652,7 @@ about... what is this `"book"`?
 
 To get an object from a string, we perform an Evennia search.  Evennia provides a `search` method on
 all typeclassed objects (you will most likely use the one on characters or accounts).  This method
-supports a very wide array of arguments and has [its own tutorial](Beginner-Tutorial/Part1/Searching-Things.md).
+supports a very wide array of arguments and has [its own tutorial](Beginner-Tutorial/Part1/Beginner-Tutorial-Searching-Things.md).
 Some examples of useful cases follow:
 
 ### Local searches
diff --git a/docs/source/Howtos/Static-In-Game-Map.md b/docs/source/Howtos/Static-In-Game-Map.md
index bdf5b77d42..6ce98fd873 100644
--- a/docs/source/Howtos/Static-In-Game-Map.md
+++ b/docs/source/Howtos/Static-In-Game-Map.md
@@ -84,7 +84,7 @@ In this section we will try to create an actual "map" object that an account can
 at.
 
 Evennia offers a range of [default commands](../Components/Default-Commands.md) for 
-[creating objects and rooms in-game](Beginner-Tutorial/Part1/Building-Quickstart.md). While readily accessible, these commands are made to do very
+[creating objects and rooms in-game](Beginner-Tutorial/Part1/Beginner-Tutorial-Building-Quickstart.md). While readily accessible, these commands are made to do very
 specific, restricted things and will thus not offer as much flexibility to experiment (for an
 advanced exception see [the FuncParser](../Components/FuncParser.md)). Additionally, entering long
 descriptions and properties over and over in the game client can become tedious; especially when
diff --git a/docs/source/Howtos/Turn-based-Combat-System.md b/docs/source/Howtos/Turn-based-Combat-System.md
index 08a20ddcac..b0935446b5 100644
--- a/docs/source/Howtos/Turn-based-Combat-System.md
+++ b/docs/source/Howtos/Turn-based-Combat-System.md
@@ -507,7 +507,7 @@ class CmdAttack(Command):
 ```
 
 The `attack` command will not go into the combat cmdset but rather into the default cmdset. See e.g.
-the [Adding Command Tutorial](Beginner-Tutorial/Part1/Adding-Commands.md) if you are unsure about how to do this.
+the [Adding Command Tutorial](Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md) if you are unsure about how to do this.
 
 ## Expanding the example
 
diff --git a/docs/source/Howtos/Tutorial-for-basic-MUSH-like-game.md b/docs/source/Howtos/Tutorial-for-basic-MUSH-like-game.md
index b2b46c406a..61069ede67 100644
--- a/docs/source/Howtos/Tutorial-for-basic-MUSH-like-game.md
+++ b/docs/source/Howtos/Tutorial-for-basic-MUSH-like-game.md
@@ -660,6 +660,6 @@ The simple "Power" game mechanic should be easily expandable to something more f
 useful, same is true for the combat score principle. The `+attack` could be made to target a
 specific player (or npc) and automatically compare their relevant attributes to determine a result.
 
-To continue from here, you can take a look at the [Tutorial World](Beginner-Tutorial/Part1/Tutorial-World.md). For
+To continue from here, you can take a look at the [Tutorial World](Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md). For
 more specific ideas, see the [other tutorials and hints](./Howtos-Overview.md) as well
 as the [Evennia Component overview](../Components/Components-Overview.md).
diff --git a/docs/source/Setup/How-to-connect-Evennia-to-Twitter.md b/docs/source/Setup/How-to-connect-Evennia-to-Twitter.md
index 8111c8c89b..e12d2581f3 100644
--- a/docs/source/Setup/How-to-connect-Evennia-to-Twitter.md
+++ b/docs/source/Setup/How-to-connect-Evennia-to-Twitter.md
@@ -30,7 +30,7 @@ pip install python-twitter
 
 Evennia doesn't have a `tweet` command out of the box so you need to write your own little
 [Command](../Components/Commands.md) in order to tweet. If you are unsure about how commands work and how to add
-them, it can be an idea to go through the [Adding a Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Adding-Commands.md)
+them, it can be an idea to go through the [Adding a Command Tutorial](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Adding-Commands.md)
 before continuing.
 
 You can create the command in a separate command module (something like `mygame/commands/tweet.py`)
diff --git a/docs/source/Setup/Installation.md b/docs/source/Setup/Installation.md
index 33146eaec2..7dbb5449f7 100644
--- a/docs/source/Setup/Installation.md
+++ b/docs/source/Setup/Installation.md
@@ -111,7 +111,7 @@ beforehand to make sure you don't pick a game name that is already taken - be ni
 
 You are good to go! 
 
-Evennia comes with a small [Tutorial World](../Howtos/Beginner-Tutorial/Part1/Tutorial-World.md) to experiment and learn from. After logging 
+Evennia comes with a small [Tutorial World](../Howtos/Beginner-Tutorial/Part1/Beginner-Tutorial-Tutorial-World.md) to experiment and learn from. After logging 
 in, you can create it by running 
 
     batchcommand tutorial_world.build
diff --git a/docs/source/api/evennia-api.rst b/docs/source/api/evennia-api.rst
deleted file mode 100644
index 27caffe4e4..0000000000
--- a/docs/source/api/evennia-api.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia
-=======
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia
diff --git a/docs/source/api/evennia.accounts.accounts.rst b/docs/source/api/evennia.accounts.accounts.rst
deleted file mode 100644
index 9be2b22d8d..0000000000
--- a/docs/source/api/evennia.accounts.accounts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.accounts.accounts module
-================================
-
-.. automodule:: evennia.accounts.accounts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.accounts.bots.rst b/docs/source/api/evennia.accounts.bots.rst
deleted file mode 100644
index f6253d9855..0000000000
--- a/docs/source/api/evennia.accounts.bots.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.accounts.bots module
-============================
-
-.. automodule:: evennia.accounts.bots
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.accounts.manager.rst b/docs/source/api/evennia.accounts.manager.rst
deleted file mode 100644
index 4b69aae7ed..0000000000
--- a/docs/source/api/evennia.accounts.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.accounts.manager module
-===============================
-
-.. automodule:: evennia.accounts.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.accounts.models.rst b/docs/source/api/evennia.accounts.models.rst
deleted file mode 100644
index 5b4ad56484..0000000000
--- a/docs/source/api/evennia.accounts.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.accounts.models module
-==============================
-
-.. automodule:: evennia.accounts.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.accounts.rst b/docs/source/api/evennia.accounts.rst
deleted file mode 100644
index 1c51f7e86a..0000000000
--- a/docs/source/api/evennia.accounts.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-evennia.accounts package
-========================
-
-.. automodule:: evennia.accounts
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.accounts.accounts
-   evennia.accounts.bots
-   evennia.accounts.manager
-   evennia.accounts.models
diff --git a/docs/source/api/evennia.commands.cmdhandler.rst b/docs/source/api/evennia.commands.cmdhandler.rst
deleted file mode 100644
index d029279afe..0000000000
--- a/docs/source/api/evennia.commands.cmdhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.cmdhandler module
-==================================
-
-.. automodule:: evennia.commands.cmdhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.cmdparser.rst b/docs/source/api/evennia.commands.cmdparser.rst
deleted file mode 100644
index 28f65c11d6..0000000000
--- a/docs/source/api/evennia.commands.cmdparser.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.cmdparser module
-=================================
-
-.. automodule:: evennia.commands.cmdparser
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.cmdset.rst b/docs/source/api/evennia.commands.cmdset.rst
deleted file mode 100644
index 03a0b4ee7e..0000000000
--- a/docs/source/api/evennia.commands.cmdset.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.cmdset module
-==============================
-
-.. automodule:: evennia.commands.cmdset
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.cmdsethandler.rst b/docs/source/api/evennia.commands.cmdsethandler.rst
deleted file mode 100644
index 22e0c25c47..0000000000
--- a/docs/source/api/evennia.commands.cmdsethandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.cmdsethandler module
-=====================================
-
-.. automodule:: evennia.commands.cmdsethandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.command.rst b/docs/source/api/evennia.commands.command.rst
deleted file mode 100644
index 2d792c1bef..0000000000
--- a/docs/source/api/evennia.commands.command.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.command module
-===============================
-
-.. automodule:: evennia.commands.command
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.account.rst b/docs/source/api/evennia.commands.default.account.rst
deleted file mode 100644
index 6a85919da2..0000000000
--- a/docs/source/api/evennia.commands.default.account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.account module
-=======================================
-
-.. automodule:: evennia.commands.default.account
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.admin.rst b/docs/source/api/evennia.commands.default.admin.rst
deleted file mode 100644
index 5c6bebec11..0000000000
--- a/docs/source/api/evennia.commands.default.admin.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.admin module
-=====================================
-
-.. automodule:: evennia.commands.default.admin
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.batchprocess.rst b/docs/source/api/evennia.commands.default.batchprocess.rst
deleted file mode 100644
index 7b8e819974..0000000000
--- a/docs/source/api/evennia.commands.default.batchprocess.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.batchprocess module
-============================================
-
-.. automodule:: evennia.commands.default.batchprocess
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.building.rst b/docs/source/api/evennia.commands.default.building.rst
deleted file mode 100644
index 2f5f43cabb..0000000000
--- a/docs/source/api/evennia.commands.default.building.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.building module
-========================================
-
-.. automodule:: evennia.commands.default.building
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.cmdset_account.rst b/docs/source/api/evennia.commands.default.cmdset_account.rst
deleted file mode 100644
index c518041bc1..0000000000
--- a/docs/source/api/evennia.commands.default.cmdset_account.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.cmdset\_account module
-===============================================
-
-.. automodule:: evennia.commands.default.cmdset_account
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.cmdset_character.rst b/docs/source/api/evennia.commands.default.cmdset_character.rst
deleted file mode 100644
index b4dff3406c..0000000000
--- a/docs/source/api/evennia.commands.default.cmdset_character.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.cmdset\_character module
-=================================================
-
-.. automodule:: evennia.commands.default.cmdset_character
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.cmdset_session.rst b/docs/source/api/evennia.commands.default.cmdset_session.rst
deleted file mode 100644
index 2f5ed3d177..0000000000
--- a/docs/source/api/evennia.commands.default.cmdset_session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.cmdset\_session module
-===============================================
-
-.. automodule:: evennia.commands.default.cmdset_session
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.cmdset_unloggedin.rst b/docs/source/api/evennia.commands.default.cmdset_unloggedin.rst
deleted file mode 100644
index 4ccc5c52ac..0000000000
--- a/docs/source/api/evennia.commands.default.cmdset_unloggedin.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.cmdset\_unloggedin module
-==================================================
-
-.. automodule:: evennia.commands.default.cmdset_unloggedin
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.comms.rst b/docs/source/api/evennia.commands.default.comms.rst
deleted file mode 100644
index 9e6304398f..0000000000
--- a/docs/source/api/evennia.commands.default.comms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.comms module
-=====================================
-
-.. automodule:: evennia.commands.default.comms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.general.rst b/docs/source/api/evennia.commands.default.general.rst
deleted file mode 100644
index 3a992a34b0..0000000000
--- a/docs/source/api/evennia.commands.default.general.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.general module
-=======================================
-
-.. automodule:: evennia.commands.default.general
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.help.rst b/docs/source/api/evennia.commands.default.help.rst
deleted file mode 100644
index 475266e1ac..0000000000
--- a/docs/source/api/evennia.commands.default.help.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.help module
-====================================
-
-.. automodule:: evennia.commands.default.help
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.muxcommand.rst b/docs/source/api/evennia.commands.default.muxcommand.rst
deleted file mode 100644
index bfe0f8055a..0000000000
--- a/docs/source/api/evennia.commands.default.muxcommand.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.muxcommand module
-==========================================
-
-.. automodule:: evennia.commands.default.muxcommand
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.rst b/docs/source/api/evennia.commands.default.rst
deleted file mode 100644
index 605b697420..0000000000
--- a/docs/source/api/evennia.commands.default.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-evennia.commands.default package
-================================
-
-.. automodule:: evennia.commands.default
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.commands.default.account
-   evennia.commands.default.admin
-   evennia.commands.default.batchprocess
-   evennia.commands.default.building
-   evennia.commands.default.cmdset_account
-   evennia.commands.default.cmdset_character
-   evennia.commands.default.cmdset_session
-   evennia.commands.default.cmdset_unloggedin
-   evennia.commands.default.comms
-   evennia.commands.default.general
-   evennia.commands.default.help
-   evennia.commands.default.muxcommand
-   evennia.commands.default.syscommands
-   evennia.commands.default.system
-   evennia.commands.default.tests
-   evennia.commands.default.unloggedin
diff --git a/docs/source/api/evennia.commands.default.syscommands.rst b/docs/source/api/evennia.commands.default.syscommands.rst
deleted file mode 100644
index 4d1ef77f6b..0000000000
--- a/docs/source/api/evennia.commands.default.syscommands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.syscommands module
-===========================================
-
-.. automodule:: evennia.commands.default.syscommands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.system.rst b/docs/source/api/evennia.commands.default.system.rst
deleted file mode 100644
index 3fd11fed5c..0000000000
--- a/docs/source/api/evennia.commands.default.system.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.system module
-======================================
-
-.. automodule:: evennia.commands.default.system
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.tests.rst b/docs/source/api/evennia.commands.default.tests.rst
deleted file mode 100644
index 407cf01c81..0000000000
--- a/docs/source/api/evennia.commands.default.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.tests module
-=====================================
-
-.. automodule:: evennia.commands.default.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.default.unloggedin.rst b/docs/source/api/evennia.commands.default.unloggedin.rst
deleted file mode 100644
index c4b22e3123..0000000000
--- a/docs/source/api/evennia.commands.default.unloggedin.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.commands.default.unloggedin module
-==========================================
-
-.. automodule:: evennia.commands.default.unloggedin
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.commands.rst b/docs/source/api/evennia.commands.rst
deleted file mode 100644
index dd98fed278..0000000000
--- a/docs/source/api/evennia.commands.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-evennia.commands package
-========================
-
-.. automodule:: evennia.commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.commands.cmdhandler
-   evennia.commands.cmdparser
-   evennia.commands.cmdset
-   evennia.commands.cmdsethandler
-   evennia.commands.command
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.commands.default
diff --git a/docs/source/api/evennia.comms.comms.rst b/docs/source/api/evennia.comms.comms.rst
deleted file mode 100644
index a7157d5199..0000000000
--- a/docs/source/api/evennia.comms.comms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.comms.comms module
-==========================
-
-.. automodule:: evennia.comms.comms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.comms.managers.rst b/docs/source/api/evennia.comms.managers.rst
deleted file mode 100644
index 3d20492f19..0000000000
--- a/docs/source/api/evennia.comms.managers.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.comms.managers module
-=============================
-
-.. automodule:: evennia.comms.managers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.comms.models.rst b/docs/source/api/evennia.comms.models.rst
deleted file mode 100644
index 4fd7dcc9d9..0000000000
--- a/docs/source/api/evennia.comms.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.comms.models module
-===========================
-
-.. automodule:: evennia.comms.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.comms.rst b/docs/source/api/evennia.comms.rst
deleted file mode 100644
index 00ef04e075..0000000000
--- a/docs/source/api/evennia.comms.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.comms package
-=====================
-
-.. automodule:: evennia.comms
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.comms.comms
-   evennia.comms.managers
-   evennia.comms.models
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.rst b/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.rst
deleted file mode 100644
index 61046a67bb..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.aws_s3_cdn.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.awsstorage.aws\_s3\_cdn module
-============================================================
-
-.. automodule:: evennia.contrib.base_systems.awsstorage.aws_s3_cdn
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.rst b/docs/source/api/evennia.contrib.base_systems.awsstorage.rst
deleted file mode 100644
index d1629083ca..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.awsstorage package
-================================================
-
-.. automodule:: evennia.contrib.base_systems.awsstorage
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.awsstorage.aws_s3_cdn
-   evennia.contrib.base_systems.awsstorage.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.rst b/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.rst
deleted file mode 100644
index 30fb435288..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.awsstorage.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.awsstorage.tests module
-=====================================================
-
-.. automodule:: evennia.contrib.base_systems.awsstorage.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.rst b/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.rst
deleted file mode 100644
index da110c96e2..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.building_menu.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.building\_menu.building\_menu module
-==================================================================
-
-.. automodule:: evennia.contrib.base_systems.building_menu.building_menu
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.rst b/docs/source/api/evennia.contrib.base_systems.building_menu.rst
deleted file mode 100644
index 8a840fef42..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.building\_menu package
-====================================================
-
-.. automodule:: evennia.contrib.base_systems.building_menu
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.building_menu.building_menu
-   evennia.contrib.base_systems.building_menu.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.building_menu.tests.rst b/docs/source/api/evennia.contrib.base_systems.building_menu.tests.rst
deleted file mode 100644
index ef3171d87b..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.building_menu.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.building\_menu.tests module
-=========================================================
-
-.. automodule:: evennia.contrib.base_systems.building_menu.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.rst b/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.rst
deleted file mode 100644
index 1c70e3754f..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.color_markups.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.color\_markups.color\_markups module
-==================================================================
-
-.. automodule:: evennia.contrib.base_systems.color_markups.color_markups
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.rst b/docs/source/api/evennia.contrib.base_systems.color_markups.rst
deleted file mode 100644
index ea28bd224f..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.color\_markups package
-====================================================
-
-.. automodule:: evennia.contrib.base_systems.color_markups
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.color_markups.color_markups
-   evennia.contrib.base_systems.color_markups.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.color_markups.tests.rst b/docs/source/api/evennia.contrib.base_systems.color_markups.tests.rst
deleted file mode 100644
index f3f6c4c679..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.color_markups.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.color\_markups.tests module
-=========================================================
-
-.. automodule:: evennia.contrib.base_systems.color_markups.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.components.component.rst b/docs/source/api/evennia.contrib.base_systems.components.component.rst
deleted file mode 100644
index 0fe68cbdac..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.component.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.components.component module
-=========================================================
-
-.. automodule:: evennia.contrib.base_systems.components.component
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.components.dbfield.rst b/docs/source/api/evennia.contrib.base_systems.components.dbfield.rst
deleted file mode 100644
index f80a709d4c..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.dbfield.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.components.dbfield module
-=======================================================
-
-.. automodule:: evennia.contrib.base_systems.components.dbfield
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.components.holder.rst b/docs/source/api/evennia.contrib.base_systems.components.holder.rst
deleted file mode 100644
index 77b811ebfa..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.holder.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.components.holder module
-======================================================
-
-.. automodule:: evennia.contrib.base_systems.components.holder
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.components.rst b/docs/source/api/evennia.contrib.base_systems.components.rst
deleted file mode 100644
index d6ecc2b764..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-evennia.contrib.base\_systems.components package
-================================================
-
-.. automodule:: evennia.contrib.base_systems.components
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.components.component
-   evennia.contrib.base_systems.components.dbfield
-   evennia.contrib.base_systems.components.holder
-   evennia.contrib.base_systems.components.signals
-   evennia.contrib.base_systems.components.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.components.signals.rst b/docs/source/api/evennia.contrib.base_systems.components.signals.rst
deleted file mode 100644
index abc557bc7a..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.signals.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.components.signals module
-=======================================================
-
-.. automodule:: evennia.contrib.base_systems.components.signals
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.components.tests.rst b/docs/source/api/evennia.contrib.base_systems.components.tests.rst
deleted file mode 100644
index 4c9afd89b4..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.components.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.components.tests module
-=====================================================
-
-.. automodule:: evennia.contrib.base_systems.components.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.rst b/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.rst
deleted file mode 100644
index dedce30d07..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.custom_gametime.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.custom\_gametime.custom\_gametime module
-======================================================================
-
-.. automodule:: evennia.contrib.base_systems.custom_gametime.custom_gametime
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.rst b/docs/source/api/evennia.contrib.base_systems.custom_gametime.rst
deleted file mode 100644
index 823aeed66e..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.custom\_gametime package
-======================================================
-
-.. automodule:: evennia.contrib.base_systems.custom_gametime
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.custom_gametime.custom_gametime
-   evennia.contrib.base_systems.custom_gametime.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.rst b/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.rst
deleted file mode 100644
index a98267602b..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.custom_gametime.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.custom\_gametime.tests module
-===========================================================
-
-.. automodule:: evennia.contrib.base_systems.custom_gametime.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.rst b/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.rst
deleted file mode 100644
index dacc9c3f45..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.email_login.connection_screens.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.email\_login.connection\_screens module
-=====================================================================
-
-.. automodule:: evennia.contrib.base_systems.email_login.connection_screens
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.email_login.rst b/docs/source/api/evennia.contrib.base_systems.email_login.email_login.rst
deleted file mode 100644
index 1ff73c13e7..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.email_login.email_login.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.email\_login.email\_login module
-==============================================================
-
-.. automodule:: evennia.contrib.base_systems.email_login.email_login
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.rst b/docs/source/api/evennia.contrib.base_systems.email_login.rst
deleted file mode 100644
index f51e9c2c89..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.email_login.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.base\_systems.email\_login package
-==================================================
-
-.. automodule:: evennia.contrib.base_systems.email_login
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.email_login.connection_screens
-   evennia.contrib.base_systems.email_login.email_login
-   evennia.contrib.base_systems.email_login.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.email_login.tests.rst b/docs/source/api/evennia.contrib.base_systems.email_login.tests.rst
deleted file mode 100644
index c99aea7965..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.email_login.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.email\_login.tests module
-=======================================================
-
-.. automodule:: evennia.contrib.base_systems.email_login.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.rst
deleted file mode 100644
index e36d4c5c3f..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.callbackhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.callbackhandler module
-===================================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.callbackhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.rst
deleted file mode 100644
index c313631410..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.commands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.commands module
-============================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.rst
deleted file mode 100644
index 963fe527e6..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.eventfuncs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.eventfuncs module
-==============================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.eventfuncs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.rst
deleted file mode 100644
index 4985511010..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python package
-====================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.ingame_python.callbackhandler
-   evennia.contrib.base_systems.ingame_python.commands
-   evennia.contrib.base_systems.ingame_python.eventfuncs
-   evennia.contrib.base_systems.ingame_python.scripts
-   evennia.contrib.base_systems.ingame_python.tests
-   evennia.contrib.base_systems.ingame_python.typeclasses
-   evennia.contrib.base_systems.ingame_python.utils
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.rst
deleted file mode 100644
index 11f3a8e453..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.scripts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.scripts module
-===========================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.scripts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.rst
deleted file mode 100644
index f65977f106..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.tests module
-=========================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.rst
deleted file mode 100644
index 5ef3613860..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.typeclasses.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.typeclasses module
-===============================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.typeclasses
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.rst b/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.rst
deleted file mode 100644
index 3d5bbb8230..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.ingame_python.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.ingame\_python.utils module
-=========================================================
-
-.. automodule:: evennia.contrib.base_systems.ingame_python.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.rst b/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.rst
deleted file mode 100644
index 9fc0eb1487..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.connection_screens.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.menu\_login.connection\_screens module
-====================================================================
-
-.. automodule:: evennia.contrib.base_systems.menu_login.connection_screens
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.rst b/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.rst
deleted file mode 100644
index 24437a5aea..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.menu_login.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.menu\_login.menu\_login module
-============================================================
-
-.. automodule:: evennia.contrib.base_systems.menu_login.menu_login
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.rst b/docs/source/api/evennia.contrib.base_systems.menu_login.rst
deleted file mode 100644
index 3ca2a496ee..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.base\_systems.menu\_login package
-=================================================
-
-.. automodule:: evennia.contrib.base_systems.menu_login
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.menu_login.connection_screens
-   evennia.contrib.base_systems.menu_login.menu_login
-   evennia.contrib.base_systems.menu_login.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.menu_login.tests.rst b/docs/source/api/evennia.contrib.base_systems.menu_login.tests.rst
deleted file mode 100644
index c4ca10b447..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.menu_login.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.menu\_login.tests module
-======================================================
-
-.. automodule:: evennia.contrib.base_systems.menu_login.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.rst b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.rst
deleted file mode 100644
index c247a5ef6a..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.mux\_comms\_cmds.mux\_comms\_cmds module
-======================================================================
-
-.. automodule:: evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.rst b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.rst
deleted file mode 100644
index 1b07bfbde7..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.mux\_comms\_cmds package
-======================================================
-
-.. automodule:: evennia.contrib.base_systems.mux_comms_cmds
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.mux_comms_cmds.mux_comms_cmds
-   evennia.contrib.base_systems.mux_comms_cmds.tests
diff --git a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.rst b/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.rst
deleted file mode 100644
index 6586189617..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.mux_comms_cmds.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.mux\_comms\_cmds.tests module
-===========================================================
-
-.. automodule:: evennia.contrib.base_systems.mux_comms_cmds.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.rst b/docs/source/api/evennia.contrib.base_systems.rst
deleted file mode 100644
index 7874657ea6..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-evennia.contrib.base\_systems package
-=====================================
-
-.. automodule:: evennia.contrib.base_systems
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.awsstorage
-   evennia.contrib.base_systems.building_menu
-   evennia.contrib.base_systems.color_markups
-   evennia.contrib.base_systems.components
-   evennia.contrib.base_systems.custom_gametime
-   evennia.contrib.base_systems.email_login
-   evennia.contrib.base_systems.ingame_python
-   evennia.contrib.base_systems.menu_login
-   evennia.contrib.base_systems.mux_comms_cmds
-   evennia.contrib.base_systems.unixcommand
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.rst b/docs/source/api/evennia.contrib.base_systems.unixcommand.rst
deleted file mode 100644
index 8a1de9cf14..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.base\_systems.unixcommand package
-=================================================
-
-.. automodule:: evennia.contrib.base_systems.unixcommand
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems.unixcommand.tests
-   evennia.contrib.base_systems.unixcommand.unixcommand
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.rst b/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.rst
deleted file mode 100644
index 0141185396..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.unixcommand.tests module
-======================================================
-
-.. automodule:: evennia.contrib.base_systems.unixcommand.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.rst b/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.rst
deleted file mode 100644
index cd892e6970..0000000000
--- a/docs/source/api/evennia.contrib.base_systems.unixcommand.unixcommand.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.base\_systems.unixcommand.unixcommand module
-============================================================
-
-.. automodule:: evennia.contrib.base_systems.unixcommand.unixcommand
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.rst
deleted file mode 100644
index 45a3c74cc4..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.commands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.commands module
-=========================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.rst
deleted file mode 100644
index ca37a3a627..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.menu.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.menu module
-=====================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.menu
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.rst
deleted file mode 100644
index 7d45c26d57..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.objects module
-========================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.rst
deleted file mode 100644
index cfd6a1dfb7..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.room.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.room module
-=====================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.room
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.rst
deleted file mode 100644
index e68e38fa8b..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom package
-=================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.full_systems.evscaperoom.commands
-   evennia.contrib.full_systems.evscaperoom.menu
-   evennia.contrib.full_systems.evscaperoom.objects
-   evennia.contrib.full_systems.evscaperoom.room
-   evennia.contrib.full_systems.evscaperoom.scripts
-   evennia.contrib.full_systems.evscaperoom.state
-   evennia.contrib.full_systems.evscaperoom.tests
-   evennia.contrib.full_systems.evscaperoom.utils
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.rst
deleted file mode 100644
index 18e0e891e1..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.scripts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.scripts module
-========================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.scripts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.rst
deleted file mode 100644
index ef411c3b0d..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.state.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.state module
-======================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.state
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.rst
deleted file mode 100644
index 89549b3db8..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.tests module
-======================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.rst b/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.rst
deleted file mode 100644
index d1e389de85..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.evscaperoom.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.full\_systems.evscaperoom.utils module
-======================================================
-
-.. automodule:: evennia.contrib.full_systems.evscaperoom.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.full_systems.rst b/docs/source/api/evennia.contrib.full_systems.rst
deleted file mode 100644
index e8c321d8b4..0000000000
--- a/docs/source/api/evennia.contrib.full_systems.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-evennia.contrib.full\_systems package
-=====================================
-
-.. automodule:: evennia.contrib.full_systems
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.full_systems.evscaperoom
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.barter.rst b/docs/source/api/evennia.contrib.game_systems.barter.barter.rst
deleted file mode 100644
index a5da1f27fe..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.barter.barter.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.barter.barter module
-==================================================
-
-.. automodule:: evennia.contrib.game_systems.barter.barter
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.rst b/docs/source/api/evennia.contrib.game_systems.barter.rst
deleted file mode 100644
index 04cb483bb9..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.barter.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.barter package
-============================================
-
-.. automodule:: evennia.contrib.game_systems.barter
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.barter.barter
-   evennia.contrib.game_systems.barter.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.barter.tests.rst b/docs/source/api/evennia.contrib.game_systems.barter.tests.rst
deleted file mode 100644
index 70d565871a..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.barter.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.barter.tests module
-=================================================
-
-.. automodule:: evennia.contrib.game_systems.barter.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.clothing.rst b/docs/source/api/evennia.contrib.game_systems.clothing.clothing.rst
deleted file mode 100644
index 2753e9a1cf..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.clothing.clothing.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.clothing.clothing module
-======================================================
-
-.. automodule:: evennia.contrib.game_systems.clothing.clothing
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.rst b/docs/source/api/evennia.contrib.game_systems.clothing.rst
deleted file mode 100644
index 546dc1b71f..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.clothing.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.clothing package
-==============================================
-
-.. automodule:: evennia.contrib.game_systems.clothing
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.clothing.clothing
-   evennia.contrib.game_systems.clothing.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.clothing.tests.rst b/docs/source/api/evennia.contrib.game_systems.clothing.tests.rst
deleted file mode 100644
index df2b16c377..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.clothing.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.clothing.tests module
-===================================================
-
-.. automodule:: evennia.contrib.game_systems.clothing.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.rst b/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.rst
deleted file mode 100644
index 86911974c1..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.cooldowns.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.cooldowns.cooldowns module
-========================================================
-
-.. automodule:: evennia.contrib.game_systems.cooldowns.cooldowns
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.rst b/docs/source/api/evennia.contrib.game_systems.cooldowns.rst
deleted file mode 100644
index 1489a76ccb..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.cooldowns package
-===============================================
-
-.. automodule:: evennia.contrib.game_systems.cooldowns
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.cooldowns.cooldowns
-   evennia.contrib.game_systems.cooldowns.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.rst b/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.rst
deleted file mode 100644
index 3673da29a7..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.cooldowns.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.cooldowns.tests module
-====================================================
-
-.. automodule:: evennia.contrib.game_systems.cooldowns.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.crafting.rst b/docs/source/api/evennia.contrib.game_systems.crafting.crafting.rst
deleted file mode 100644
index 4771da56b0..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.crafting.crafting.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.crafting.crafting module
-======================================================
-
-.. automodule:: evennia.contrib.game_systems.crafting.crafting
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.rst b/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.rst
deleted file mode 100644
index 4a29537b58..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.crafting.example_recipes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.crafting.example\_recipes module
-==============================================================
-
-.. automodule:: evennia.contrib.game_systems.crafting.example_recipes
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.rst b/docs/source/api/evennia.contrib.game_systems.crafting.rst
deleted file mode 100644
index a425dbd2a5..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.crafting.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.game\_systems.crafting package
-==============================================
-
-.. automodule:: evennia.contrib.game_systems.crafting
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.crafting.crafting
-   evennia.contrib.game_systems.crafting.example_recipes
-   evennia.contrib.game_systems.crafting.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.crafting.tests.rst b/docs/source/api/evennia.contrib.game_systems.crafting.tests.rst
deleted file mode 100644
index 0e0f67864d..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.crafting.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.crafting.tests module
-===================================================
-
-.. automodule:: evennia.contrib.game_systems.crafting.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.rst b/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.rst
deleted file mode 100644
index b5711e8f08..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.gendersub.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.gendersub.gendersub module
-========================================================
-
-.. automodule:: evennia.contrib.game_systems.gendersub.gendersub
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.rst b/docs/source/api/evennia.contrib.game_systems.gendersub.rst
deleted file mode 100644
index 9012d6781b..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.gendersub package
-===============================================
-
-.. automodule:: evennia.contrib.game_systems.gendersub
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.gendersub.gendersub
-   evennia.contrib.game_systems.gendersub.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.gendersub.tests.rst b/docs/source/api/evennia.contrib.game_systems.gendersub.tests.rst
deleted file mode 100644
index fa35254118..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.gendersub.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.gendersub.tests module
-====================================================
-
-.. automodule:: evennia.contrib.game_systems.gendersub.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.mail.rst b/docs/source/api/evennia.contrib.game_systems.mail.mail.rst
deleted file mode 100644
index 1cd1eb8b0c..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.mail.mail.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.mail.mail module
-==============================================
-
-.. automodule:: evennia.contrib.game_systems.mail.mail
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.rst b/docs/source/api/evennia.contrib.game_systems.mail.rst
deleted file mode 100644
index c96aaef865..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.mail.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.mail package
-==========================================
-
-.. automodule:: evennia.contrib.game_systems.mail
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.mail.mail
-   evennia.contrib.game_systems.mail.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.mail.tests.rst b/docs/source/api/evennia.contrib.game_systems.mail.tests.rst
deleted file mode 100644
index 28679f1994..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.mail.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.mail.tests module
-===============================================
-
-.. automodule:: evennia.contrib.game_systems.mail.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.rst b/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.rst
deleted file mode 100644
index 7ec51bac20..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.multidescer.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.multidescer.multidescer module
-============================================================
-
-.. automodule:: evennia.contrib.game_systems.multidescer.multidescer
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.rst b/docs/source/api/evennia.contrib.game_systems.multidescer.rst
deleted file mode 100644
index a00318ea21..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.multidescer package
-=================================================
-
-.. automodule:: evennia.contrib.game_systems.multidescer
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.multidescer.multidescer
-   evennia.contrib.game_systems.multidescer.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.multidescer.tests.rst b/docs/source/api/evennia.contrib.game_systems.multidescer.tests.rst
deleted file mode 100644
index 5d30372a1e..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.multidescer.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.multidescer.tests module
-======================================================
-
-.. automodule:: evennia.contrib.game_systems.multidescer.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.rst b/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.rst
deleted file mode 100644
index d53c8df3b5..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.puzzles.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.puzzles.puzzles module
-====================================================
-
-.. automodule:: evennia.contrib.game_systems.puzzles.puzzles
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.rst b/docs/source/api/evennia.contrib.game_systems.puzzles.rst
deleted file mode 100644
index b3fca6bb32..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.game\_systems.puzzles package
-=============================================
-
-.. automodule:: evennia.contrib.game_systems.puzzles
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.puzzles.puzzles
-   evennia.contrib.game_systems.puzzles.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.puzzles.tests.rst b/docs/source/api/evennia.contrib.game_systems.puzzles.tests.rst
deleted file mode 100644
index 968695094e..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.puzzles.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.puzzles.tests module
-==================================================
-
-.. automodule:: evennia.contrib.game_systems.puzzles.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.rst b/docs/source/api/evennia.contrib.game_systems.rst
deleted file mode 100644
index d84b996c3f..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-evennia.contrib.game\_systems package
-=====================================
-
-.. automodule:: evennia.contrib.game_systems
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.barter
-   evennia.contrib.game_systems.clothing
-   evennia.contrib.game_systems.cooldowns
-   evennia.contrib.game_systems.crafting
-   evennia.contrib.game_systems.gendersub
-   evennia.contrib.game_systems.mail
-   evennia.contrib.game_systems.multidescer
-   evennia.contrib.game_systems.puzzles
-   evennia.contrib.game_systems.turnbattle
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.rst
deleted file mode 100644
index b3e0bd3f4f..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-evennia.contrib.game\_systems.turnbattle package
-================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.game_systems.turnbattle.tb_basic
-   evennia.contrib.game_systems.turnbattle.tb_equip
-   evennia.contrib.game_systems.turnbattle.tb_items
-   evennia.contrib.game_systems.turnbattle.tb_magic
-   evennia.contrib.game_systems.turnbattle.tb_range
-   evennia.contrib.game_systems.turnbattle.tests
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.rst
deleted file mode 100644
index 75b085fa8d..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_basic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tb\_basic module
-=========================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tb_basic
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.rst
deleted file mode 100644
index b9e48e1282..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_equip.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tb\_equip module
-=========================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tb_equip
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.rst
deleted file mode 100644
index ef3ae5e1c4..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_items.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tb\_items module
-=========================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tb_items
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.rst
deleted file mode 100644
index 4e9f746e84..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_magic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tb\_magic module
-=========================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tb_magic
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.rst
deleted file mode 100644
index a960b46d10..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tb_range.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tb\_range module
-=========================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tb_range
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.rst b/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.rst
deleted file mode 100644
index 86cc3f0a07..0000000000
--- a/docs/source/api/evennia.contrib.game_systems.turnbattle.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.game\_systems.turnbattle.tests module
-=====================================================
-
-.. automodule:: evennia.contrib.game_systems.turnbattle.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.extended_room.rst b/docs/source/api/evennia.contrib.grid.extended_room.extended_room.rst
deleted file mode 100644
index 8dd90e644a..0000000000
--- a/docs/source/api/evennia.contrib.grid.extended_room.extended_room.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.extended\_room.extended\_room module
-=========================================================
-
-.. automodule:: evennia.contrib.grid.extended_room.extended_room
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.rst b/docs/source/api/evennia.contrib.grid.extended_room.rst
deleted file mode 100644
index ce6f6a8de1..0000000000
--- a/docs/source/api/evennia.contrib.grid.extended_room.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.grid.extended\_room package
-===========================================
-
-.. automodule:: evennia.contrib.grid.extended_room
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.extended_room.extended_room
-   evennia.contrib.grid.extended_room.tests
diff --git a/docs/source/api/evennia.contrib.grid.extended_room.tests.rst b/docs/source/api/evennia.contrib.grid.extended_room.tests.rst
deleted file mode 100644
index 8cd23ae52e..0000000000
--- a/docs/source/api/evennia.contrib.grid.extended_room.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.extended\_room.tests module
-================================================
-
-.. automodule:: evennia.contrib.grid.extended_room.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.rst b/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.rst
deleted file mode 100644
index fb1471eec7..0000000000
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.mapbuilder.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.mapbuilder.mapbuilder module
-=================================================
-
-.. automodule:: evennia.contrib.grid.mapbuilder.mapbuilder
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.rst b/docs/source/api/evennia.contrib.grid.mapbuilder.rst
deleted file mode 100644
index a810761e44..0000000000
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.grid.mapbuilder package
-=======================================
-
-.. automodule:: evennia.contrib.grid.mapbuilder
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.mapbuilder.mapbuilder
-   evennia.contrib.grid.mapbuilder.tests
diff --git a/docs/source/api/evennia.contrib.grid.mapbuilder.tests.rst b/docs/source/api/evennia.contrib.grid.mapbuilder.tests.rst
deleted file mode 100644
index 51f2b3ddd8..0000000000
--- a/docs/source/api/evennia.contrib.grid.mapbuilder.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.mapbuilder.tests module
-============================================
-
-.. automodule:: evennia.contrib.grid.mapbuilder.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.rst b/docs/source/api/evennia.contrib.grid.rst
deleted file mode 100644
index 5dcb1410d3..0000000000
--- a/docs/source/api/evennia.contrib.grid.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-evennia.contrib.grid package
-============================
-
-.. automodule:: evennia.contrib.grid
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.extended_room
-   evennia.contrib.grid.mapbuilder
-   evennia.contrib.grid.simpledoor
-   evennia.contrib.grid.slow_exit
-   evennia.contrib.grid.wilderness
-   evennia.contrib.grid.xyzgrid
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.rst b/docs/source/api/evennia.contrib.grid.simpledoor.rst
deleted file mode 100644
index d2417a996e..0000000000
--- a/docs/source/api/evennia.contrib.grid.simpledoor.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.grid.simpledoor package
-=======================================
-
-.. automodule:: evennia.contrib.grid.simpledoor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.simpledoor.simpledoor
-   evennia.contrib.grid.simpledoor.tests
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.rst b/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.rst
deleted file mode 100644
index e77ff0f80b..0000000000
--- a/docs/source/api/evennia.contrib.grid.simpledoor.simpledoor.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.simpledoor.simpledoor module
-=================================================
-
-.. automodule:: evennia.contrib.grid.simpledoor.simpledoor
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.simpledoor.tests.rst b/docs/source/api/evennia.contrib.grid.simpledoor.tests.rst
deleted file mode 100644
index 39cca9dd6b..0000000000
--- a/docs/source/api/evennia.contrib.grid.simpledoor.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.simpledoor.tests module
-============================================
-
-.. automodule:: evennia.contrib.grid.simpledoor.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.rst b/docs/source/api/evennia.contrib.grid.slow_exit.rst
deleted file mode 100644
index f87494bd1e..0000000000
--- a/docs/source/api/evennia.contrib.grid.slow_exit.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.grid.slow\_exit package
-=======================================
-
-.. automodule:: evennia.contrib.grid.slow_exit
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.slow_exit.slow_exit
-   evennia.contrib.grid.slow_exit.tests
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.rst b/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.rst
deleted file mode 100644
index 5fc04f05cc..0000000000
--- a/docs/source/api/evennia.contrib.grid.slow_exit.slow_exit.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.slow\_exit.slow\_exit module
-=================================================
-
-.. automodule:: evennia.contrib.grid.slow_exit.slow_exit
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.slow_exit.tests.rst b/docs/source/api/evennia.contrib.grid.slow_exit.tests.rst
deleted file mode 100644
index 9ac2966cfd..0000000000
--- a/docs/source/api/evennia.contrib.grid.slow_exit.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.slow\_exit.tests module
-============================================
-
-.. automodule:: evennia.contrib.grid.slow_exit.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.rst b/docs/source/api/evennia.contrib.grid.wilderness.rst
deleted file mode 100644
index ff22335b66..0000000000
--- a/docs/source/api/evennia.contrib.grid.wilderness.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.grid.wilderness package
-=======================================
-
-.. automodule:: evennia.contrib.grid.wilderness
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.wilderness.tests
-   evennia.contrib.grid.wilderness.wilderness
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.tests.rst b/docs/source/api/evennia.contrib.grid.wilderness.tests.rst
deleted file mode 100644
index b2e7a66c1c..0000000000
--- a/docs/source/api/evennia.contrib.grid.wilderness.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.wilderness.tests module
-============================================
-
-.. automodule:: evennia.contrib.grid.wilderness.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.wilderness.wilderness.rst b/docs/source/api/evennia.contrib.grid.wilderness.wilderness.rst
deleted file mode 100644
index 1c2a53cb22..0000000000
--- a/docs/source/api/evennia.contrib.grid.wilderness.wilderness.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.wilderness.wilderness module
-=================================================
-
-.. automodule:: evennia.contrib.grid.wilderness.wilderness
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.commands.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.commands.rst
deleted file mode 100644
index 1c29c88845..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.commands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.commands module
-============================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.example.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.example.rst
deleted file mode 100644
index fd2671fe53..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.example.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.example module
-===========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.example
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.rst
deleted file mode 100644
index cb8e660fe0..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.launchcmd.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.launchcmd module
-=============================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.launchcmd
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.rst
deleted file mode 100644
index d7c08c3413..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.prototypes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.prototypes module
-==============================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.prototypes
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.rst
deleted file mode 100644
index 8da0e720f7..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-evennia.contrib.grid.xyzgrid package
-====================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.grid.xyzgrid.commands
-   evennia.contrib.grid.xyzgrid.example
-   evennia.contrib.grid.xyzgrid.launchcmd
-   evennia.contrib.grid.xyzgrid.prototypes
-   evennia.contrib.grid.xyzgrid.tests
-   evennia.contrib.grid.xyzgrid.utils
-   evennia.contrib.grid.xyzgrid.xymap
-   evennia.contrib.grid.xyzgrid.xymap_legend
-   evennia.contrib.grid.xyzgrid.xyzgrid
-   evennia.contrib.grid.xyzgrid.xyzroom
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.tests.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.tests.rst
deleted file mode 100644
index 182bc3d674..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.tests module
-=========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.utils.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.utils.rst
deleted file mode 100644
index 2560076037..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.utils module
-=========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.rst
deleted file mode 100644
index 3ffdbe2d74..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.xymap module
-=========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.xymap
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.rst
deleted file mode 100644
index beabfa713d..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xymap_legend.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.xymap\_legend module
-=================================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.xymap_legend
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.rst
deleted file mode 100644
index eedf1020f1..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzgrid.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.xyzgrid module
-===========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.xyzgrid
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.rst b/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.rst
deleted file mode 100644
index 816c1073d3..0000000000
--- a/docs/source/api/evennia.contrib.grid.xyzgrid.xyzroom.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.grid.xyzgrid.xyzroom module
-===========================================
-
-.. automodule:: evennia.contrib.grid.xyzgrid.xyzroom
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.buff.rst b/docs/source/api/evennia.contrib.rpg.buffs.buff.rst
deleted file mode 100644
index aea46662c9..0000000000
--- a/docs/source/api/evennia.contrib.rpg.buffs.buff.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.buffs.buff module
-=====================================
-
-.. automodule:: evennia.contrib.rpg.buffs.buff
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.rst b/docs/source/api/evennia.contrib.rpg.buffs.rst
deleted file mode 100644
index 701c236892..0000000000
--- a/docs/source/api/evennia.contrib.rpg.buffs.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.rpg.buffs package
-=================================
-
-.. automodule:: evennia.contrib.rpg.buffs
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.buffs.buff
-   evennia.contrib.rpg.buffs.samplebuffs
-   evennia.contrib.rpg.buffs.tests
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.rst b/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.rst
deleted file mode 100644
index b3cd14a4b3..0000000000
--- a/docs/source/api/evennia.contrib.rpg.buffs.samplebuffs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.buffs.samplebuffs module
-============================================
-
-.. automodule:: evennia.contrib.rpg.buffs.samplebuffs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.buffs.tests.rst b/docs/source/api/evennia.contrib.rpg.buffs.tests.rst
deleted file mode 100644
index 1d6174500c..0000000000
--- a/docs/source/api/evennia.contrib.rpg.buffs.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.buffs.tests module
-======================================
-
-.. automodule:: evennia.contrib.rpg.buffs.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.dice.dice.rst b/docs/source/api/evennia.contrib.rpg.dice.dice.rst
deleted file mode 100644
index 907ed2eb3f..0000000000
--- a/docs/source/api/evennia.contrib.rpg.dice.dice.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.dice.dice module
-====================================
-
-.. automodule:: evennia.contrib.rpg.dice.dice
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.dice.rst b/docs/source/api/evennia.contrib.rpg.dice.rst
deleted file mode 100644
index e97b14e4aa..0000000000
--- a/docs/source/api/evennia.contrib.rpg.dice.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.rpg.dice package
-================================
-
-.. automodule:: evennia.contrib.rpg.dice
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.dice.dice
-   evennia.contrib.rpg.dice.tests
diff --git a/docs/source/api/evennia.contrib.rpg.dice.tests.rst b/docs/source/api/evennia.contrib.rpg.dice.tests.rst
deleted file mode 100644
index 2a310141c3..0000000000
--- a/docs/source/api/evennia.contrib.rpg.dice.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.dice.tests module
-=====================================
-
-.. automodule:: evennia.contrib.rpg.dice.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.rst b/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.rst
deleted file mode 100644
index 91c7a57be9..0000000000
--- a/docs/source/api/evennia.contrib.rpg.health_bar.health_bar.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.health\_bar.health\_bar module
-==================================================
-
-.. automodule:: evennia.contrib.rpg.health_bar.health_bar
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.rst b/docs/source/api/evennia.contrib.rpg.health_bar.rst
deleted file mode 100644
index 799605f789..0000000000
--- a/docs/source/api/evennia.contrib.rpg.health_bar.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.rpg.health\_bar package
-=======================================
-
-.. automodule:: evennia.contrib.rpg.health_bar
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.health_bar.health_bar
-   evennia.contrib.rpg.health_bar.tests
diff --git a/docs/source/api/evennia.contrib.rpg.health_bar.tests.rst b/docs/source/api/evennia.contrib.rpg.health_bar.tests.rst
deleted file mode 100644
index e6cf8f63a9..0000000000
--- a/docs/source/api/evennia.contrib.rpg.health_bar.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.health\_bar.tests module
-============================================
-
-.. automodule:: evennia.contrib.rpg.health_bar.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.rst b/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.rst
deleted file mode 100644
index 22756ef7ce..0000000000
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.rplanguage.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.rpsystem.rplanguage module
-==============================================
-
-.. automodule:: evennia.contrib.rpg.rpsystem.rplanguage
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.rst b/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.rst
deleted file mode 100644
index 2a3b870976..0000000000
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.rpsystem.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.rpsystem.rpsystem module
-============================================
-
-.. automodule:: evennia.contrib.rpg.rpsystem.rpsystem
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.rst b/docs/source/api/evennia.contrib.rpg.rpsystem.rst
deleted file mode 100644
index 0e6d60f88e..0000000000
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.rpg.rpsystem package
-====================================
-
-.. automodule:: evennia.contrib.rpg.rpsystem
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.rpsystem.rplanguage
-   evennia.contrib.rpg.rpsystem.rpsystem
-   evennia.contrib.rpg.rpsystem.tests
diff --git a/docs/source/api/evennia.contrib.rpg.rpsystem.tests.rst b/docs/source/api/evennia.contrib.rpg.rpsystem.tests.rst
deleted file mode 100644
index f48cd2c9a5..0000000000
--- a/docs/source/api/evennia.contrib.rpg.rpsystem.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.rpsystem.tests module
-=========================================
-
-.. automodule:: evennia.contrib.rpg.rpsystem.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.rst b/docs/source/api/evennia.contrib.rpg.rst
deleted file mode 100644
index cf7f5d961d..0000000000
--- a/docs/source/api/evennia.contrib.rpg.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-evennia.contrib.rpg package
-===========================
-
-.. automodule:: evennia.contrib.rpg
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.buffs
-   evennia.contrib.rpg.dice
-   evennia.contrib.rpg.health_bar
-   evennia.contrib.rpg.rpsystem
-   evennia.contrib.rpg.traits
diff --git a/docs/source/api/evennia.contrib.rpg.traits.rst b/docs/source/api/evennia.contrib.rpg.traits.rst
deleted file mode 100644
index 9664bca8f9..0000000000
--- a/docs/source/api/evennia.contrib.rpg.traits.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.rpg.traits package
-==================================
-
-.. automodule:: evennia.contrib.rpg.traits
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.rpg.traits.tests
-   evennia.contrib.rpg.traits.traits
diff --git a/docs/source/api/evennia.contrib.rpg.traits.tests.rst b/docs/source/api/evennia.contrib.rpg.traits.tests.rst
deleted file mode 100644
index 0a90321dd5..0000000000
--- a/docs/source/api/evennia.contrib.rpg.traits.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.traits.tests module
-=======================================
-
-.. automodule:: evennia.contrib.rpg.traits.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rpg.traits.traits.rst b/docs/source/api/evennia.contrib.rpg.traits.traits.rst
deleted file mode 100644
index b51d825c37..0000000000
--- a/docs/source/api/evennia.contrib.rpg.traits.traits.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.rpg.traits.traits module
-========================================
-
-.. automodule:: evennia.contrib.rpg.traits.traits
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.rst b/docs/source/api/evennia.contrib.rst
deleted file mode 100644
index a7fb965905..0000000000
--- a/docs/source/api/evennia.contrib.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-evennia.contrib package
-=======================
-
-.. automodule:: evennia.contrib
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.base_systems
-   evennia.contrib.full_systems
-   evennia.contrib.game_systems
-   evennia.contrib.grid
-   evennia.contrib.rpg
-   evennia.contrib.tutorials
-   evennia.contrib.utils
diff --git a/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.rst b/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.rst
deleted file mode 100644
index 2a909aff2e..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.batchprocessor.example_batch_code.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.batchprocessor.example\_batch\_code module
-====================================================================
-
-.. automodule:: evennia.contrib.tutorials.batchprocessor.example_batch_code
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.batchprocessor.rst b/docs/source/api/evennia.contrib.tutorials.batchprocessor.rst
deleted file mode 100644
index 61939ca5f1..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.batchprocessor.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-evennia.contrib.tutorials.batchprocessor package
-================================================
-
-.. automodule:: evennia.contrib.tutorials.batchprocessor
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.batchprocessor.example_batch_code
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.rst b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.rst
deleted file mode 100644
index e539bf7e08..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.bodyfunctions.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.bodyfunctions.bodyfunctions module
-============================================================
-
-.. automodule:: evennia.contrib.tutorials.bodyfunctions.bodyfunctions
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.rst b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.rst
deleted file mode 100644
index 43c1726d19..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.tutorials.bodyfunctions package
-===============================================
-
-.. automodule:: evennia.contrib.tutorials.bodyfunctions
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.bodyfunctions.bodyfunctions
-   evennia.contrib.tutorials.bodyfunctions.tests
diff --git a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.rst b/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.rst
deleted file mode 100644
index 0fe4b768bf..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.bodyfunctions.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.bodyfunctions.tests module
-====================================================
-
-.. automodule:: evennia.contrib.tutorials.bodyfunctions.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.rst
deleted file mode 100644
index 162911450a..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.build_techdemo.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.build\_techdemo module
-============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.build_techdemo
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.rst
deleted file mode 100644
index 2a22e04974..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.build_world.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.build\_world module
-=========================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.build_world
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.characters.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.characters.rst
deleted file mode 100644
index 7981266660..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.characters.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.characters module
-=======================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.characters
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.rst
deleted file mode 100644
index f057acb4f1..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.combat_turnbased.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.combat\_turnbased module
-==============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.combat_turnbased
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.commands.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.commands.rst
deleted file mode 100644
index dbd6e31069..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.commands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.commands module
-=====================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.rst
deleted file mode 100644
index e9df318075..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.dungeon.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.dungeon module
-====================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.dungeon
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.enums.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.enums.rst
deleted file mode 100644
index 63b6c852ac..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.enums.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.enums module
-==================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.enums
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.rst
deleted file mode 100644
index 9e3280927e..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.equipment.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.equipment module
-======================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.equipment
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.rst
deleted file mode 100644
index 49d29135b9..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.npcs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.npcs module
-=================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.npcs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.objects.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.objects.rst
deleted file mode 100644
index 4852550680..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.objects module
-====================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.quests.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.quests.rst
deleted file mode 100644
index 560a68212d..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.quests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.quests module
-===================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.quests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.rst
deleted file mode 100644
index e6a3eba526..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.random_tables.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.random\_tables module
-===========================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.random_tables
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.rst
deleted file mode 100644
index b4851491c6..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.rooms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.rooms module
-==================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.rooms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.rst
deleted file mode 100644
index 7f4925a71a..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-evennia.contrib.tutorials.evadventure package
-=============================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.evadventure.build_techdemo
-   evennia.contrib.tutorials.evadventure.build_world
-   evennia.contrib.tutorials.evadventure.characters
-   evennia.contrib.tutorials.evadventure.combat_turnbased
-   evennia.contrib.tutorials.evadventure.commands
-   evennia.contrib.tutorials.evadventure.dungeon
-   evennia.contrib.tutorials.evadventure.enums
-   evennia.contrib.tutorials.evadventure.equipment
-   evennia.contrib.tutorials.evadventure.npcs
-   evennia.contrib.tutorials.evadventure.objects
-   evennia.contrib.tutorials.evadventure.quests
-   evennia.contrib.tutorials.evadventure.random_tables
-   evennia.contrib.tutorials.evadventure.rooms
-   evennia.contrib.tutorials.evadventure.rules
-   evennia.contrib.tutorials.evadventure.shops
-   evennia.contrib.tutorials.evadventure.utils
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.evadventure.tests
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.rules.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.rules.rst
deleted file mode 100644
index a47b67eae1..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.rules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.rules module
-==================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.rules
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.shops.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.shops.rst
deleted file mode 100644
index 6895f95604..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.shops.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.shops module
-==================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.shops
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
index f1147ca9e8..7521957b62 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.md
@@ -17,6 +17,7 @@ evennia.contrib.tutorials.evadventure.tests
    evennia.contrib.tutorials.evadventure.tests.test_combat
    evennia.contrib.tutorials.evadventure.tests.test_commands
    evennia.contrib.tutorials.evadventure.tests.test_dungeon
+   evennia.contrib.tutorials.evadventure.tests.test_equipment
    evennia.contrib.tutorials.evadventure.tests.test_quests
    evennia.contrib.tutorials.evadventure.tests.test_rules
    evennia.contrib.tutorials.evadventure.tests.test_utils
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.rst
deleted file mode 100644
index 9971ff0281..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.mixins.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.mixins module
-=========================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.mixins
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.rst
deleted file mode 100644
index 41bd8553d4..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests package
-===================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.evadventure.tests.mixins
-   evennia.contrib.tutorials.evadventure.tests.test_characters
-   evennia.contrib.tutorials.evadventure.tests.test_combat
-   evennia.contrib.tutorials.evadventure.tests.test_commands
-   evennia.contrib.tutorials.evadventure.tests.test_dungeon
-   evennia.contrib.tutorials.evadventure.tests.test_quests
-   evennia.contrib.tutorials.evadventure.tests.test_rules
-   evennia.contrib.tutorials.evadventure.tests.test_utils
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.rst
deleted file mode 100644
index cfffdb7b67..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_characters.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_characters module
-===================================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_characters
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.rst
deleted file mode 100644
index a3d6713ab7..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_combat.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_combat module
-===============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_combat
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.rst
deleted file mode 100644
index d94c8730a7..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_commands.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_commands module
-=================================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_commands
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
similarity index 66%
rename from docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.rst
rename to docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
index d00a1291a2..eef19c659b 100644
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_dungeon.rst
+++ b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_equipment.md
@@ -1,7 +1,10 @@
-evennia.contrib.tutorials.evadventure.tests.test\_dungeon module
-================================================================
+```{eval-rst}
+evennia.contrib.tutorials.evadventure.tests.test\_equipment 
+==================================================================
 
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_dungeon
+.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_equipment
    :members:
    :undoc-members:
    :show-inheritance:
+
+```
\ No newline at end of file
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.rst
deleted file mode 100644
index 0397f0bd11..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_quests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_quests module
-===============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_quests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.rst
deleted file mode 100644
index 3fc6eb9d97..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_rules.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_rules module
-==============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_rules
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.rst
deleted file mode 100644
index 39d3aba676..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.tests.test_utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.tests.test\_utils module
-==============================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.tests.test_utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.evadventure.utils.rst b/docs/source/api/evennia.contrib.tutorials.evadventure.utils.rst
deleted file mode 100644
index bf410e4770..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.evadventure.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.evadventure.utils module
-==================================================
-
-.. automodule:: evennia.contrib.tutorials.evadventure.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.mirror.mirror.rst b/docs/source/api/evennia.contrib.tutorials.mirror.mirror.rst
deleted file mode 100644
index be050f2fb4..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.mirror.mirror.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.mirror.mirror module
-==============================================
-
-.. automodule:: evennia.contrib.tutorials.mirror.mirror
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.mirror.rst b/docs/source/api/evennia.contrib.tutorials.mirror.rst
deleted file mode 100644
index 59d4a44097..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.mirror.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-evennia.contrib.tutorials.mirror package
-========================================
-
-.. automodule:: evennia.contrib.tutorials.mirror
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.mirror.mirror
diff --git a/docs/source/api/evennia.contrib.tutorials.red_button.red_button.rst b/docs/source/api/evennia.contrib.tutorials.red_button.red_button.rst
deleted file mode 100644
index 1b1be56930..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.red_button.red_button.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.red\_button.red\_button module
-========================================================
-
-.. automodule:: evennia.contrib.tutorials.red_button.red_button
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.red_button.rst b/docs/source/api/evennia.contrib.tutorials.red_button.rst
deleted file mode 100644
index 8d2f10812e..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.red_button.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-evennia.contrib.tutorials.red\_button package
-=============================================
-
-.. automodule:: evennia.contrib.tutorials.red_button
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.red_button.red_button
diff --git a/docs/source/api/evennia.contrib.tutorials.rst b/docs/source/api/evennia.contrib.tutorials.rst
deleted file mode 100644
index 0d978ea018..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-evennia.contrib.tutorials package
-=================================
-
-.. automodule:: evennia.contrib.tutorials
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.batchprocessor
-   evennia.contrib.tutorials.bodyfunctions
-   evennia.contrib.tutorials.evadventure
-   evennia.contrib.tutorials.mirror
-   evennia.contrib.tutorials.red_button
-   evennia.contrib.tutorials.talking_npc
-   evennia.contrib.tutorials.tutorial_world
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.rst b/docs/source/api/evennia.contrib.tutorials.talking_npc.rst
deleted file mode 100644
index 8ca55a58f1..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.tutorials.talking\_npc package
-==============================================
-
-.. automodule:: evennia.contrib.tutorials.talking_npc
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.talking_npc.talking_npc
-   evennia.contrib.tutorials.talking_npc.tests
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.rst b/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.rst
deleted file mode 100644
index 5205935812..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.talking_npc.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.talking\_npc.talking\_npc module
-==========================================================
-
-.. automodule:: evennia.contrib.tutorials.talking_npc.talking_npc
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.rst b/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.rst
deleted file mode 100644
index 66395a2d4a..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.talking_npc.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.talking\_npc.tests module
-===================================================
-
-.. automodule:: evennia.contrib.tutorials.talking_npc.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.rst
deleted file mode 100644
index 9714358cb0..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.intro_menu.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world.intro\_menu module
-============================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world.intro_menu
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.rst
deleted file mode 100644
index 94fded7116..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.mob.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world.mob module
-====================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world.mob
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.rst
deleted file mode 100644
index bcf874d7be..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world.objects module
-========================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.rst
deleted file mode 100644
index bffd71dce1..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rooms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world.rooms module
-======================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world.rooms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.rst
deleted file mode 100644
index b81db86cb8..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world package
-=================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.tutorials.tutorial_world.intro_menu
-   evennia.contrib.tutorials.tutorial_world.mob
-   evennia.contrib.tutorials.tutorial_world.objects
-   evennia.contrib.tutorials.tutorial_world.rooms
-   evennia.contrib.tutorials.tutorial_world.tests
diff --git a/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.rst b/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.rst
deleted file mode 100644
index 16d88cf6e4..0000000000
--- a/docs/source/api/evennia.contrib.tutorials.tutorial_world.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.tutorials.tutorial\_world.tests module
-======================================================
-
-.. automodule:: evennia.contrib.tutorials.tutorial_world.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.auditing.outputs.rst b/docs/source/api/evennia.contrib.utils.auditing.outputs.rst
deleted file mode 100644
index 5d348fdbbb..0000000000
--- a/docs/source/api/evennia.contrib.utils.auditing.outputs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.auditing.outputs module
-=============================================
-
-.. automodule:: evennia.contrib.utils.auditing.outputs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.auditing.rst b/docs/source/api/evennia.contrib.utils.auditing.rst
deleted file mode 100644
index a0297059b2..0000000000
--- a/docs/source/api/evennia.contrib.utils.auditing.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.utils.auditing package
-======================================
-
-.. automodule:: evennia.contrib.utils.auditing
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.utils.auditing.outputs
-   evennia.contrib.utils.auditing.server
-   evennia.contrib.utils.auditing.tests
diff --git a/docs/source/api/evennia.contrib.utils.auditing.server.rst b/docs/source/api/evennia.contrib.utils.auditing.server.rst
deleted file mode 100644
index 53aeaa214b..0000000000
--- a/docs/source/api/evennia.contrib.utils.auditing.server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.auditing.server module
-============================================
-
-.. automodule:: evennia.contrib.utils.auditing.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.auditing.tests.rst b/docs/source/api/evennia.contrib.utils.auditing.tests.rst
deleted file mode 100644
index de177d2714..0000000000
--- a/docs/source/api/evennia.contrib.utils.auditing.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.auditing.tests module
-===========================================
-
-.. automodule:: evennia.contrib.utils.auditing.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.rst b/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.rst
deleted file mode 100644
index fc7dfa3a35..0000000000
--- a/docs/source/api/evennia.contrib.utils.fieldfill.fieldfill.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.fieldfill.fieldfill module
-================================================
-
-.. automodule:: evennia.contrib.utils.fieldfill.fieldfill
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.fieldfill.rst b/docs/source/api/evennia.contrib.utils.fieldfill.rst
deleted file mode 100644
index de5b345a0e..0000000000
--- a/docs/source/api/evennia.contrib.utils.fieldfill.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-evennia.contrib.utils.fieldfill package
-=======================================
-
-.. automodule:: evennia.contrib.utils.fieldfill
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.utils.fieldfill.fieldfill
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.rst b/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.rst
deleted file mode 100644
index 625f4f1f98..0000000000
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.random_string_generator.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.random\_string\_generator.random\_string\_generator module
-================================================================================
-
-.. automodule:: evennia.contrib.utils.random_string_generator.random_string_generator
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.rst b/docs/source/api/evennia.contrib.utils.random_string_generator.rst
deleted file mode 100644
index 7034519c48..0000000000
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.utils.random\_string\_generator package
-=======================================================
-
-.. automodule:: evennia.contrib.utils.random_string_generator
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.utils.random_string_generator.random_string_generator
-   evennia.contrib.utils.random_string_generator.tests
diff --git a/docs/source/api/evennia.contrib.utils.random_string_generator.tests.rst b/docs/source/api/evennia.contrib.utils.random_string_generator.tests.rst
deleted file mode 100644
index e32af2917f..0000000000
--- a/docs/source/api/evennia.contrib.utils.random_string_generator.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.random\_string\_generator.tests module
-============================================================
-
-.. automodule:: evennia.contrib.utils.random_string_generator.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.rst b/docs/source/api/evennia.contrib.utils.rst
deleted file mode 100644
index e157f0937d..0000000000
--- a/docs/source/api/evennia.contrib.utils.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.contrib.utils package
-=============================
-
-.. automodule:: evennia.contrib.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.utils.auditing
-   evennia.contrib.utils.fieldfill
-   evennia.contrib.utils.random_string_generator
-   evennia.contrib.utils.tree_select
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.rst b/docs/source/api/evennia.contrib.utils.tree_select.rst
deleted file mode 100644
index 0b30d36be2..0000000000
--- a/docs/source/api/evennia.contrib.utils.tree_select.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.contrib.utils.tree\_select package
-==========================================
-
-.. automodule:: evennia.contrib.utils.tree_select
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.contrib.utils.tree_select.tests
-   evennia.contrib.utils.tree_select.tree_select
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.tests.rst b/docs/source/api/evennia.contrib.utils.tree_select.tests.rst
deleted file mode 100644
index 7aec68524b..0000000000
--- a/docs/source/api/evennia.contrib.utils.tree_select.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.tree\_select.tests module
-===============================================
-
-.. automodule:: evennia.contrib.utils.tree_select.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.contrib.utils.tree_select.tree_select.rst b/docs/source/api/evennia.contrib.utils.tree_select.tree_select.rst
deleted file mode 100644
index 4f089494a0..0000000000
--- a/docs/source/api/evennia.contrib.utils.tree_select.tree_select.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.contrib.utils.tree\_select.tree\_select module
-======================================================
-
-.. automodule:: evennia.contrib.utils.tree_select.tree_select
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.help.filehelp.rst b/docs/source/api/evennia.help.filehelp.rst
deleted file mode 100644
index 8febe4e120..0000000000
--- a/docs/source/api/evennia.help.filehelp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.help.filehelp module
-============================
-
-.. automodule:: evennia.help.filehelp
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.help.manager.rst b/docs/source/api/evennia.help.manager.rst
deleted file mode 100644
index 46b62b695c..0000000000
--- a/docs/source/api/evennia.help.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.help.manager module
-===========================
-
-.. automodule:: evennia.help.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.help.models.rst b/docs/source/api/evennia.help.models.rst
deleted file mode 100644
index 18c3dfccd5..0000000000
--- a/docs/source/api/evennia.help.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.help.models module
-==========================
-
-.. automodule:: evennia.help.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.help.rst b/docs/source/api/evennia.help.rst
deleted file mode 100644
index 1054d0a90e..0000000000
--- a/docs/source/api/evennia.help.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-evennia.help package
-====================
-
-.. automodule:: evennia.help
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.help.filehelp
-   evennia.help.manager
-   evennia.help.models
-   evennia.help.utils
diff --git a/docs/source/api/evennia.help.utils.rst b/docs/source/api/evennia.help.utils.rst
deleted file mode 100644
index 788f281ce2..0000000000
--- a/docs/source/api/evennia.help.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.help.utils module
-=========================
-
-.. automodule:: evennia.help.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.locks.lockfuncs.rst b/docs/source/api/evennia.locks.lockfuncs.rst
deleted file mode 100644
index edb024f28e..0000000000
--- a/docs/source/api/evennia.locks.lockfuncs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.locks.lockfuncs module
-==============================
-
-.. automodule:: evennia.locks.lockfuncs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.locks.lockhandler.rst b/docs/source/api/evennia.locks.lockhandler.rst
deleted file mode 100644
index 0d5334e56d..0000000000
--- a/docs/source/api/evennia.locks.lockhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.locks.lockhandler module
-================================
-
-.. automodule:: evennia.locks.lockhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.locks.rst b/docs/source/api/evennia.locks.rst
deleted file mode 100644
index c3661ed277..0000000000
--- a/docs/source/api/evennia.locks.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.locks package
-=====================
-
-.. automodule:: evennia.locks
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.locks.lockfuncs
-   evennia.locks.lockhandler
diff --git a/docs/source/api/evennia.objects.manager.rst b/docs/source/api/evennia.objects.manager.rst
deleted file mode 100644
index 802bea6c37..0000000000
--- a/docs/source/api/evennia.objects.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.objects.manager module
-==============================
-
-.. automodule:: evennia.objects.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.objects.models.rst b/docs/source/api/evennia.objects.models.rst
deleted file mode 100644
index dd33d05d0a..0000000000
--- a/docs/source/api/evennia.objects.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.objects.models module
-=============================
-
-.. automodule:: evennia.objects.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.objects.objects.rst b/docs/source/api/evennia.objects.objects.rst
deleted file mode 100644
index 7061bed07a..0000000000
--- a/docs/source/api/evennia.objects.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.objects.objects module
-==============================
-
-.. automodule:: evennia.objects.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.objects.rst b/docs/source/api/evennia.objects.rst
deleted file mode 100644
index 7532d1ac11..0000000000
--- a/docs/source/api/evennia.objects.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.objects package
-=======================
-
-.. automodule:: evennia.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.objects.manager
-   evennia.objects.models
-   evennia.objects.objects
diff --git a/docs/source/api/evennia.prototypes.menus.rst b/docs/source/api/evennia.prototypes.menus.rst
deleted file mode 100644
index 6f80f77bd6..0000000000
--- a/docs/source/api/evennia.prototypes.menus.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.prototypes.menus module
-===============================
-
-.. automodule:: evennia.prototypes.menus
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.prototypes.protfuncs.rst b/docs/source/api/evennia.prototypes.protfuncs.rst
deleted file mode 100644
index b6b9ce4616..0000000000
--- a/docs/source/api/evennia.prototypes.protfuncs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.prototypes.protfuncs module
-===================================
-
-.. automodule:: evennia.prototypes.protfuncs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.prototypes.prototypes.rst b/docs/source/api/evennia.prototypes.prototypes.rst
deleted file mode 100644
index bb1ed1014f..0000000000
--- a/docs/source/api/evennia.prototypes.prototypes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.prototypes.prototypes module
-====================================
-
-.. automodule:: evennia.prototypes.prototypes
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.prototypes.rst b/docs/source/api/evennia.prototypes.rst
deleted file mode 100644
index 7efa2bafbc..0000000000
--- a/docs/source/api/evennia.prototypes.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-evennia.prototypes package
-==========================
-
-.. automodule:: evennia.prototypes
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.prototypes.menus
-   evennia.prototypes.protfuncs
-   evennia.prototypes.prototypes
-   evennia.prototypes.spawner
diff --git a/docs/source/api/evennia.prototypes.spawner.rst b/docs/source/api/evennia.prototypes.spawner.rst
deleted file mode 100644
index e94c8bc5d6..0000000000
--- a/docs/source/api/evennia.prototypes.spawner.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.prototypes.spawner module
-=================================
-
-.. automodule:: evennia.prototypes.spawner
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.rst b/docs/source/api/evennia.rst
deleted file mode 100644
index 96692c5117..0000000000
--- a/docs/source/api/evennia.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-evennia package
-===============
-
-.. automodule:: evennia
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.settings_default
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.accounts
-   evennia.commands
-   evennia.comms
-   evennia.contrib
-   evennia.help
-   evennia.locks
-   evennia.objects
-   evennia.prototypes
-   evennia.scripts
-   evennia.server
-   evennia.typeclasses
-   evennia.utils
-   evennia.web
diff --git a/docs/source/api/evennia.scripts.manager.rst b/docs/source/api/evennia.scripts.manager.rst
deleted file mode 100644
index 74b306ed8d..0000000000
--- a/docs/source/api/evennia.scripts.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.manager module
-==============================
-
-.. automodule:: evennia.scripts.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.models.rst b/docs/source/api/evennia.scripts.models.rst
deleted file mode 100644
index f7a1417fae..0000000000
--- a/docs/source/api/evennia.scripts.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.models module
-=============================
-
-.. automodule:: evennia.scripts.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.monitorhandler.rst b/docs/source/api/evennia.scripts.monitorhandler.rst
deleted file mode 100644
index 56b124ddc8..0000000000
--- a/docs/source/api/evennia.scripts.monitorhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.monitorhandler module
-=====================================
-
-.. automodule:: evennia.scripts.monitorhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.rst b/docs/source/api/evennia.scripts.rst
deleted file mode 100644
index 8a11356c9d..0000000000
--- a/docs/source/api/evennia.scripts.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-evennia.scripts package
-=======================
-
-.. automodule:: evennia.scripts
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.scripts.manager
-   evennia.scripts.models
-   evennia.scripts.monitorhandler
-   evennia.scripts.scripthandler
-   evennia.scripts.scripts
-   evennia.scripts.taskhandler
-   evennia.scripts.tickerhandler
diff --git a/docs/source/api/evennia.scripts.scripthandler.rst b/docs/source/api/evennia.scripts.scripthandler.rst
deleted file mode 100644
index 2b249b3a17..0000000000
--- a/docs/source/api/evennia.scripts.scripthandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.scripthandler module
-====================================
-
-.. automodule:: evennia.scripts.scripthandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.scripts.rst b/docs/source/api/evennia.scripts.scripts.rst
deleted file mode 100644
index f23529fb57..0000000000
--- a/docs/source/api/evennia.scripts.scripts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.scripts module
-==============================
-
-.. automodule:: evennia.scripts.scripts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.taskhandler.rst b/docs/source/api/evennia.scripts.taskhandler.rst
deleted file mode 100644
index 194d9f4639..0000000000
--- a/docs/source/api/evennia.scripts.taskhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.taskhandler module
-==================================
-
-.. automodule:: evennia.scripts.taskhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.scripts.tickerhandler.rst b/docs/source/api/evennia.scripts.tickerhandler.rst
deleted file mode 100644
index cf1992afb4..0000000000
--- a/docs/source/api/evennia.scripts.tickerhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.scripts.tickerhandler module
-====================================
-
-.. automodule:: evennia.scripts.tickerhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.amp_client.rst b/docs/source/api/evennia.server.amp_client.rst
deleted file mode 100644
index 9aa130109f..0000000000
--- a/docs/source/api/evennia.server.amp_client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.amp\_client module
-=================================
-
-.. automodule:: evennia.server.amp_client
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.connection_wizard.rst b/docs/source/api/evennia.server.connection_wizard.rst
deleted file mode 100644
index 52ad626510..0000000000
--- a/docs/source/api/evennia.server.connection_wizard.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.connection\_wizard module
-========================================
-
-.. automodule:: evennia.server.connection_wizard
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.deprecations.rst b/docs/source/api/evennia.server.deprecations.rst
deleted file mode 100644
index aacb232c1f..0000000000
--- a/docs/source/api/evennia.server.deprecations.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.deprecations module
-==================================
-
-.. automodule:: evennia.server.deprecations
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.evennia_launcher.rst b/docs/source/api/evennia.server.evennia_launcher.rst
deleted file mode 100644
index 70821160b8..0000000000
--- a/docs/source/api/evennia.server.evennia_launcher.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.evennia\_launcher module
-=======================================
-
-.. automodule:: evennia.server.evennia_launcher
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.game_index_client.client.rst b/docs/source/api/evennia.server.game_index_client.client.rst
deleted file mode 100644
index 1faec15410..0000000000
--- a/docs/source/api/evennia.server.game_index_client.client.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.game\_index\_client.client module
-================================================
-
-.. automodule:: evennia.server.game_index_client.client
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.game_index_client.rst b/docs/source/api/evennia.server.game_index_client.rst
deleted file mode 100644
index 46d81e24d9..0000000000
--- a/docs/source/api/evennia.server.game_index_client.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.server.game\_index\_client package
-==========================================
-
-.. automodule:: evennia.server.game_index_client
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.game_index_client.client
-   evennia.server.game_index_client.service
diff --git a/docs/source/api/evennia.server.game_index_client.service.rst b/docs/source/api/evennia.server.game_index_client.service.rst
deleted file mode 100644
index d6061f642c..0000000000
--- a/docs/source/api/evennia.server.game_index_client.service.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.game\_index\_client.service module
-=================================================
-
-.. automodule:: evennia.server.game_index_client.service
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.initial_setup.rst b/docs/source/api/evennia.server.initial_setup.rst
deleted file mode 100644
index f03c870f24..0000000000
--- a/docs/source/api/evennia.server.initial_setup.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.initial\_setup module
-====================================
-
-.. automodule:: evennia.server.initial_setup
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.inputfuncs.rst b/docs/source/api/evennia.server.inputfuncs.rst
deleted file mode 100644
index 60a771f777..0000000000
--- a/docs/source/api/evennia.server.inputfuncs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.inputfuncs module
-================================
-
-.. automodule:: evennia.server.inputfuncs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.manager.rst b/docs/source/api/evennia.server.manager.rst
deleted file mode 100644
index 69f687203b..0000000000
--- a/docs/source/api/evennia.server.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.manager module
-=============================
-
-.. automodule:: evennia.server.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.models.rst b/docs/source/api/evennia.server.models.rst
deleted file mode 100644
index c5fadb43a9..0000000000
--- a/docs/source/api/evennia.server.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.models module
-============================
-
-.. automodule:: evennia.server.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.amp.rst b/docs/source/api/evennia.server.portal.amp.rst
deleted file mode 100644
index bd11c4ba75..0000000000
--- a/docs/source/api/evennia.server.portal.amp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.amp module
-================================
-
-.. automodule:: evennia.server.portal.amp
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.amp_server.rst b/docs/source/api/evennia.server.portal.amp_server.rst
deleted file mode 100644
index c401deb66f..0000000000
--- a/docs/source/api/evennia.server.portal.amp_server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.amp\_server module
-========================================
-
-.. automodule:: evennia.server.portal.amp_server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.grapevine.rst b/docs/source/api/evennia.server.portal.grapevine.rst
deleted file mode 100644
index f264ff5c58..0000000000
--- a/docs/source/api/evennia.server.portal.grapevine.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.grapevine module
-======================================
-
-.. automodule:: evennia.server.portal.grapevine
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.irc.rst b/docs/source/api/evennia.server.portal.irc.rst
deleted file mode 100644
index 8600dfd321..0000000000
--- a/docs/source/api/evennia.server.portal.irc.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.irc module
-================================
-
-.. automodule:: evennia.server.portal.irc
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.mccp.rst b/docs/source/api/evennia.server.portal.mccp.rst
deleted file mode 100644
index 07b1b59ba4..0000000000
--- a/docs/source/api/evennia.server.portal.mccp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.mccp module
-=================================
-
-.. automodule:: evennia.server.portal.mccp
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.mssp.rst b/docs/source/api/evennia.server.portal.mssp.rst
deleted file mode 100644
index 1c11924208..0000000000
--- a/docs/source/api/evennia.server.portal.mssp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.mssp module
-=================================
-
-.. automodule:: evennia.server.portal.mssp
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.mxp.rst b/docs/source/api/evennia.server.portal.mxp.rst
deleted file mode 100644
index 4388abb641..0000000000
--- a/docs/source/api/evennia.server.portal.mxp.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.mxp module
-================================
-
-.. automodule:: evennia.server.portal.mxp
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.naws.rst b/docs/source/api/evennia.server.portal.naws.rst
deleted file mode 100644
index cb037f8ee4..0000000000
--- a/docs/source/api/evennia.server.portal.naws.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.naws module
-=================================
-
-.. automodule:: evennia.server.portal.naws
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.portal.rst b/docs/source/api/evennia.server.portal.portal.rst
deleted file mode 100644
index 0d2ec92400..0000000000
--- a/docs/source/api/evennia.server.portal.portal.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.portal module
-===================================
-
-.. automodule:: evennia.server.portal.portal
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.portalsessionhandler.rst b/docs/source/api/evennia.server.portal.portalsessionhandler.rst
deleted file mode 100644
index f5287f88b8..0000000000
--- a/docs/source/api/evennia.server.portal.portalsessionhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.portalsessionhandler module
-=================================================
-
-.. automodule:: evennia.server.portal.portalsessionhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.rss.rst b/docs/source/api/evennia.server.portal.rss.rst
deleted file mode 100644
index e7dde8bf7f..0000000000
--- a/docs/source/api/evennia.server.portal.rss.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.rss module
-================================
-
-.. automodule:: evennia.server.portal.rss
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.rst b/docs/source/api/evennia.server.portal.rst
deleted file mode 100644
index 07e2590206..0000000000
--- a/docs/source/api/evennia.server.portal.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-evennia.server.portal package
-=============================
-
-.. automodule:: evennia.server.portal
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.portal.amp
-   evennia.server.portal.amp_server
-   evennia.server.portal.grapevine
-   evennia.server.portal.irc
-   evennia.server.portal.mccp
-   evennia.server.portal.mssp
-   evennia.server.portal.mxp
-   evennia.server.portal.naws
-   evennia.server.portal.portal
-   evennia.server.portal.portalsessionhandler
-   evennia.server.portal.rss
-   evennia.server.portal.ssh
-   evennia.server.portal.ssl
-   evennia.server.portal.suppress_ga
-   evennia.server.portal.telnet
-   evennia.server.portal.telnet_oob
-   evennia.server.portal.telnet_ssl
-   evennia.server.portal.tests
-   evennia.server.portal.ttype
-   evennia.server.portal.webclient
-   evennia.server.portal.webclient_ajax
diff --git a/docs/source/api/evennia.server.portal.ssh.rst b/docs/source/api/evennia.server.portal.ssh.rst
deleted file mode 100644
index 6cd0d8b114..0000000000
--- a/docs/source/api/evennia.server.portal.ssh.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.ssh module
-================================
-
-.. automodule:: evennia.server.portal.ssh
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.ssl.rst b/docs/source/api/evennia.server.portal.ssl.rst
deleted file mode 100644
index 76a9344833..0000000000
--- a/docs/source/api/evennia.server.portal.ssl.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.ssl module
-================================
-
-.. automodule:: evennia.server.portal.ssl
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.suppress_ga.rst b/docs/source/api/evennia.server.portal.suppress_ga.rst
deleted file mode 100644
index 3dc234d103..0000000000
--- a/docs/source/api/evennia.server.portal.suppress_ga.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.suppress\_ga module
-=========================================
-
-.. automodule:: evennia.server.portal.suppress_ga
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.telnet.rst b/docs/source/api/evennia.server.portal.telnet.rst
deleted file mode 100644
index debd283f04..0000000000
--- a/docs/source/api/evennia.server.portal.telnet.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.telnet module
-===================================
-
-.. automodule:: evennia.server.portal.telnet
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.telnet_oob.rst b/docs/source/api/evennia.server.portal.telnet_oob.rst
deleted file mode 100644
index a882430740..0000000000
--- a/docs/source/api/evennia.server.portal.telnet_oob.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.telnet\_oob module
-========================================
-
-.. automodule:: evennia.server.portal.telnet_oob
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.telnet_ssl.rst b/docs/source/api/evennia.server.portal.telnet_ssl.rst
deleted file mode 100644
index 694f99dd2a..0000000000
--- a/docs/source/api/evennia.server.portal.telnet_ssl.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.telnet\_ssl module
-========================================
-
-.. automodule:: evennia.server.portal.telnet_ssl
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.tests.rst b/docs/source/api/evennia.server.portal.tests.rst
deleted file mode 100644
index d763f3d333..0000000000
--- a/docs/source/api/evennia.server.portal.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.tests module
-==================================
-
-.. automodule:: evennia.server.portal.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.ttype.rst b/docs/source/api/evennia.server.portal.ttype.rst
deleted file mode 100644
index 3851ee81c1..0000000000
--- a/docs/source/api/evennia.server.portal.ttype.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.ttype module
-==================================
-
-.. automodule:: evennia.server.portal.ttype
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.webclient.rst b/docs/source/api/evennia.server.portal.webclient.rst
deleted file mode 100644
index 67ef7c1934..0000000000
--- a/docs/source/api/evennia.server.portal.webclient.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.webclient module
-======================================
-
-.. automodule:: evennia.server.portal.webclient
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.portal.webclient_ajax.rst b/docs/source/api/evennia.server.portal.webclient_ajax.rst
deleted file mode 100644
index ea74aa238c..0000000000
--- a/docs/source/api/evennia.server.portal.webclient_ajax.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.portal.webclient\_ajax module
-============================================
-
-.. automodule:: evennia.server.portal.webclient_ajax
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.dummyrunner.rst b/docs/source/api/evennia.server.profiling.dummyrunner.rst
deleted file mode 100644
index 510fc8061b..0000000000
--- a/docs/source/api/evennia.server.profiling.dummyrunner.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.dummyrunner module
-===========================================
-
-.. automodule:: evennia.server.profiling.dummyrunner
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.dummyrunner_settings.rst b/docs/source/api/evennia.server.profiling.dummyrunner_settings.rst
deleted file mode 100644
index 20c4a9ccbe..0000000000
--- a/docs/source/api/evennia.server.profiling.dummyrunner_settings.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.dummyrunner\_settings module
-=====================================================
-
-.. automodule:: evennia.server.profiling.dummyrunner_settings
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.memplot.rst b/docs/source/api/evennia.server.profiling.memplot.rst
deleted file mode 100644
index 671fe70e00..0000000000
--- a/docs/source/api/evennia.server.profiling.memplot.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.memplot module
-=======================================
-
-.. automodule:: evennia.server.profiling.memplot
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.rst b/docs/source/api/evennia.server.profiling.rst
deleted file mode 100644
index 61d427e041..0000000000
--- a/docs/source/api/evennia.server.profiling.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-evennia.server.profiling package
-================================
-
-.. automodule:: evennia.server.profiling
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.profiling.dummyrunner
-   evennia.server.profiling.dummyrunner_settings
-   evennia.server.profiling.memplot
-   evennia.server.profiling.settings_mixin
-   evennia.server.profiling.test_queries
-   evennia.server.profiling.tests
-   evennia.server.profiling.timetrace
diff --git a/docs/source/api/evennia.server.profiling.settings_mixin.rst b/docs/source/api/evennia.server.profiling.settings_mixin.rst
deleted file mode 100644
index ddadc21b48..0000000000
--- a/docs/source/api/evennia.server.profiling.settings_mixin.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.settings\_mixin module
-===============================================
-
-.. automodule:: evennia.server.profiling.settings_mixin
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.test_queries.rst b/docs/source/api/evennia.server.profiling.test_queries.rst
deleted file mode 100644
index a7ea4eeeb6..0000000000
--- a/docs/source/api/evennia.server.profiling.test_queries.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.test\_queries module
-=============================================
-
-.. automodule:: evennia.server.profiling.test_queries
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.tests.rst b/docs/source/api/evennia.server.profiling.tests.rst
deleted file mode 100644
index 58d2c0a678..0000000000
--- a/docs/source/api/evennia.server.profiling.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.tests module
-=====================================
-
-.. automodule:: evennia.server.profiling.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.profiling.timetrace.rst b/docs/source/api/evennia.server.profiling.timetrace.rst
deleted file mode 100644
index 07a19a4b25..0000000000
--- a/docs/source/api/evennia.server.profiling.timetrace.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.profiling.timetrace module
-=========================================
-
-.. automodule:: evennia.server.profiling.timetrace
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.rst b/docs/source/api/evennia.server.rst
deleted file mode 100644
index 1f5ac39e0a..0000000000
--- a/docs/source/api/evennia.server.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-evennia.server package
-======================
-
-.. automodule:: evennia.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.amp_client
-   evennia.server.connection_wizard
-   evennia.server.deprecations
-   evennia.server.evennia_launcher
-   evennia.server.initial_setup
-   evennia.server.inputfuncs
-   evennia.server.manager
-   evennia.server.models
-   evennia.server.server
-   evennia.server.serversession
-   evennia.server.session
-   evennia.server.sessionhandler
-   evennia.server.signals
-   evennia.server.throttle
-   evennia.server.validators
-   evennia.server.webserver
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.server.game_index_client
-   evennia.server.portal
-   evennia.server.profiling
diff --git a/docs/source/api/evennia.server.server.rst b/docs/source/api/evennia.server.server.rst
deleted file mode 100644
index f19e598541..0000000000
--- a/docs/source/api/evennia.server.server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.server module
-============================
-
-.. automodule:: evennia.server.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.serversession.rst b/docs/source/api/evennia.server.serversession.rst
deleted file mode 100644
index 9a34500eac..0000000000
--- a/docs/source/api/evennia.server.serversession.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.serversession module
-===================================
-
-.. automodule:: evennia.server.serversession
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.session.rst b/docs/source/api/evennia.server.session.rst
deleted file mode 100644
index 724de92312..0000000000
--- a/docs/source/api/evennia.server.session.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.session module
-=============================
-
-.. automodule:: evennia.server.session
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.sessionhandler.rst b/docs/source/api/evennia.server.sessionhandler.rst
deleted file mode 100644
index 2ecede5faa..0000000000
--- a/docs/source/api/evennia.server.sessionhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.sessionhandler module
-====================================
-
-.. automodule:: evennia.server.sessionhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.signals.rst b/docs/source/api/evennia.server.signals.rst
deleted file mode 100644
index ab1f13cb8b..0000000000
--- a/docs/source/api/evennia.server.signals.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.signals module
-=============================
-
-.. automodule:: evennia.server.signals
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.throttle.rst b/docs/source/api/evennia.server.throttle.rst
deleted file mode 100644
index 95832cdda4..0000000000
--- a/docs/source/api/evennia.server.throttle.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.throttle module
-==============================
-
-.. automodule:: evennia.server.throttle
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.validators.rst b/docs/source/api/evennia.server.validators.rst
deleted file mode 100644
index 3aa6cd87c5..0000000000
--- a/docs/source/api/evennia.server.validators.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.validators module
-================================
-
-.. automodule:: evennia.server.validators
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.server.webserver.rst b/docs/source/api/evennia.server.webserver.rst
deleted file mode 100644
index 286f51a9da..0000000000
--- a/docs/source/api/evennia.server.webserver.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.server.webserver module
-===============================
-
-.. automodule:: evennia.server.webserver
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.settings_default.rst b/docs/source/api/evennia.settings_default.rst
deleted file mode 100644
index 2c990344db..0000000000
--- a/docs/source/api/evennia.settings_default.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.settings\_default module
-================================
-
-.. automodule:: evennia.settings_default
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.typeclasses.attributes.rst b/docs/source/api/evennia.typeclasses.attributes.rst
deleted file mode 100644
index 46239c9424..0000000000
--- a/docs/source/api/evennia.typeclasses.attributes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.typeclasses.attributes module
-=====================================
-
-.. automodule:: evennia.typeclasses.attributes
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.typeclasses.managers.rst b/docs/source/api/evennia.typeclasses.managers.rst
deleted file mode 100644
index 2cf9c78593..0000000000
--- a/docs/source/api/evennia.typeclasses.managers.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.typeclasses.managers module
-===================================
-
-.. automodule:: evennia.typeclasses.managers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.typeclasses.models.rst b/docs/source/api/evennia.typeclasses.models.rst
deleted file mode 100644
index 32307e4315..0000000000
--- a/docs/source/api/evennia.typeclasses.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.typeclasses.models module
-=================================
-
-.. automodule:: evennia.typeclasses.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.typeclasses.rst b/docs/source/api/evennia.typeclasses.rst
deleted file mode 100644
index 9609d8f468..0000000000
--- a/docs/source/api/evennia.typeclasses.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-evennia.typeclasses package
-===========================
-
-.. automodule:: evennia.typeclasses
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.typeclasses.attributes
-   evennia.typeclasses.managers
-   evennia.typeclasses.models
-   evennia.typeclasses.tags
diff --git a/docs/source/api/evennia.typeclasses.tags.rst b/docs/source/api/evennia.typeclasses.tags.rst
deleted file mode 100644
index bc091ae2a8..0000000000
--- a/docs/source/api/evennia.typeclasses.tags.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.typeclasses.tags module
-===============================
-
-.. automodule:: evennia.typeclasses.tags
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.ansi.rst b/docs/source/api/evennia.utils.ansi.rst
deleted file mode 100644
index d49406af94..0000000000
--- a/docs/source/api/evennia.utils.ansi.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.ansi module
-=========================
-
-.. automodule:: evennia.utils.ansi
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.batchprocessors.rst b/docs/source/api/evennia.utils.batchprocessors.rst
deleted file mode 100644
index c6f59c7292..0000000000
--- a/docs/source/api/evennia.utils.batchprocessors.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.batchprocessors module
-====================================
-
-.. automodule:: evennia.utils.batchprocessors
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.containers.rst b/docs/source/api/evennia.utils.containers.rst
deleted file mode 100644
index dc37c47de9..0000000000
--- a/docs/source/api/evennia.utils.containers.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.containers module
-===============================
-
-.. automodule:: evennia.utils.containers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.create.rst b/docs/source/api/evennia.utils.create.rst
deleted file mode 100644
index 4245a2a902..0000000000
--- a/docs/source/api/evennia.utils.create.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.create module
-===========================
-
-.. automodule:: evennia.utils.create
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.dbserialize.rst b/docs/source/api/evennia.utils.dbserialize.rst
deleted file mode 100644
index 5858563eb2..0000000000
--- a/docs/source/api/evennia.utils.dbserialize.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.dbserialize module
-================================
-
-.. automodule:: evennia.utils.dbserialize
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.eveditor.rst b/docs/source/api/evennia.utils.eveditor.rst
deleted file mode 100644
index 80651e5f87..0000000000
--- a/docs/source/api/evennia.utils.eveditor.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.eveditor module
-=============================
-
-.. automodule:: evennia.utils.eveditor
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.evform.rst b/docs/source/api/evennia.utils.evform.rst
deleted file mode 100644
index 60321c7eda..0000000000
--- a/docs/source/api/evennia.utils.evform.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.evform module
-===========================
-
-.. automodule:: evennia.utils.evform
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.evmenu.rst b/docs/source/api/evennia.utils.evmenu.rst
deleted file mode 100644
index 8ffb7f29d5..0000000000
--- a/docs/source/api/evennia.utils.evmenu.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.evmenu module
-===========================
-
-.. automodule:: evennia.utils.evmenu
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.evmore.rst b/docs/source/api/evennia.utils.evmore.rst
deleted file mode 100644
index e403887f77..0000000000
--- a/docs/source/api/evennia.utils.evmore.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.evmore module
-===========================
-
-.. automodule:: evennia.utils.evmore
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.evtable.rst b/docs/source/api/evennia.utils.evtable.rst
deleted file mode 100644
index a83c49745c..0000000000
--- a/docs/source/api/evennia.utils.evtable.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.evtable module
-============================
-
-.. automodule:: evennia.utils.evtable
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.funcparser.rst b/docs/source/api/evennia.utils.funcparser.rst
deleted file mode 100644
index ad0694beac..0000000000
--- a/docs/source/api/evennia.utils.funcparser.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.funcparser module
-===============================
-
-.. automodule:: evennia.utils.funcparser
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.gametime.rst b/docs/source/api/evennia.utils.gametime.rst
deleted file mode 100644
index d2675d3f27..0000000000
--- a/docs/source/api/evennia.utils.gametime.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.gametime module
-=============================
-
-.. automodule:: evennia.utils.gametime
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.idmapper.manager.rst b/docs/source/api/evennia.utils.idmapper.manager.rst
deleted file mode 100644
index f3a49a13cd..0000000000
--- a/docs/source/api/evennia.utils.idmapper.manager.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.idmapper.manager module
-=====================================
-
-.. automodule:: evennia.utils.idmapper.manager
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.idmapper.models.rst b/docs/source/api/evennia.utils.idmapper.models.rst
deleted file mode 100644
index 61af1a2f79..0000000000
--- a/docs/source/api/evennia.utils.idmapper.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.idmapper.models module
-====================================
-
-.. automodule:: evennia.utils.idmapper.models
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.idmapper.rst b/docs/source/api/evennia.utils.idmapper.rst
deleted file mode 100644
index b8b5e8cee8..0000000000
--- a/docs/source/api/evennia.utils.idmapper.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.utils.idmapper package
-==============================
-
-.. automodule:: evennia.utils.idmapper
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.utils.idmapper.manager
-   evennia.utils.idmapper.models
-   evennia.utils.idmapper.tests
diff --git a/docs/source/api/evennia.utils.idmapper.tests.rst b/docs/source/api/evennia.utils.idmapper.tests.rst
deleted file mode 100644
index 7c0b427d65..0000000000
--- a/docs/source/api/evennia.utils.idmapper.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.idmapper.tests module
-===================================
-
-.. automodule:: evennia.utils.idmapper.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.logger.rst b/docs/source/api/evennia.utils.logger.rst
deleted file mode 100644
index 185538cfe6..0000000000
--- a/docs/source/api/evennia.utils.logger.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.logger module
-===========================
-
-.. automodule:: evennia.utils.logger
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.optionclasses.rst b/docs/source/api/evennia.utils.optionclasses.rst
deleted file mode 100644
index 7982b36a5b..0000000000
--- a/docs/source/api/evennia.utils.optionclasses.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.optionclasses module
-==================================
-
-.. automodule:: evennia.utils.optionclasses
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.optionhandler.rst b/docs/source/api/evennia.utils.optionhandler.rst
deleted file mode 100644
index ff1a7f03ab..0000000000
--- a/docs/source/api/evennia.utils.optionhandler.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.optionhandler module
-==================================
-
-.. automodule:: evennia.utils.optionhandler
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.picklefield.rst b/docs/source/api/evennia.utils.picklefield.rst
deleted file mode 100644
index a7039a1681..0000000000
--- a/docs/source/api/evennia.utils.picklefield.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.picklefield module
-================================
-
-.. automodule:: evennia.utils.picklefield
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.rst b/docs/source/api/evennia.utils.rst
deleted file mode 100644
index 05d05e6a7d..0000000000
--- a/docs/source/api/evennia.utils.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-evennia.utils package
-=====================
-
-.. automodule:: evennia.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.utils.ansi
-   evennia.utils.batchprocessors
-   evennia.utils.containers
-   evennia.utils.create
-   evennia.utils.dbserialize
-   evennia.utils.eveditor
-   evennia.utils.evform
-   evennia.utils.evmenu
-   evennia.utils.evmore
-   evennia.utils.evtable
-   evennia.utils.funcparser
-   evennia.utils.gametime
-   evennia.utils.logger
-   evennia.utils.optionclasses
-   evennia.utils.optionhandler
-   evennia.utils.picklefield
-   evennia.utils.search
-   evennia.utils.test_resources
-   evennia.utils.text2html
-   evennia.utils.utils
-   evennia.utils.validatorfuncs
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.utils.idmapper
-   evennia.utils.verb_conjugation
diff --git a/docs/source/api/evennia.utils.search.rst b/docs/source/api/evennia.utils.search.rst
deleted file mode 100644
index 5602e68ddd..0000000000
--- a/docs/source/api/evennia.utils.search.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.search module
-===========================
-
-.. automodule:: evennia.utils.search
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.test_resources.rst b/docs/source/api/evennia.utils.test_resources.rst
deleted file mode 100644
index 1d5708d5aa..0000000000
--- a/docs/source/api/evennia.utils.test_resources.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.test\_resources module
-====================================
-
-.. automodule:: evennia.utils.test_resources
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.text2html.rst b/docs/source/api/evennia.utils.text2html.rst
deleted file mode 100644
index 1d2feefceb..0000000000
--- a/docs/source/api/evennia.utils.text2html.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.text2html module
-==============================
-
-.. automodule:: evennia.utils.text2html
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.utils.rst b/docs/source/api/evennia.utils.utils.rst
deleted file mode 100644
index d6eb2ca10d..0000000000
--- a/docs/source/api/evennia.utils.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.utils module
-==========================
-
-.. automodule:: evennia.utils.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.validatorfuncs.rst b/docs/source/api/evennia.utils.validatorfuncs.rst
deleted file mode 100644
index 1e723a11a9..0000000000
--- a/docs/source/api/evennia.utils.validatorfuncs.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.validatorfuncs module
-===================================
-
-.. automodule:: evennia.utils.validatorfuncs
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.verb_conjugation.conjugate.rst b/docs/source/api/evennia.utils.verb_conjugation.conjugate.rst
deleted file mode 100644
index e7b880e4ce..0000000000
--- a/docs/source/api/evennia.utils.verb_conjugation.conjugate.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.verb\_conjugation.conjugate module
-================================================
-
-.. automodule:: evennia.utils.verb_conjugation.conjugate
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.verb_conjugation.pronouns.rst b/docs/source/api/evennia.utils.verb_conjugation.pronouns.rst
deleted file mode 100644
index a45ebc13e3..0000000000
--- a/docs/source/api/evennia.utils.verb_conjugation.pronouns.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.verb\_conjugation.pronouns module
-===============================================
-
-.. automodule:: evennia.utils.verb_conjugation.pronouns
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.utils.verb_conjugation.rst b/docs/source/api/evennia.utils.verb_conjugation.rst
deleted file mode 100644
index f818f7e333..0000000000
--- a/docs/source/api/evennia.utils.verb_conjugation.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-evennia.utils.verb\_conjugation package
-=======================================
-
-.. automodule:: evennia.utils.verb_conjugation
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.utils.verb_conjugation.conjugate
-   evennia.utils.verb_conjugation.pronouns
-   evennia.utils.verb_conjugation.tests
diff --git a/docs/source/api/evennia.utils.verb_conjugation.tests.rst b/docs/source/api/evennia.utils.verb_conjugation.tests.rst
deleted file mode 100644
index e0e008719d..0000000000
--- a/docs/source/api/evennia.utils.verb_conjugation.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.utils.verb\_conjugation.tests module
-============================================
-
-.. automodule:: evennia.utils.verb_conjugation.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.accounts.rst b/docs/source/api/evennia.web.admin.accounts.rst
deleted file mode 100644
index 1560e9824f..0000000000
--- a/docs/source/api/evennia.web.admin.accounts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.accounts module
-=================================
-
-.. automodule:: evennia.web.admin.accounts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.attributes.rst b/docs/source/api/evennia.web.admin.attributes.rst
deleted file mode 100644
index f3f26036b1..0000000000
--- a/docs/source/api/evennia.web.admin.attributes.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.attributes module
-===================================
-
-.. automodule:: evennia.web.admin.attributes
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.comms.rst b/docs/source/api/evennia.web.admin.comms.rst
deleted file mode 100644
index 91f4e8b473..0000000000
--- a/docs/source/api/evennia.web.admin.comms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.comms module
-==============================
-
-.. automodule:: evennia.web.admin.comms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.frontpage.rst b/docs/source/api/evennia.web.admin.frontpage.rst
deleted file mode 100644
index b3e67346bd..0000000000
--- a/docs/source/api/evennia.web.admin.frontpage.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.frontpage module
-==================================
-
-.. automodule:: evennia.web.admin.frontpage
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.help.rst b/docs/source/api/evennia.web.admin.help.rst
deleted file mode 100644
index d7aeeb1b65..0000000000
--- a/docs/source/api/evennia.web.admin.help.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.help module
-=============================
-
-.. automodule:: evennia.web.admin.help
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.objects.rst b/docs/source/api/evennia.web.admin.objects.rst
deleted file mode 100644
index ddbe501c8d..0000000000
--- a/docs/source/api/evennia.web.admin.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.objects module
-================================
-
-.. automodule:: evennia.web.admin.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.rst b/docs/source/api/evennia.web.admin.rst
deleted file mode 100644
index badbc7cc27..0000000000
--- a/docs/source/api/evennia.web.admin.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-evennia.web.admin package
-=========================
-
-.. automodule:: evennia.web.admin
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.admin.accounts
-   evennia.web.admin.attributes
-   evennia.web.admin.comms
-   evennia.web.admin.frontpage
-   evennia.web.admin.help
-   evennia.web.admin.objects
-   evennia.web.admin.scripts
-   evennia.web.admin.server
-   evennia.web.admin.tags
-   evennia.web.admin.urls
-   evennia.web.admin.utils
diff --git a/docs/source/api/evennia.web.admin.scripts.rst b/docs/source/api/evennia.web.admin.scripts.rst
deleted file mode 100644
index 837270273b..0000000000
--- a/docs/source/api/evennia.web.admin.scripts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.scripts module
-================================
-
-.. automodule:: evennia.web.admin.scripts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.server.rst b/docs/source/api/evennia.web.admin.server.rst
deleted file mode 100644
index 8d48b56084..0000000000
--- a/docs/source/api/evennia.web.admin.server.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.server module
-===============================
-
-.. automodule:: evennia.web.admin.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.tags.rst b/docs/source/api/evennia.web.admin.tags.rst
deleted file mode 100644
index 660153842d..0000000000
--- a/docs/source/api/evennia.web.admin.tags.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.tags module
-=============================
-
-.. automodule:: evennia.web.admin.tags
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.urls.rst b/docs/source/api/evennia.web.admin.urls.rst
deleted file mode 100644
index 0be8897db9..0000000000
--- a/docs/source/api/evennia.web.admin.urls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.urls module
-=============================
-
-.. automodule:: evennia.web.admin.urls
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.admin.utils.rst b/docs/source/api/evennia.web.admin.utils.rst
deleted file mode 100644
index c1d3998706..0000000000
--- a/docs/source/api/evennia.web.admin.utils.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.admin.utils module
-==============================
-
-.. automodule:: evennia.web.admin.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.filters.rst b/docs/source/api/evennia.web.api.filters.rst
deleted file mode 100644
index 744719403a..0000000000
--- a/docs/source/api/evennia.web.api.filters.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.filters module
-==============================
-
-.. automodule:: evennia.web.api.filters
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.permissions.rst b/docs/source/api/evennia.web.api.permissions.rst
deleted file mode 100644
index 688838decf..0000000000
--- a/docs/source/api/evennia.web.api.permissions.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.permissions module
-==================================
-
-.. automodule:: evennia.web.api.permissions
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.root.rst b/docs/source/api/evennia.web.api.root.rst
deleted file mode 100644
index 6783ac550d..0000000000
--- a/docs/source/api/evennia.web.api.root.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.root module
-===========================
-
-.. automodule:: evennia.web.api.root
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.rst b/docs/source/api/evennia.web.api.rst
deleted file mode 100644
index 55fada4570..0000000000
--- a/docs/source/api/evennia.web.api.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-evennia.web.api package
-=======================
-
-.. automodule:: evennia.web.api
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.api.filters
-   evennia.web.api.permissions
-   evennia.web.api.root
-   evennia.web.api.serializers
-   evennia.web.api.tests
-   evennia.web.api.urls
-   evennia.web.api.views
diff --git a/docs/source/api/evennia.web.api.serializers.rst b/docs/source/api/evennia.web.api.serializers.rst
deleted file mode 100644
index d9b4769f32..0000000000
--- a/docs/source/api/evennia.web.api.serializers.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.serializers module
-==================================
-
-.. automodule:: evennia.web.api.serializers
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.tests.rst b/docs/source/api/evennia.web.api.tests.rst
deleted file mode 100644
index a606ea56ef..0000000000
--- a/docs/source/api/evennia.web.api.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.tests module
-============================
-
-.. automodule:: evennia.web.api.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.urls.rst b/docs/source/api/evennia.web.api.urls.rst
deleted file mode 100644
index 14e05a5bea..0000000000
--- a/docs/source/api/evennia.web.api.urls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.urls module
-===========================
-
-.. automodule:: evennia.web.api.urls
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.api.views.rst b/docs/source/api/evennia.web.api.views.rst
deleted file mode 100644
index 3bbff42175..0000000000
--- a/docs/source/api/evennia.web.api.views.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.api.views module
-============================
-
-.. automodule:: evennia.web.api.views
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.rst b/docs/source/api/evennia.web.rst
deleted file mode 100644
index 02e4610a68..0000000000
--- a/docs/source/api/evennia.web.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-evennia.web package
-===================
-
-.. automodule:: evennia.web
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.urls
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.admin
-   evennia.web.api
-   evennia.web.templatetags
-   evennia.web.utils
-   evennia.web.webclient
-   evennia.web.website
diff --git a/docs/source/api/evennia.web.templatetags.addclass.rst b/docs/source/api/evennia.web.templatetags.addclass.rst
deleted file mode 100644
index d6d9347ebf..0000000000
--- a/docs/source/api/evennia.web.templatetags.addclass.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.templatetags.addclass module
-========================================
-
-.. automodule:: evennia.web.templatetags.addclass
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.templatetags.rst b/docs/source/api/evennia.web.templatetags.rst
deleted file mode 100644
index 0fe07514c7..0000000000
--- a/docs/source/api/evennia.web.templatetags.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-evennia.web.templatetags package
-================================
-
-.. automodule:: evennia.web.templatetags
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.templatetags.addclass
diff --git a/docs/source/api/evennia.web.urls.rst b/docs/source/api/evennia.web.urls.rst
deleted file mode 100644
index 61de474486..0000000000
--- a/docs/source/api/evennia.web.urls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.urls module
-=======================
-
-.. automodule:: evennia.web.urls
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.utils.adminsite.rst b/docs/source/api/evennia.web.utils.adminsite.rst
deleted file mode 100644
index 32eb3ea6a6..0000000000
--- a/docs/source/api/evennia.web.utils.adminsite.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.utils.adminsite module
-==================================
-
-.. automodule:: evennia.web.utils.adminsite
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.utils.backends.rst b/docs/source/api/evennia.web.utils.backends.rst
deleted file mode 100644
index 92492878ed..0000000000
--- a/docs/source/api/evennia.web.utils.backends.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.utils.backends module
-=================================
-
-.. automodule:: evennia.web.utils.backends
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.utils.general_context.rst b/docs/source/api/evennia.web.utils.general_context.rst
deleted file mode 100644
index d561fc68ac..0000000000
--- a/docs/source/api/evennia.web.utils.general_context.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.utils.general\_context module
-=========================================
-
-.. automodule:: evennia.web.utils.general_context
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.utils.middleware.rst b/docs/source/api/evennia.web.utils.middleware.rst
deleted file mode 100644
index 88faf3dc32..0000000000
--- a/docs/source/api/evennia.web.utils.middleware.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.utils.middleware module
-===================================
-
-.. automodule:: evennia.web.utils.middleware
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.utils.rst b/docs/source/api/evennia.web.utils.rst
deleted file mode 100644
index f2cfe08d8b..0000000000
--- a/docs/source/api/evennia.web.utils.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-evennia.web.utils package
-=========================
-
-.. automodule:: evennia.web.utils
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.utils.adminsite
-   evennia.web.utils.backends
-   evennia.web.utils.general_context
-   evennia.web.utils.middleware
-   evennia.web.utils.tests
diff --git a/docs/source/api/evennia.web.utils.tests.rst b/docs/source/api/evennia.web.utils.tests.rst
deleted file mode 100644
index 830eca0c82..0000000000
--- a/docs/source/api/evennia.web.utils.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.utils.tests module
-==============================
-
-.. automodule:: evennia.web.utils.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.webclient.rst b/docs/source/api/evennia.web.webclient.rst
deleted file mode 100644
index 25c4f8fd47..0000000000
--- a/docs/source/api/evennia.web.webclient.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-evennia.web.webclient package
-=============================
-
-.. automodule:: evennia.web.webclient
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.webclient.urls
-   evennia.web.webclient.views
diff --git a/docs/source/api/evennia.web.webclient.urls.rst b/docs/source/api/evennia.web.webclient.urls.rst
deleted file mode 100644
index c1838e45b7..0000000000
--- a/docs/source/api/evennia.web.webclient.urls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.webclient.urls module
-=================================
-
-.. automodule:: evennia.web.webclient.urls
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.webclient.views.rst b/docs/source/api/evennia.web.webclient.views.rst
deleted file mode 100644
index 936aa320e1..0000000000
--- a/docs/source/api/evennia.web.webclient.views.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.webclient.views module
-==================================
-
-.. automodule:: evennia.web.webclient.views
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.forms.rst b/docs/source/api/evennia.web.website.forms.rst
deleted file mode 100644
index b9feb6871c..0000000000
--- a/docs/source/api/evennia.web.website.forms.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.forms module
-================================
-
-.. automodule:: evennia.web.website.forms
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.rst b/docs/source/api/evennia.web.website.rst
deleted file mode 100644
index 343c59b4d0..0000000000
--- a/docs/source/api/evennia.web.website.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-evennia.web.website package
-===========================
-
-.. automodule:: evennia.web.website
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.website.forms
-   evennia.web.website.tests
-   evennia.web.website.urls
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.website.views
diff --git a/docs/source/api/evennia.web.website.tests.rst b/docs/source/api/evennia.web.website.tests.rst
deleted file mode 100644
index 02d7fdb626..0000000000
--- a/docs/source/api/evennia.web.website.tests.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.tests module
-================================
-
-.. automodule:: evennia.web.website.tests
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.urls.rst b/docs/source/api/evennia.web.website.urls.rst
deleted file mode 100644
index 44aa148911..0000000000
--- a/docs/source/api/evennia.web.website.urls.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.urls module
-===============================
-
-.. automodule:: evennia.web.website.urls
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.accounts.rst b/docs/source/api/evennia.web.website.views.accounts.rst
deleted file mode 100644
index a8d3d405e3..0000000000
--- a/docs/source/api/evennia.web.website.views.accounts.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.accounts module
-=========================================
-
-.. automodule:: evennia.web.website.views.accounts
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.channels.rst b/docs/source/api/evennia.web.website.views.channels.rst
deleted file mode 100644
index a37e9a155a..0000000000
--- a/docs/source/api/evennia.web.website.views.channels.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.channels module
-=========================================
-
-.. automodule:: evennia.web.website.views.channels
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.characters.rst b/docs/source/api/evennia.web.website.views.characters.rst
deleted file mode 100644
index 0b79f02d9d..0000000000
--- a/docs/source/api/evennia.web.website.views.characters.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.characters module
-===========================================
-
-.. automodule:: evennia.web.website.views.characters
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.errors.rst b/docs/source/api/evennia.web.website.views.errors.rst
deleted file mode 100644
index 02ac7d7f26..0000000000
--- a/docs/source/api/evennia.web.website.views.errors.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.errors module
-=======================================
-
-.. automodule:: evennia.web.website.views.errors
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.help.rst b/docs/source/api/evennia.web.website.views.help.rst
deleted file mode 100644
index 6fdec19532..0000000000
--- a/docs/source/api/evennia.web.website.views.help.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.help module
-=====================================
-
-.. automodule:: evennia.web.website.views.help
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.index.rst b/docs/source/api/evennia.web.website.views.index.rst
deleted file mode 100644
index febe26d613..0000000000
--- a/docs/source/api/evennia.web.website.views.index.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.index module
-======================================
-
-.. automodule:: evennia.web.website.views.index
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.mixins.rst b/docs/source/api/evennia.web.website.views.mixins.rst
deleted file mode 100644
index d4c2f3fcdc..0000000000
--- a/docs/source/api/evennia.web.website.views.mixins.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.mixins module
-=======================================
-
-.. automodule:: evennia.web.website.views.mixins
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.objects.rst b/docs/source/api/evennia.web.website.views.objects.rst
deleted file mode 100644
index d5c3b8f867..0000000000
--- a/docs/source/api/evennia.web.website.views.objects.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-evennia.web.website.views.objects module
-========================================
-
-.. automodule:: evennia.web.website.views.objects
-   :members:
-   :undoc-members:
-   :show-inheritance:
diff --git a/docs/source/api/evennia.web.website.views.rst b/docs/source/api/evennia.web.website.views.rst
deleted file mode 100644
index ed0580e44b..0000000000
--- a/docs/source/api/evennia.web.website.views.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-evennia.web.website.views package
-=================================
-
-.. automodule:: evennia.web.website.views
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-
-.. toctree::
-   :maxdepth: 6
-
-   evennia.web.website.views.accounts
-   evennia.web.website.views.channels
-   evennia.web.website.views.characters
-   evennia.web.website.views.errors
-   evennia.web.website.views.help
-   evennia.web.website.views.index
-   evennia.web.website.views.mixins
-   evennia.web.website.views.objects
diff --git a/evennia/contrib/tutorials/evadventure/combat_turnbased.py b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
index a84df2c577..a9ede38457 100644
--- a/evennia/contrib/tutorials/evadventure/combat_turnbased.py
+++ b/evennia/contrib/tutorials/evadventure/combat_turnbased.py
@@ -469,8 +469,8 @@ class CombatActionFlee(CombatAction):
     def use(self, *args, **kwargs):
         # it's safe to do this twice
         self.msg(
-            "$You() retreats, and will leave combat next round unless someone successfully "
-            "blocks them."
+            "$You() $conj(retreat), and will leave combat next round unless someone successfully "
+            "blocks the escape."
         )
         self.combathandler.flee(self.combatant)
 
@@ -513,14 +513,16 @@ class CombatActionBlock(CombatAction):
             advantage=advantage,
             disadvantage=disadvantage,
         )
-        self.msg(f"$You() tries to block the retreat of $You({fleeing_target.key}). {txt}")
+        self.msg(
+            f"$You() $conj(try) to block the retreat of $You({fleeing_target.key}). {txt}",
+        )
 
         if is_success:
             # managed to stop the target from fleeing/disengaging
             self.combathandler.unflee(fleeing_target)
             self.msg(f"$You() $conj(block) the retreat of $You({fleeing_target.key})")
         else:
-            self.msg(f"$You({fleeing_target.key}) dodges away from you $You()!")
+            self.msg(f"$You({fleeing_target.key}) $conj(dodge) away from you $You()!")
 
 
 class CombatActionDoNothing(CombatAction):
diff --git a/evennia/contrib/tutorials/evadventure/equipment.py b/evennia/contrib/tutorials/evadventure/equipment.py
index c806d37573..9da0ec91cb 100644
--- a/evennia/contrib/tutorials/evadventure/equipment.py
+++ b/evennia/contrib/tutorials/evadventure/equipment.py
@@ -161,7 +161,7 @@ class EquipmentHandler:
 
         """
         # first checks two-handed wield, then one-handed; the two
-        # should never appear simultaneously anyhow (checked in `use` method).
+        # should never appear simultaneously anyhow (checked in `move` method).
         slots = self.slots
         weapon = slots[WieldLocation.TWO_HANDS]
         if not weapon:
@@ -232,7 +232,7 @@ class EquipmentHandler:
     def move(self, obj):
         """
         Moves item to the place it things it should be in - this makes use of the object's wield
-        slot to decide where it goes. If it doesn't have any, it goes into backpack.
+        slot to decide where it goes. The item is assumed to already be in the backpack.
 
         Args:
             obj (EvAdventureObject): Thing to use.
@@ -242,36 +242,42 @@ class EquipmentHandler:
                 of the error, suitable to echo to user.
 
         Notes:
-            If using an item already in the backpack, it should first be `removed` from the
-            backpack, before applying here - otherwise, it will be added a second time!
-
-            this will cleanly move any 'colliding' items to the backpack to
+            This will cleanly move any 'colliding' items to the backpack to
             make the use possible (such as moving sword + shield to backpack when wielding
             a two-handed weapon). If wanting to warn the user about this, it needs to happen
             before this call.
 
         """
-        # first check if we have room for this
-        self.validate_slot_usage(obj)
+        # make sure to remove from backpack first, if it's there, since we'll be re-adding it
+        self.remove(obj)
 
+        self.validate_slot_usage(obj)
         slots = self.slots
         use_slot = getattr(obj, "inventory_use_slot", WieldLocation.BACKPACK)
 
+        to_backpack = []
         if use_slot is WieldLocation.TWO_HANDS:
             # two-handed weapons can't co-exist with weapon/shield-hand used items
+            to_backpack = [slots[WieldLocation.WEAPON_HAND], slots[WieldLocation.SHIELD_HAND]]
             slots[WieldLocation.WEAPON_HAND] = slots[WieldLocation.SHIELD_HAND] = None
             slots[use_slot] = obj
         elif use_slot in (WieldLocation.WEAPON_HAND, WieldLocation.SHIELD_HAND):
             # can't keep a two-handed weapon if adding a one-handed weapon or shield
+            to_backpack = [slots[WieldLocation.TWO_HANDS]]
             slots[WieldLocation.TWO_HANDS] = None
             slots[use_slot] = obj
         elif use_slot is WieldLocation.BACKPACK:
-            # backpack has multiple slots.
-            slots[use_slot].append(obj)
+            # it belongs in backpack, so goes back to it
+            to_backpack = [obj]
         else:
             # for others (body, head), just replace whatever's there
+            replaced = [obj]
             slots[use_slot] = obj
 
+        for to_backpack_obj in to_backpack:
+            # put stuff in backpack
+            slots[use_slot].append(to_backpack_obj)
+
         # store new state
         self._save()
 
@@ -403,7 +409,8 @@ class EquipmentHandler:
             (slots[WieldLocation.BODY], WieldLocation.BODY),
             (slots[WieldLocation.HEAD], WieldLocation.HEAD),
         ] + [(item, WieldLocation.BACKPACK) for item in slots[WieldLocation.BACKPACK]]
-        # remove any None-results from empty slots
         if only_objs:
+            # remove any None-results from empty slots
             return [tup[0] for tup in lst if tup[0]]
-        return [tup for tup in lst if tup[0]]
+        # keep empty slots
+        return [tup for tup in lst]
diff --git a/evennia/contrib/tutorials/evadventure/tests/mixins.py b/evennia/contrib/tutorials/evadventure/tests/mixins.py
index f6f1747429..060dba0561 100644
--- a/evennia/contrib/tutorials/evadventure/tests/mixins.py
+++ b/evennia/contrib/tutorials/evadventure/tests/mixins.py
@@ -32,22 +32,18 @@ class EvAdventureMixin:
         self.helmet = create.create_object(
             EvAdventureHelmet,
             key="helmet",
-            attributes=[("inventory_use_slot", enums.WieldLocation.HEAD), ("armor", 1)],
         )
         self.shield = create.create_object(
             EvAdventureShield,
             key="shield",
-            attributes=[("inventory_use_slot", enums.WieldLocation.SHIELD_HAND), ("armor", 1)],
         )
         self.armor = create.create_object(
             EvAdventureArmor,
             key="armor",
-            attributes=[("inventory_use_slot", enums.WieldLocation.BODY), ("armor", 11)],
         )
         self.weapon = create.create_object(
             EvAdventureWeapon,
             key="weapon",
-            attributes=[("inventory_use_slot", enums.WieldLocation.WEAPON_HAND)],
         )
         self.big_weapon = create.create_object(
             EvAdventureWeapon,
diff --git a/evennia/contrib/tutorials/evadventure/tests/test_equipment.py b/evennia/contrib/tutorials/evadventure/tests/test_equipment.py
new file mode 100644
index 0000000000..cecc0afd2f
--- /dev/null
+++ b/evennia/contrib/tutorials/evadventure/tests/test_equipment.py
@@ -0,0 +1,58 @@
+"""
+Test the EvAdventure equipment handler.
+
+"""
+
+
+from evennia.utils.test_resources import BaseEvenniaTest
+
+from ..enums import Ability, WieldLocation
+from ..equipment import EquipmentError
+from .mixins import EvAdventureMixin
+
+
+class TestEquipment(EvAdventureMixin, BaseEvenniaTest):
+    def test_count_slots(self):
+        self.assertEqual(self.character.equipment.count_slots(), 0)
+
+    def test_max_slots(self):
+        self.assertEqual(self.character.equipment.max_slots, 11)
+        setattr(self.character, Ability.CON.value, 3)
+        self.assertEqual(self.character.equipment.max_slots, 13)
+
+    def test_validate_slot_usage(self):
+        helmet = self.helmet
+        self.assertTrue(self.character.equipment.validate_slot_usage(helmet))
+        helmet.size = 20  # a very large helmet
+        with self.assertRaises(EquipmentError):
+            self.assertFalse(self.character.equipment.validate_slot_usage(helmet))
+
+    def test_add__remove(self):
+        self.character.equipment.add(self.helmet)
+        self.assertEqual(self.character.equipment.slots[WieldLocation.BACKPACK], [self.helmet])
+        self.character.equipment.remove(self.helmet)
+        self.assertEqual(self.character.equipment.slots[WieldLocation.BACKPACK], [])
+
+    def test_move__get_current_slot(self):
+        self.character.equipment.add(self.helmet)
+        self.assertEqual(
+            self.character.equipment.get_current_slot(self.helmet), WieldLocation.BACKPACK
+        )
+        self.character.equipment.move(self.helmet)
+        self.assertEqual(self.character.equipment.get_current_slot(self.helmet), WieldLocation.HEAD)
+
+    def test_get_wearable_or_wieldable_objects_from_backpack(self):
+        self.character.equipment.add(self.helmet)
+        self.character.equipment.add(self.weapon)
+
+        self.assertEqual(
+            self.character.equipment.get_wieldable_objects_from_backpack(), [self.weapon]
+        )
+        self.assertEqual(
+            self.character.equipment.get_wearable_objects_from_backpack(), [self.helmet]
+        )
+
+        self.assertEqual(
+            self.character.equipment.get_all(),
+            [(self.helmet, WieldLocation.BACKPACK), (self.weapon, WieldLocation.BACKPACK)],
+        )