diff --git a/taoshengshi/.gitignore b/.gitignore
similarity index 100%
rename from taoshengshi/.gitignore
rename to .gitignore
diff --git a/taoshengshi/.pylintrc b/.pylintrc
similarity index 100%
rename from taoshengshi/.pylintrc
rename to .pylintrc
diff --git a/taoshengshi/IDEAS.md b/IDEAS.md
similarity index 100%
rename from taoshengshi/IDEAS.md
rename to IDEAS.md
diff --git a/taoshengshi/README.md b/README.md
similarity index 100%
rename from taoshengshi/README.md
rename to README.md
diff --git a/taoshengshi/__init__.py b/__init__.py
similarity index 100%
rename from taoshengshi/__init__.py
rename to __init__.py
diff --git a/taoshengshi/commands/README.md b/commands/README.md
similarity index 100%
rename from taoshengshi/commands/README.md
rename to commands/README.md
diff --git a/taoshengshi/commands/__init__.py b/commands/__init__.py
similarity index 100%
rename from taoshengshi/commands/__init__.py
rename to commands/__init__.py
diff --git a/taoshengshi/commands/command.py b/commands/command.py
similarity index 100%
rename from taoshengshi/commands/command.py
rename to commands/command.py
diff --git a/taoshengshi/commands/default_cmdsets.py b/commands/default_cmdsets.py
similarity index 100%
rename from taoshengshi/commands/default_cmdsets.py
rename to commands/default_cmdsets.py
diff --git a/taoshengshi/commands/keypad.py b/commands/keypad.py
similarity index 100%
rename from taoshengshi/commands/keypad.py
rename to commands/keypad.py
diff --git a/taoshengshi/commands/mech_cmds.py b/commands/mech_cmds.py
similarity index 100%
rename from taoshengshi/commands/mech_cmds.py
rename to commands/mech_cmds.py
diff --git a/taoshengshi/commands/override_cmds.py b/commands/override_cmds.py
similarity index 100%
rename from taoshengshi/commands/override_cmds.py
rename to commands/override_cmds.py
diff --git a/taoshengshi/commands/test_keypad.py b/commands/test_keypad.py
similarity index 100%
rename from taoshengshi/commands/test_keypad.py
rename to commands/test_keypad.py
diff --git a/taoshengshi/commands/test_mech_cmds.py b/commands/test_mech_cmds.py
similarity index 100%
rename from taoshengshi/commands/test_mech_cmds.py
rename to commands/test_mech_cmds.py
diff --git a/taoshengshi/server/README.md b/server/README.md
similarity index 100%
rename from taoshengshi/server/README.md
rename to server/README.md
diff --git a/taoshengshi/server/__init__.py b/server/__init__.py
similarity index 100%
rename from taoshengshi/server/__init__.py
rename to server/__init__.py
diff --git a/taoshengshi/server/conf/__init__.py b/server/conf/__init__.py
similarity index 100%
rename from taoshengshi/server/conf/__init__.py
rename to server/conf/__init__.py
diff --git a/taoshengshi/server/conf/at_initial_setup.py b/server/conf/at_initial_setup.py
similarity index 100%
rename from taoshengshi/server/conf/at_initial_setup.py
rename to server/conf/at_initial_setup.py
diff --git a/taoshengshi/server/conf/at_search.py b/server/conf/at_search.py
similarity index 100%
rename from taoshengshi/server/conf/at_search.py
rename to server/conf/at_search.py
diff --git a/taoshengshi/server/conf/at_server_startstop.py b/server/conf/at_server_startstop.py
similarity index 100%
rename from taoshengshi/server/conf/at_server_startstop.py
rename to server/conf/at_server_startstop.py
diff --git a/taoshengshi/server/conf/cmdparser.py b/server/conf/cmdparser.py
similarity index 100%
rename from taoshengshi/server/conf/cmdparser.py
rename to server/conf/cmdparser.py
diff --git a/taoshengshi/server/conf/connection_screens.py b/server/conf/connection_screens.py
similarity index 100%
rename from taoshengshi/server/conf/connection_screens.py
rename to server/conf/connection_screens.py
diff --git a/taoshengshi/server/conf/inlinefuncs.py b/server/conf/inlinefuncs.py
similarity index 100%
rename from taoshengshi/server/conf/inlinefuncs.py
rename to server/conf/inlinefuncs.py
diff --git a/taoshengshi/server/conf/inputfuncs.py b/server/conf/inputfuncs.py
similarity index 100%
rename from taoshengshi/server/conf/inputfuncs.py
rename to server/conf/inputfuncs.py
diff --git a/taoshengshi/server/conf/lockfuncs.py b/server/conf/lockfuncs.py
similarity index 100%
rename from taoshengshi/server/conf/lockfuncs.py
rename to server/conf/lockfuncs.py
diff --git a/taoshengshi/server/conf/mssp.py b/server/conf/mssp.py
similarity index 100%
rename from taoshengshi/server/conf/mssp.py
rename to server/conf/mssp.py
diff --git a/taoshengshi/server/conf/portal_services_plugins.py b/server/conf/portal_services_plugins.py
similarity index 100%
rename from taoshengshi/server/conf/portal_services_plugins.py
rename to server/conf/portal_services_plugins.py
diff --git a/taoshengshi/server/conf/server_services_plugins.py b/server/conf/server_services_plugins.py
similarity index 100%
rename from taoshengshi/server/conf/server_services_plugins.py
rename to server/conf/server_services_plugins.py
diff --git a/taoshengshi/server/conf/serversession.py b/server/conf/serversession.py
similarity index 100%
rename from taoshengshi/server/conf/serversession.py
rename to server/conf/serversession.py
diff --git a/taoshengshi/server/conf/settings.py b/server/conf/settings.py
similarity index 100%
rename from taoshengshi/server/conf/settings.py
rename to server/conf/settings.py
diff --git a/taoshengshi/server/conf/web_plugins.py b/server/conf/web_plugins.py
similarity index 100%
rename from taoshengshi/server/conf/web_plugins.py
rename to server/conf/web_plugins.py
diff --git a/taoshengshi/server/logs/README.md b/server/logs/README.md
similarity index 100%
rename from taoshengshi/server/logs/README.md
rename to server/logs/README.md
diff --git a/start_server.sh b/start_server.sh
index 6e5736e..4089da1 100644
--- a/start_server.sh
+++ b/start_server.sh
@@ -1 +1 @@
-docker run -it --rm -p 4000:4000 -p 4001:4001 -p 4002:4002 --rm -v $PWD:/usr/src/game --user $UID:$GID evennia/evennia
+docker run -it --rm -p 4000:4000 -p 4001:4001 -p 4002:4002 -p 8080:4005 --rm -v $PWD:/usr/src/game evennia/evennia evennia start -l
diff --git a/taoshengshi/typeclasses/README.md b/typeclasses/README.md
similarity index 100%
rename from taoshengshi/typeclasses/README.md
rename to typeclasses/README.md
diff --git a/taoshengshi/typeclasses/__init__.py b/typeclasses/__init__.py
similarity index 100%
rename from taoshengshi/typeclasses/__init__.py
rename to typeclasses/__init__.py
diff --git a/taoshengshi/typeclasses/accounts.py b/typeclasses/accounts.py
similarity index 100%
rename from taoshengshi/typeclasses/accounts.py
rename to typeclasses/accounts.py
diff --git a/taoshengshi/typeclasses/channels.py b/typeclasses/channels.py
similarity index 100%
rename from taoshengshi/typeclasses/channels.py
rename to typeclasses/channels.py
diff --git a/taoshengshi/typeclasses/characters.py b/typeclasses/characters.py
similarity index 100%
rename from taoshengshi/typeclasses/characters.py
rename to typeclasses/characters.py
diff --git a/taoshengshi/typeclasses/exits.py b/typeclasses/exits.py
similarity index 100%
rename from taoshengshi/typeclasses/exits.py
rename to typeclasses/exits.py
diff --git a/taoshengshi/typeclasses/mech.py b/typeclasses/mech.py
similarity index 100%
rename from taoshengshi/typeclasses/mech.py
rename to typeclasses/mech.py
diff --git a/taoshengshi/typeclasses/objects.py b/typeclasses/objects.py
similarity index 100%
rename from taoshengshi/typeclasses/objects.py
rename to typeclasses/objects.py
diff --git a/taoshengshi/typeclasses/rooms.py b/typeclasses/rooms.py
similarity index 100%
rename from taoshengshi/typeclasses/rooms.py
rename to typeclasses/rooms.py
diff --git a/taoshengshi/typeclasses/scripts.py b/typeclasses/scripts.py
similarity index 100%
rename from taoshengshi/typeclasses/scripts.py
rename to typeclasses/scripts.py
diff --git a/taoshengshi/typeclasses/test_mech.py b/typeclasses/test_mech.py
similarity index 100%
rename from taoshengshi/typeclasses/test_mech.py
rename to typeclasses/test_mech.py
diff --git a/taoshengshi/typeclasses/test_rooms.py b/typeclasses/test_rooms.py
similarity index 100%
rename from taoshengshi/typeclasses/test_rooms.py
rename to typeclasses/test_rooms.py
diff --git a/taoshengshi/web/__init__.py b/web/__init__.py
similarity index 100%
rename from taoshengshi/web/__init__.py
rename to web/__init__.py
diff --git a/taoshengshi/web/static_overrides/README.md b/web/static_overrides/README.md
similarity index 100%
rename from taoshengshi/web/static_overrides/README.md
rename to web/static_overrides/README.md
diff --git a/taoshengshi/web/static_overrides/webclient/css/README.md b/web/static_overrides/webclient/css/README.md
similarity index 100%
rename from taoshengshi/web/static_overrides/webclient/css/README.md
rename to web/static_overrides/webclient/css/README.md
diff --git a/taoshengshi/web/static_overrides/webclient/js/README.md b/web/static_overrides/webclient/js/README.md
similarity index 100%
rename from taoshengshi/web/static_overrides/webclient/js/README.md
rename to web/static_overrides/webclient/js/README.md
diff --git a/taoshengshi/web/static_overrides/website/css/README.md b/web/static_overrides/website/css/README.md
similarity index 100%
rename from taoshengshi/web/static_overrides/website/css/README.md
rename to web/static_overrides/website/css/README.md
diff --git a/taoshengshi/web/static_overrides/website/images/README.md b/web/static_overrides/website/images/README.md
similarity index 100%
rename from taoshengshi/web/static_overrides/website/images/README.md
rename to web/static_overrides/website/images/README.md
diff --git a/taoshengshi/web/template_overrides/README.md b/web/template_overrides/README.md
similarity index 100%
rename from taoshengshi/web/template_overrides/README.md
rename to web/template_overrides/README.md
diff --git a/taoshengshi/web/template_overrides/webclient/README.md b/web/template_overrides/webclient/README.md
similarity index 100%
rename from taoshengshi/web/template_overrides/webclient/README.md
rename to web/template_overrides/webclient/README.md
diff --git a/taoshengshi/web/template_overrides/website/README.md b/web/template_overrides/website/README.md
similarity index 100%
rename from taoshengshi/web/template_overrides/website/README.md
rename to web/template_overrides/website/README.md
diff --git a/taoshengshi/web/template_overrides/website/flatpages/README.md b/web/template_overrides/website/flatpages/README.md
similarity index 100%
rename from taoshengshi/web/template_overrides/website/flatpages/README.md
rename to web/template_overrides/website/flatpages/README.md
diff --git a/taoshengshi/web/template_overrides/website/registration/README.md b/web/template_overrides/website/registration/README.md
similarity index 100%
rename from taoshengshi/web/template_overrides/website/registration/README.md
rename to web/template_overrides/website/registration/README.md
diff --git a/taoshengshi/web/urls.py b/web/urls.py
similarity index 100%
rename from taoshengshi/web/urls.py
rename to web/urls.py
diff --git a/taoshengshi/world/.pylintrc b/world/.pylintrc
similarity index 100%
rename from taoshengshi/world/.pylintrc
rename to world/.pylintrc
diff --git a/taoshengshi/world/README.md b/world/README.md
similarity index 100%
rename from taoshengshi/world/README.md
rename to world/README.md
diff --git a/taoshengshi/world/__init__.py b/world/__init__.py
similarity index 100%
rename from taoshengshi/world/__init__.py
rename to world/__init__.py
diff --git a/taoshengshi/world/prototypes.py b/world/prototypes.py
similarity index 100%
rename from taoshengshi/world/prototypes.py
rename to world/prototypes.py
diff --git a/taoshengshi/world/taoshengshi.py b/world/taoshengshi.py
similarity index 100%
rename from taoshengshi/world/taoshengshi.py
rename to world/taoshengshi.py
diff --git a/taoshengshi/world/taoshengshi/cave.py b/world/taoshengshi/cave.py
similarity index 100%
rename from taoshengshi/world/taoshengshi/cave.py
rename to world/taoshengshi/cave.py