diff --git a/thirdpart/avatar/__init__.py b/avatar/__init__.py
similarity index 100%
rename from thirdpart/avatar/__init__.py
rename to avatar/__init__.py
diff --git a/thirdpart/avatar/admin.py b/avatar/admin.py
similarity index 100%
rename from thirdpart/avatar/admin.py
rename to avatar/admin.py
diff --git a/thirdpart/avatar/forms.py b/avatar/forms.py
similarity index 100%
rename from thirdpart/avatar/forms.py
rename to avatar/forms.py
diff --git a/thirdpart/avatar/locale/de/LC_MESSAGES/django.mo b/avatar/locale/de/LC_MESSAGES/django.mo
similarity index 100%
rename from thirdpart/avatar/locale/de/LC_MESSAGES/django.mo
rename to avatar/locale/de/LC_MESSAGES/django.mo
diff --git a/thirdpart/avatar/locale/de/LC_MESSAGES/django.po b/avatar/locale/de/LC_MESSAGES/django.po
similarity index 100%
rename from thirdpart/avatar/locale/de/LC_MESSAGES/django.po
rename to avatar/locale/de/LC_MESSAGES/django.po
diff --git a/thirdpart/avatar/locale/fr/LC_MESSAGES/django.mo b/avatar/locale/fr/LC_MESSAGES/django.mo
similarity index 100%
rename from thirdpart/avatar/locale/fr/LC_MESSAGES/django.mo
rename to avatar/locale/fr/LC_MESSAGES/django.mo
diff --git a/thirdpart/avatar/locale/fr/LC_MESSAGES/django.po b/avatar/locale/fr/LC_MESSAGES/django.po
similarity index 100%
rename from thirdpart/avatar/locale/fr/LC_MESSAGES/django.po
rename to avatar/locale/fr/LC_MESSAGES/django.po
diff --git a/thirdpart/avatar/locale/pt_BR/LC_MESSAGES/django.mo b/avatar/locale/pt_BR/LC_MESSAGES/django.mo
similarity index 100%
rename from thirdpart/avatar/locale/pt_BR/LC_MESSAGES/django.mo
rename to avatar/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/thirdpart/avatar/locale/pt_BR/LC_MESSAGES/django.po b/avatar/locale/pt_BR/LC_MESSAGES/django.po
similarity index 100%
rename from thirdpart/avatar/locale/pt_BR/LC_MESSAGES/django.po
rename to avatar/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/thirdpart/avatar/management/__init__.py b/avatar/management/__init__.py
similarity index 100%
rename from thirdpart/avatar/management/__init__.py
rename to avatar/management/__init__.py
diff --git a/thirdpart/avatar/management/commands/__init__.py b/avatar/management/commands/__init__.py
similarity index 100%
rename from thirdpart/avatar/management/commands/__init__.py
rename to avatar/management/commands/__init__.py
diff --git a/thirdpart/avatar/management/commands/rebuild_avatars.py b/avatar/management/commands/rebuild_avatars.py
similarity index 100%
rename from thirdpart/avatar/management/commands/rebuild_avatars.py
rename to avatar/management/commands/rebuild_avatars.py
diff --git a/thirdpart/avatar/media/avatar/img/default.jpg b/avatar/media/avatar/img/default.jpg
similarity index 100%
rename from thirdpart/avatar/media/avatar/img/default.jpg
rename to avatar/media/avatar/img/default.jpg
diff --git a/thirdpart/avatar/models.py b/avatar/models.py
similarity index 100%
rename from thirdpart/avatar/models.py
rename to avatar/models.py
diff --git a/thirdpart/avatar/settings.py b/avatar/settings.py
similarity index 100%
rename from thirdpart/avatar/settings.py
rename to avatar/settings.py
diff --git a/thirdpart/avatar/signals.py b/avatar/signals.py
similarity index 100%
rename from thirdpart/avatar/signals.py
rename to avatar/signals.py
diff --git a/thirdpart/avatar/templates/avatar/add.html b/avatar/templates/avatar/add.html
similarity index 100%
rename from thirdpart/avatar/templates/avatar/add.html
rename to avatar/templates/avatar/add.html
diff --git a/thirdpart/avatar/templates/avatar/base.html b/avatar/templates/avatar/base.html
similarity index 100%
rename from thirdpart/avatar/templates/avatar/base.html
rename to avatar/templates/avatar/base.html
diff --git a/thirdpart/avatar/templates/avatar/change.html b/avatar/templates/avatar/change.html
similarity index 100%
rename from thirdpart/avatar/templates/avatar/change.html
rename to avatar/templates/avatar/change.html
diff --git a/thirdpart/avatar/templates/avatar/confirm_delete.html b/avatar/templates/avatar/confirm_delete.html
similarity index 100%
rename from thirdpart/avatar/templates/avatar/confirm_delete.html
rename to avatar/templates/avatar/confirm_delete.html
diff --git a/thirdpart/avatar/templates/notification/avatar_friend_updated/full.txt b/avatar/templates/notification/avatar_friend_updated/full.txt
similarity index 100%
rename from thirdpart/avatar/templates/notification/avatar_friend_updated/full.txt
rename to avatar/templates/notification/avatar_friend_updated/full.txt
diff --git a/thirdpart/avatar/templates/notification/avatar_friend_updated/notice.html b/avatar/templates/notification/avatar_friend_updated/notice.html
similarity index 100%
rename from thirdpart/avatar/templates/notification/avatar_friend_updated/notice.html
rename to avatar/templates/notification/avatar_friend_updated/notice.html
diff --git a/thirdpart/avatar/templates/notification/avatar_updated/full.txt b/avatar/templates/notification/avatar_updated/full.txt
similarity index 100%
rename from thirdpart/avatar/templates/notification/avatar_updated/full.txt
rename to avatar/templates/notification/avatar_updated/full.txt
diff --git a/thirdpart/avatar/templates/notification/avatar_updated/notice.html b/avatar/templates/notification/avatar_updated/notice.html
similarity index 100%
rename from thirdpart/avatar/templates/notification/avatar_updated/notice.html
rename to avatar/templates/notification/avatar_updated/notice.html
diff --git a/thirdpart/avatar/templatetags/__init__.py b/avatar/templatetags/__init__.py
similarity index 100%
rename from thirdpart/avatar/templatetags/__init__.py
rename to avatar/templatetags/__init__.py
diff --git a/thirdpart/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py
similarity index 100%
rename from thirdpart/avatar/templatetags/avatar_tags.py
rename to avatar/templatetags/avatar_tags.py
diff --git a/thirdpart/avatar/testdata/imagefilewithoutext b/avatar/testdata/imagefilewithoutext
similarity index 100%
rename from thirdpart/avatar/testdata/imagefilewithoutext
rename to avatar/testdata/imagefilewithoutext
diff --git a/thirdpart/avatar/testdata/imagefilewithwrongext.ogg b/avatar/testdata/imagefilewithwrongext.ogg
similarity index 100%
rename from thirdpart/avatar/testdata/imagefilewithwrongext.ogg
rename to avatar/testdata/imagefilewithwrongext.ogg
diff --git a/thirdpart/avatar/testdata/nonimagefile b/avatar/testdata/nonimagefile
similarity index 100%
rename from thirdpart/avatar/testdata/nonimagefile
rename to avatar/testdata/nonimagefile
diff --git a/thirdpart/avatar/testdata/test.png b/avatar/testdata/test.png
similarity index 100%
rename from thirdpart/avatar/testdata/test.png
rename to avatar/testdata/test.png
diff --git a/thirdpart/avatar/testdata/testbig.png b/avatar/testdata/testbig.png
similarity index 100%
rename from thirdpart/avatar/testdata/testbig.png
rename to avatar/testdata/testbig.png
diff --git a/thirdpart/avatar/tests.py b/avatar/tests.py
similarity index 100%
rename from thirdpart/avatar/tests.py
rename to avatar/tests.py
diff --git a/thirdpart/avatar/urls.py b/avatar/urls.py
similarity index 100%
rename from thirdpart/avatar/urls.py
rename to avatar/urls.py
diff --git a/thirdpart/avatar/util.py b/avatar/util.py
similarity index 100%
rename from thirdpart/avatar/util.py
rename to avatar/util.py
diff --git a/thirdpart/avatar/views.py b/avatar/views.py
similarity index 100%
rename from thirdpart/avatar/views.py
rename to avatar/views.py