rename from 1.1/MANIFEST.in
rename to MANIFEST.in

rename from 1.1/Makefile
rename to Makefile

rename from 1.1/README
rename to README

rename from 1.1/development.ini
rename to development.ini

rename from 1.1/doc/Makefile
rename to doc/Makefile

rename from 1.1/doc/make.bat
rename to doc/make.bat

rename from 1.1/doc/source/architecture.rst
rename to doc/source/architecture.rst

rename from 1.1/doc/source/authentication.rst
rename to doc/source/authentication.rst

rename from 1.1/doc/source/conf.py
rename to doc/source/conf.py

rename from 1.1/doc/source/configuration.rst
rename to doc/source/configuration.rst

rename from 1.1/doc/source/index.rst
rename to doc/source/index.rst

rename from 1.1/doc/source/installation.rst
rename to doc/source/installation.rst

rename from 1.1/doc/source/plugins.rst
rename to doc/source/plugins.rst

rename from 1.1/doc/source/production.rst
rename to doc/source/production.rst

rename from 1.1/doc/source/storage.rst
rename to doc/source/storage.rst

rename from 1.1/doc/source/sync.dia
rename to doc/source/sync.dia

rename from 1.1/doc/source/sync.png
rename to doc/source/sync.png

rename from 1.1/setup.cfg
rename to setup.cfg

rename from 1.1/setup.py
rename to setup.py

rename from 1.1/stdeb.cfg
rename to stdeb.cfg

rename from 1.1/sync.wsgi
rename to sync.wsgi

rename from 1.1/syncserver/__init__.py
rename to syncserver/__init__.py

rename from 1.1/syncserver/auth/__init__.py
rename to syncserver/auth/__init__.py

rename from 1.1/syncserver/auth/dummy.py
rename to syncserver/auth/dummy.py

rename from 1.1/syncserver/auth/sql.py
rename to syncserver/auth/sql.py

rename from 1.1/syncserver/cef.py
rename to syncserver/cef.py

rename from 1.1/syncserver/controllers/__init__.py
rename to syncserver/controllers/__init__.py

rename from 1.1/syncserver/controllers/static.py
rename to syncserver/controllers/static.py

rename from 1.1/syncserver/controllers/storage.py
rename to syncserver/controllers/storage.py

rename from 1.1/syncserver/controllers/user.py
rename to syncserver/controllers/user.py

rename from 1.1/syncserver/plugin.py
rename to syncserver/plugin.py

rename from 1.1/syncserver/respcodes.py
rename to syncserver/respcodes.py

rename from 1.1/syncserver/static/bg.jpg
rename to syncserver/static/bg.jpg

rename from 1.1/syncserver/static/circles.png
rename to syncserver/static/circles.png

rename from 1.1/syncserver/static/forgot_password.css
rename to syncserver/static/forgot_password.css

rename from 1.1/syncserver/static/table-sides.png
rename to syncserver/static/table-sides.png

rename from 1.1/syncserver/static/table-top.png
rename to syncserver/static/table-top.png

rename from 1.1/syncserver/static/weave-logo.png
rename to syncserver/static/weave-logo.png

rename from 1.1/syncserver/storage/__init__.py
rename to syncserver/storage/__init__.py

rename from 1.1/syncserver/storage/multi.py
rename to syncserver/storage/multi.py

rename from 1.1/syncserver/storage/redisql.py
rename to syncserver/storage/redisql.py

rename from 1.1/syncserver/storage/sql.py
rename to syncserver/storage/sql.py

rename from 1.1/syncserver/storage/sqlmappers.py
rename to syncserver/storage/sqlmappers.py

rename from 1.1/syncserver/templates/base.mako
rename to syncserver/templates/base.mako

rename from 1.1/syncserver/templates/captcha.mako
rename to syncserver/templates/captcha.mako

rename from 1.1/syncserver/templates/password_ask_reset_form.mako
rename to syncserver/templates/password_ask_reset_form.mako

rename from 1.1/syncserver/templates/password_changed.mako
rename to syncserver/templates/password_changed.mako

