diff --git a/evennia/trunk/ABOUT b/ABOUT
similarity index 100%
rename from evennia/trunk/ABOUT
rename to ABOUT
diff --git a/evennia/trunk/README b/README
similarity index 100%
rename from evennia/trunk/README
rename to README
diff --git a/evennia/trunk/TODO b/TODO
similarity index 100%
rename from evennia/trunk/TODO
rename to TODO
diff --git a/evennia/trunk/__init__.py b/__init__.py
similarity index 100%
rename from evennia/trunk/__init__.py
rename to __init__.py
diff --git a/evennia/trunk/ansi.py b/ansi.py
similarity index 100%
rename from evennia/trunk/ansi.py
rename to ansi.py
diff --git a/evennia/trunk/apps/__init__.py b/apps/__init__.py
similarity index 100%
rename from evennia/trunk/apps/__init__.py
rename to apps/__init__.py
diff --git a/evennia/trunk/apps/config/__init__.py b/apps/config/__init__.py
similarity index 100%
rename from evennia/trunk/apps/config/__init__.py
rename to apps/config/__init__.py
diff --git a/evennia/trunk/apps/config/models.py b/apps/config/models.py
similarity index 100%
rename from evennia/trunk/apps/config/models.py
rename to apps/config/models.py
diff --git a/evennia/trunk/apps/config/views.py b/apps/config/views.py
similarity index 100%
rename from evennia/trunk/apps/config/views.py
rename to apps/config/views.py
diff --git a/evennia/trunk/apps/genperms/__init__.py b/apps/genperms/__init__.py
similarity index 100%
rename from evennia/trunk/apps/genperms/__init__.py
rename to apps/genperms/__init__.py
diff --git a/evennia/trunk/apps/genperms/models.py b/apps/genperms/models.py
similarity index 100%
rename from evennia/trunk/apps/genperms/models.py
rename to apps/genperms/models.py
diff --git a/evennia/trunk/apps/genperms/views.py b/apps/genperms/views.py
similarity index 100%
rename from evennia/trunk/apps/genperms/views.py
rename to apps/genperms/views.py
diff --git a/evennia/trunk/apps/helpsys/__init__.py b/apps/helpsys/__init__.py
similarity index 100%
rename from evennia/trunk/apps/helpsys/__init__.py
rename to apps/helpsys/__init__.py
diff --git a/evennia/trunk/apps/helpsys/models.py b/apps/helpsys/models.py
similarity index 100%
rename from evennia/trunk/apps/helpsys/models.py
rename to apps/helpsys/models.py
diff --git a/evennia/trunk/apps/helpsys/views.py b/apps/helpsys/views.py
similarity index 100%
rename from evennia/trunk/apps/helpsys/views.py
rename to apps/helpsys/views.py
diff --git a/evennia/trunk/apps/objects/__init__.py b/apps/objects/__init__.py
similarity index 100%
rename from evennia/trunk/apps/objects/__init__.py
rename to apps/objects/__init__.py
diff --git a/evennia/trunk/apps/objects/models.py b/apps/objects/models.py
similarity index 100%
rename from evennia/trunk/apps/objects/models.py
rename to apps/objects/models.py
diff --git a/evennia/trunk/apps/objects/views.py b/apps/objects/views.py
similarity index 100%
rename from evennia/trunk/apps/objects/views.py
rename to apps/objects/views.py
diff --git a/evennia/trunk/cmdhandler.py b/cmdhandler.py
similarity index 100%
rename from evennia/trunk/cmdhandler.py
rename to cmdhandler.py
diff --git a/evennia/trunk/commands_general.py b/commands_general.py
similarity index 100%
rename from evennia/trunk/commands_general.py
rename to commands_general.py
diff --git a/evennia/trunk/commands_privileged.py b/commands_privileged.py
similarity index 100%
rename from evennia/trunk/commands_privileged.py
rename to commands_privileged.py
diff --git a/evennia/trunk/commands_unloggedin.py b/commands_unloggedin.py
similarity index 100%
rename from evennia/trunk/commands_unloggedin.py
rename to commands_unloggedin.py
diff --git a/evennia/trunk/defines_global.py b/defines_global.py
similarity index 100%
rename from evennia/trunk/defines_global.py
rename to defines_global.py
diff --git a/evennia/trunk/evennia.sql b/evennia.sql
similarity index 100%
rename from evennia/trunk/evennia.sql
rename to evennia.sql
diff --git a/evennia/trunk/evennia.vhost.apache b/evennia.vhost.apache
similarity index 100%
rename from evennia/trunk/evennia.vhost.apache
rename to evennia.vhost.apache
diff --git a/evennia/trunk/events.py b/events.py
similarity index 100%
rename from evennia/trunk/events.py
rename to events.py
diff --git a/evennia/trunk/functions_db.py b/functions_db.py
similarity index 100%
rename from evennia/trunk/functions_db.py
rename to functions_db.py
diff --git a/evennia/trunk/functions_general.py b/functions_general.py
similarity index 100%
rename from evennia/trunk/functions_general.py
rename to functions_general.py
diff --git a/evennia/trunk/functions_help.py b/functions_help.py
similarity index 100%
rename from evennia/trunk/functions_help.py
rename to functions_help.py
diff --git a/evennia/trunk/gameconf.py b/gameconf.py
similarity index 100%
rename from evennia/trunk/gameconf.py
rename to gameconf.py
diff --git a/evennia/trunk/manage.py b/manage.py
similarity index 100%
rename from evennia/trunk/manage.py
rename to manage.py
diff --git a/evennia/trunk/prepenv.sh b/prepenv.sh
similarity index 100%
rename from evennia/trunk/prepenv.sh
rename to prepenv.sh
diff --git a/evennia/trunk/scheduler.py b/scheduler.py
similarity index 100%
rename from evennia/trunk/scheduler.py
rename to scheduler.py
diff --git a/evennia/trunk/server.py b/server.py
similarity index 100%
rename from evennia/trunk/server.py
rename to server.py
diff --git a/evennia/trunk/session.py b/session.py
similarity index 100%
rename from evennia/trunk/session.py
rename to session.py
diff --git a/evennia/trunk/session_mgr.py b/session_mgr.py
similarity index 100%
rename from evennia/trunk/session_mgr.py
rename to session_mgr.py
diff --git a/evennia/trunk/settings.py.dist b/settings.py.dist
similarity index 100%
rename from evennia/trunk/settings.py.dist
rename to settings.py.dist
diff --git a/evennia/trunk/urls.py b/urls.py
similarity index 100%
rename from evennia/trunk/urls.py
rename to urls.py