rename from 1.1/syncserver/templates/password_failure.mako
rename to syncserver/templates/password_failure.mako

rename from 1.1/syncserver/templates/password_key_sent.mako
rename to syncserver/templates/password_key_sent.mako

rename from 1.1/syncserver/templates/password_reset_form.mako
rename to syncserver/templates/password_reset_form.mako

rename from 1.1/syncserver/templates/password_reset_mail.mako
rename to syncserver/templates/password_reset_mail.mako

rename from 1.1/syncserver/tests/__init__.py
rename to syncserver/tests/__init__.py

rename from 1.1/syncserver/tests/functional/__init__.py
rename to syncserver/tests/functional/__init__.py

rename from 1.1/syncserver/tests/functional/support.py
rename to syncserver/tests/functional/support.py

rename from 1.1/syncserver/tests/functional/test_basic.py
rename to syncserver/tests/functional/test_basic.py

rename from 1.1/syncserver/tests/functional/test_static.py
rename to syncserver/tests/functional/test_static.py

rename from 1.1/syncserver/tests/functional/test_storage.py
rename to syncserver/tests/functional/test_storage.py

rename from 1.1/syncserver/tests/functional/test_user.py
rename to syncserver/tests/functional/test_user.py

rename from 1.1/syncserver/tests/oldfunctional/module_test_runner.py
rename to syncserver/tests/oldfunctional/module_test_runner.py

rename from 1.1/syncserver/tests/oldfunctional/render.xsl
rename to syncserver/tests/oldfunctional/render.xsl

rename from 1.1/syncserver/tests/oldfunctional/run_server_tests.py
rename to syncserver/tests/oldfunctional/run_server_tests.py

rename from 1.1/syncserver/tests/oldfunctional/server_tests.py
rename to syncserver/tests/oldfunctional/server_tests.py

rename from 1.1/syncserver/tests/oldfunctional/test_config.py
rename to syncserver/tests/oldfunctional/test_config.py

rename from 1.1/syncserver/tests/oldfunctional/weave.py
rename to syncserver/tests/oldfunctional/weave.py

rename from 1.1/syncserver/tests/oldfunctional/xmlrunner.py
rename to syncserver/tests/oldfunctional/xmlrunner.py

rename from 1.1/syncserver/tests/support.py
rename to syncserver/tests/support.py

rename from 1.1/syncserver/tests/test_cef.py
rename to syncserver/tests/test_cef.py

rename from 1.1/syncserver/tests/test_dummyauth.py
rename to syncserver/tests/test_dummyauth.py

rename from 1.1/syncserver/tests/test_multistorage.py
rename to syncserver/tests/test_multistorage.py

rename from 1.1/syncserver/tests/test_plugin.py
rename to syncserver/tests/test_plugin.py

rename from 1.1/syncserver/tests/test_redisql.py
rename to syncserver/tests/test_redisql.py

rename from 1.1/syncserver/tests/test_sql.py
rename to syncserver/tests/test_sql.py

rename from 1.1/syncserver/tests/test_sqlauth.py
rename to syncserver/tests/test_sqlauth.py

rename from 1.1/syncserver/tests/test_storagebase.py
rename to syncserver/tests/test_storagebase.py

rename from 1.1/syncserver/tests/test_util.py
rename to syncserver/tests/test_util.py

rename from 1.1/syncserver/tests/test_wbo.py
rename to syncserver/tests/test_wbo.py

rename from 1.1/syncserver/util.py
rename to syncserver/util.py

rename from 1.1/syncserver/wbo.py
rename to syncserver/wbo.py

rename from 1.1/syncserver/websetup.py
rename to syncserver/websetup.py

rename from 1.1/syncserver/wsgiapp.py
rename to syncserver/wsgiapp.py

rename from 1.1/tests.ini
rename to tests.ini

rename from 1.1/tests_mysql.ini
rename to tests_mysql.ini

rename from 1.1/tests_redisql.ini
rename to tests_redisql.ini