diff --git a/beets/__init__.py b/lib/beets/__init__.py
similarity index 100%
rename from beets/__init__.py
rename to lib/beets/__init__.py
diff --git a/beets/autotag/__init__.py b/lib/beets/autotag/__init__.py
similarity index 100%
rename from beets/autotag/__init__.py
rename to lib/beets/autotag/__init__.py
diff --git a/beets/autotag/hooks.py b/lib/beets/autotag/hooks.py
similarity index 100%
rename from beets/autotag/hooks.py
rename to lib/beets/autotag/hooks.py
diff --git a/beets/autotag/match.py b/lib/beets/autotag/match.py
similarity index 100%
rename from beets/autotag/match.py
rename to lib/beets/autotag/match.py
diff --git a/beets/autotag/mb.py b/lib/beets/autotag/mb.py
similarity index 100%
rename from beets/autotag/mb.py
rename to lib/beets/autotag/mb.py
diff --git a/beets/config_default.yaml b/lib/beets/config_default.yaml
similarity index 100%
rename from beets/config_default.yaml
rename to lib/beets/config_default.yaml
diff --git a/beets/dbcore/__init__.py b/lib/beets/dbcore/__init__.py
similarity index 100%
rename from beets/dbcore/__init__.py
rename to lib/beets/dbcore/__init__.py
diff --git a/beets/dbcore/db.py b/lib/beets/dbcore/db.py
similarity index 100%
rename from beets/dbcore/db.py
rename to lib/beets/dbcore/db.py
diff --git a/beets/dbcore/query.py b/lib/beets/dbcore/query.py
similarity index 100%
rename from beets/dbcore/query.py
rename to lib/beets/dbcore/query.py
diff --git a/beets/dbcore/types.py b/lib/beets/dbcore/types.py
similarity index 100%
rename from beets/dbcore/types.py
rename to lib/beets/dbcore/types.py
diff --git a/beets/importer.py b/lib/beets/importer.py
similarity index 100%
rename from beets/importer.py
rename to lib/beets/importer.py
diff --git a/beets/library.py b/lib/beets/library.py
similarity index 100%
rename from beets/library.py
rename to lib/beets/library.py
diff --git a/beets/mediafile.py b/lib/beets/mediafile.py
similarity index 100%
rename from beets/mediafile.py
rename to lib/beets/mediafile.py
diff --git a/beets/plugins.py b/lib/beets/plugins.py
similarity index 100%
rename from beets/plugins.py
rename to lib/beets/plugins.py
diff --git a/beets/ui/__init__.py b/lib/beets/ui/__init__.py
similarity index 100%
rename from beets/ui/__init__.py
rename to lib/beets/ui/__init__.py
diff --git a/beets/ui/commands.py b/lib/beets/ui/commands.py
similarity index 100%
rename from beets/ui/commands.py
rename to lib/beets/ui/commands.py
diff --git a/beets/ui/completion_base.sh b/lib/beets/ui/completion_base.sh
similarity index 100%
rename from beets/ui/completion_base.sh
rename to lib/beets/ui/completion_base.sh
diff --git a/beets/ui/migrate.py b/lib/beets/ui/migrate.py
similarity index 100%
rename from beets/ui/migrate.py
rename to lib/beets/ui/migrate.py
diff --git a/beets/util/__init__.py b/lib/beets/util/__init__.py
similarity index 100%
rename from beets/util/__init__.py
rename to lib/beets/util/__init__.py
diff --git a/beets/util/artresizer.py b/lib/beets/util/artresizer.py
similarity index 100%
rename from beets/util/artresizer.py
rename to lib/beets/util/artresizer.py
diff --git a/beets/util/bluelet.py b/lib/beets/util/bluelet.py
similarity index 100%
rename from beets/util/bluelet.py
rename to lib/beets/util/bluelet.py
diff --git a/beets/util/confit.py b/lib/beets/util/confit.py
similarity index 100%
rename from beets/util/confit.py
rename to lib/beets/util/confit.py
diff --git a/beets/util/enumeration.py b/lib/beets/util/enumeration.py
similarity index 100%
rename from beets/util/enumeration.py
rename to lib/beets/util/enumeration.py
diff --git a/beets/util/functemplate.py b/lib/beets/util/functemplate.py
similarity index 100%
rename from beets/util/functemplate.py
rename to lib/beets/util/functemplate.py
diff --git a/beets/util/pipeline.py b/lib/beets/util/pipeline.py
similarity index 100%
rename from beets/util/pipeline.py
rename to lib/beets/util/pipeline.py
diff --git a/beets/vfs.py b/lib/beets/vfs.py
similarity index 100%
rename from beets/vfs.py
rename to lib/beets/vfs.py
diff --git a/cherrypy/LICENSE.txt b/lib/cherrypy/LICENSE.txt
similarity index 100%
rename from cherrypy/LICENSE.txt
rename to lib/cherrypy/LICENSE.txt
diff --git a/cherrypy/__init__.py b/lib/cherrypy/__init__.py
similarity index 100%
rename from cherrypy/__init__.py
rename to lib/cherrypy/__init__.py
diff --git a/cherrypy/_cpchecker.py b/lib/cherrypy/_cpchecker.py
similarity index 100%
rename from cherrypy/_cpchecker.py
rename to lib/cherrypy/_cpchecker.py
diff --git a/cherrypy/_cpcompat.py b/lib/cherrypy/_cpcompat.py
similarity index 100%
rename from cherrypy/_cpcompat.py
rename to lib/cherrypy/_cpcompat.py
diff --git a/cherrypy/_cpconfig.py b/lib/cherrypy/_cpconfig.py
similarity index 100%
rename from cherrypy/_cpconfig.py
rename to lib/cherrypy/_cpconfig.py
diff --git a/cherrypy/_cpdispatch.py b/lib/cherrypy/_cpdispatch.py
similarity index 100%
rename from cherrypy/_cpdispatch.py
rename to lib/cherrypy/_cpdispatch.py
diff --git a/cherrypy/_cperror.py b/lib/cherrypy/_cperror.py
similarity index 100%
rename from cherrypy/_cperror.py
rename to lib/cherrypy/_cperror.py
diff --git a/cherrypy/_cplogging.py b/lib/cherrypy/_cplogging.py
similarity index 100%
rename from cherrypy/_cplogging.py
rename to lib/cherrypy/_cplogging.py
diff --git a/cherrypy/_cpmodpy.py b/lib/cherrypy/_cpmodpy.py
similarity index 100%
rename from cherrypy/_cpmodpy.py
rename to lib/cherrypy/_cpmodpy.py
diff --git a/cherrypy/_cpnative_server.py b/lib/cherrypy/_cpnative_server.py
similarity index 100%
rename from cherrypy/_cpnative_server.py
rename to lib/cherrypy/_cpnative_server.py
diff --git a/cherrypy/_cpreqbody.py b/lib/cherrypy/_cpreqbody.py
similarity index 100%
rename from cherrypy/_cpreqbody.py
rename to lib/cherrypy/_cpreqbody.py
diff --git a/cherrypy/_cprequest.py b/lib/cherrypy/_cprequest.py
similarity index 100%
rename from cherrypy/_cprequest.py
rename to lib/cherrypy/_cprequest.py
diff --git a/cherrypy/_cpserver.py b/lib/cherrypy/_cpserver.py
similarity index 100%
rename from cherrypy/_cpserver.py
rename to lib/cherrypy/_cpserver.py
diff --git a/cherrypy/_cpthreadinglocal.py b/lib/cherrypy/_cpthreadinglocal.py
similarity index 100%
rename from cherrypy/_cpthreadinglocal.py
rename to lib/cherrypy/_cpthreadinglocal.py
diff --git a/cherrypy/_cptools.py b/lib/cherrypy/_cptools.py
similarity index 100%
rename from cherrypy/_cptools.py
rename to lib/cherrypy/_cptools.py
diff --git a/cherrypy/_cptree.py b/lib/cherrypy/_cptree.py
similarity index 100%
rename from cherrypy/_cptree.py
rename to lib/cherrypy/_cptree.py
diff --git a/cherrypy/_cpwsgi.py b/lib/cherrypy/_cpwsgi.py
similarity index 100%
rename from cherrypy/_cpwsgi.py
rename to lib/cherrypy/_cpwsgi.py
diff --git a/cherrypy/_cpwsgi_server.py b/lib/cherrypy/_cpwsgi_server.py
similarity index 100%
rename from cherrypy/_cpwsgi_server.py
rename to lib/cherrypy/_cpwsgi_server.py
diff --git a/cherrypy/cherryd b/lib/cherrypy/cherryd
similarity index 100%
rename from cherrypy/cherryd
rename to lib/cherrypy/cherryd
diff --git a/cherrypy/favicon.ico b/lib/cherrypy/favicon.ico
similarity index 100%
rename from cherrypy/favicon.ico
rename to lib/cherrypy/favicon.ico
diff --git a/cherrypy/lib/__init__.py b/lib/cherrypy/lib/__init__.py
similarity index 100%
rename from cherrypy/lib/__init__.py
rename to lib/cherrypy/lib/__init__.py
diff --git a/cherrypy/lib/auth.py b/lib/cherrypy/lib/auth.py
similarity index 100%
rename from cherrypy/lib/auth.py
rename to lib/cherrypy/lib/auth.py
diff --git a/cherrypy/lib/auth_basic.py b/lib/cherrypy/lib/auth_basic.py
similarity index 100%
rename from cherrypy/lib/auth_basic.py
rename to lib/cherrypy/lib/auth_basic.py
diff --git a/cherrypy/lib/auth_digest.py b/lib/cherrypy/lib/auth_digest.py
similarity index 100%
rename from cherrypy/lib/auth_digest.py
rename to lib/cherrypy/lib/auth_digest.py
diff --git a/cherrypy/lib/caching.py b/lib/cherrypy/lib/caching.py
similarity index 100%
rename from cherrypy/lib/caching.py
rename to lib/cherrypy/lib/caching.py
diff --git a/cherrypy/lib/covercp.py b/lib/cherrypy/lib/covercp.py
similarity index 100%
rename from cherrypy/lib/covercp.py
rename to lib/cherrypy/lib/covercp.py
diff --git a/cherrypy/lib/cpstats.py b/lib/cherrypy/lib/cpstats.py
similarity index 100%
rename from cherrypy/lib/cpstats.py
rename to lib/cherrypy/lib/cpstats.py
diff --git a/cherrypy/lib/cptools.py b/lib/cherrypy/lib/cptools.py
similarity index 100%
rename from cherrypy/lib/cptools.py
rename to lib/cherrypy/lib/cptools.py
diff --git a/cherrypy/lib/encoding.py b/lib/cherrypy/lib/encoding.py
similarity index 100%
rename from cherrypy/lib/encoding.py
rename to lib/cherrypy/lib/encoding.py
diff --git a/cherrypy/lib/gctools.py b/lib/cherrypy/lib/gctools.py
similarity index 100%
rename from cherrypy/lib/gctools.py
rename to lib/cherrypy/lib/gctools.py
diff --git a/cherrypy/lib/http.py b/lib/cherrypy/lib/http.py
similarity index 100%
rename from cherrypy/lib/http.py
rename to lib/cherrypy/lib/http.py
diff --git a/cherrypy/lib/httpauth.py b/lib/cherrypy/lib/httpauth.py
similarity index 100%
rename from cherrypy/lib/httpauth.py
rename to lib/cherrypy/lib/httpauth.py
diff --git a/cherrypy/lib/httputil.py b/lib/cherrypy/lib/httputil.py
similarity index 100%
rename from cherrypy/lib/httputil.py
rename to lib/cherrypy/lib/httputil.py
diff --git a/cherrypy/lib/jsontools.py b/lib/cherrypy/lib/jsontools.py
similarity index 100%
rename from cherrypy/lib/jsontools.py
rename to lib/cherrypy/lib/jsontools.py
diff --git a/cherrypy/lib/profiler.py b/lib/cherrypy/lib/profiler.py
similarity index 100%
rename from cherrypy/lib/profiler.py
rename to lib/cherrypy/lib/profiler.py
diff --git a/cherrypy/lib/reprconf.py b/lib/cherrypy/lib/reprconf.py
similarity index 100%
rename from cherrypy/lib/reprconf.py
rename to lib/cherrypy/lib/reprconf.py
diff --git a/cherrypy/lib/sessions.py b/lib/cherrypy/lib/sessions.py
similarity index 100%
rename from cherrypy/lib/sessions.py
rename to lib/cherrypy/lib/sessions.py
diff --git a/cherrypy/lib/static.py b/lib/cherrypy/lib/static.py
similarity index 100%
rename from cherrypy/lib/static.py
rename to lib/cherrypy/lib/static.py
diff --git a/cherrypy/lib/xmlrpcutil.py b/lib/cherrypy/lib/xmlrpcutil.py
similarity index 100%
rename from cherrypy/lib/xmlrpcutil.py
rename to lib/cherrypy/lib/xmlrpcutil.py
diff --git a/cherrypy/process/__init__.py b/lib/cherrypy/process/__init__.py
similarity index 100%
rename from cherrypy/process/__init__.py
rename to lib/cherrypy/process/__init__.py
diff --git a/cherrypy/process/plugins.py b/lib/cherrypy/process/plugins.py
similarity index 100%
rename from cherrypy/process/plugins.py
rename to lib/cherrypy/process/plugins.py
diff --git a/cherrypy/process/servers.py b/lib/cherrypy/process/servers.py
similarity index 100%
rename from cherrypy/process/servers.py
rename to lib/cherrypy/process/servers.py
diff --git a/cherrypy/process/win32.py b/lib/cherrypy/process/win32.py
similarity index 100%
rename from cherrypy/process/win32.py
rename to lib/cherrypy/process/win32.py
diff --git a/cherrypy/process/wspbus.py b/lib/cherrypy/process/wspbus.py
similarity index 100%
rename from cherrypy/process/wspbus.py
rename to lib/cherrypy/process/wspbus.py
diff --git a/cherrypy/scaffold/__init__.py b/lib/cherrypy/scaffold/__init__.py
similarity index 100%
rename from cherrypy/scaffold/__init__.py
rename to lib/cherrypy/scaffold/__init__.py
diff --git a/cherrypy/scaffold/apache-fcgi.conf b/lib/cherrypy/scaffold/apache-fcgi.conf
similarity index 100%
rename from cherrypy/scaffold/apache-fcgi.conf
rename to lib/cherrypy/scaffold/apache-fcgi.conf
diff --git a/cherrypy/scaffold/example.conf b/lib/cherrypy/scaffold/example.conf
similarity index 100%
rename from cherrypy/scaffold/example.conf
rename to lib/cherrypy/scaffold/example.conf
diff --git a/cherrypy/scaffold/site.conf b/lib/cherrypy/scaffold/site.conf
similarity index 100%
rename from cherrypy/scaffold/site.conf
rename to lib/cherrypy/scaffold/site.conf
diff --git a/cherrypy/scaffold/static/made_with_cherrypy_small.png b/lib/cherrypy/scaffold/static/made_with_cherrypy_small.png
similarity index 100%
rename from cherrypy/scaffold/static/made_with_cherrypy_small.png
rename to lib/cherrypy/scaffold/static/made_with_cherrypy_small.png
diff --git a/cherrypy/wsgiserver/__init__.py b/lib/cherrypy/wsgiserver/__init__.py
similarity index 100%
rename from cherrypy/wsgiserver/__init__.py
rename to lib/cherrypy/wsgiserver/__init__.py
diff --git a/cherrypy/wsgiserver/ssl_builtin.py b/lib/cherrypy/wsgiserver/ssl_builtin.py
similarity index 100%
rename from cherrypy/wsgiserver/ssl_builtin.py
rename to lib/cherrypy/wsgiserver/ssl_builtin.py
diff --git a/cherrypy/wsgiserver/ssl_pyopenssl.py b/lib/cherrypy/wsgiserver/ssl_pyopenssl.py
similarity index 100%
rename from cherrypy/wsgiserver/ssl_pyopenssl.py
rename to lib/cherrypy/wsgiserver/ssl_pyopenssl.py
diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/lib/cherrypy/wsgiserver/wsgiserver2.py
similarity index 100%
rename from cherrypy/wsgiserver/wsgiserver2.py
rename to lib/cherrypy/wsgiserver/wsgiserver2.py
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/lib/cherrypy/wsgiserver/wsgiserver3.py
similarity index 100%
rename from cherrypy/wsgiserver/wsgiserver3.py
rename to lib/cherrypy/wsgiserver/wsgiserver3.py
diff --git a/mako/__init__.py b/lib/mako/__init__.py
similarity index 100%
rename from mako/__init__.py
rename to lib/mako/__init__.py
diff --git a/mako/_ast_util.py b/lib/mako/_ast_util.py
similarity index 100%
rename from mako/_ast_util.py
rename to lib/mako/_ast_util.py
diff --git a/mako/ast.py b/lib/mako/ast.py
similarity index 100%
rename from mako/ast.py
rename to lib/mako/ast.py
diff --git a/mako/cache.py b/lib/mako/cache.py
similarity index 100%
rename from mako/cache.py
rename to lib/mako/cache.py
diff --git a/mako/codegen.py b/lib/mako/codegen.py
similarity index 100%
rename from mako/codegen.py
rename to lib/mako/codegen.py
diff --git a/mako/compat.py b/lib/mako/compat.py
similarity index 100%
rename from mako/compat.py
rename to lib/mako/compat.py
diff --git a/mako/exceptions.py b/lib/mako/exceptions.py
similarity index 100%
rename from mako/exceptions.py
rename to lib/mako/exceptions.py
diff --git a/mako/ext/__init__.py b/lib/mako/ext/__init__.py
similarity index 100%
rename from mako/ext/__init__.py
rename to lib/mako/ext/__init__.py
diff --git a/mako/ext/autohandler.py b/lib/mako/ext/autohandler.py
similarity index 100%
rename from mako/ext/autohandler.py
rename to lib/mako/ext/autohandler.py
diff --git a/mako/ext/babelplugin.py b/lib/mako/ext/babelplugin.py
similarity index 100%
rename from mako/ext/babelplugin.py
rename to lib/mako/ext/babelplugin.py
diff --git a/mako/ext/beaker_cache.py b/lib/mako/ext/beaker_cache.py
similarity index 100%
rename from mako/ext/beaker_cache.py
rename to lib/mako/ext/beaker_cache.py
diff --git a/mako/ext/preprocessors.py b/lib/mako/ext/preprocessors.py
similarity index 100%
rename from mako/ext/preprocessors.py
rename to lib/mako/ext/preprocessors.py
diff --git a/mako/ext/pygmentplugin.py b/lib/mako/ext/pygmentplugin.py
similarity index 100%
rename from mako/ext/pygmentplugin.py
rename to lib/mako/ext/pygmentplugin.py
diff --git a/mako/ext/turbogears.py b/lib/mako/ext/turbogears.py
similarity index 100%
rename from mako/ext/turbogears.py
rename to lib/mako/ext/turbogears.py
diff --git a/mako/filters.py b/lib/mako/filters.py
similarity index 100%
rename from mako/filters.py
rename to lib/mako/filters.py
diff --git a/mako/lexer.py b/lib/mako/lexer.py
similarity index 100%
rename from mako/lexer.py
rename to lib/mako/lexer.py
diff --git a/mako/lookup.py b/lib/mako/lookup.py
similarity index 100%
rename from mako/lookup.py
rename to lib/mako/lookup.py
diff --git a/mako/parsetree.py b/lib/mako/parsetree.py
similarity index 100%
rename from mako/parsetree.py
rename to lib/mako/parsetree.py
diff --git a/mako/pygen.py b/lib/mako/pygen.py
similarity index 100%
rename from mako/pygen.py
rename to lib/mako/pygen.py
diff --git a/mako/pyparser.py b/lib/mako/pyparser.py
similarity index 100%
rename from mako/pyparser.py
rename to lib/mako/pyparser.py
diff --git a/mako/runtime.py b/lib/mako/runtime.py
similarity index 100%
rename from mako/runtime.py
rename to lib/mako/runtime.py
diff --git a/mako/template.py b/lib/mako/template.py
similarity index 100%
rename from mako/template.py
rename to lib/mako/template.py
diff --git a/mako/util.py b/lib/mako/util.py
similarity index 100%
rename from mako/util.py
rename to lib/mako/util.py
diff --git a/mutagen/__init__.py b/lib/mutagen/__init__.py
similarity index 100%
rename from mutagen/__init__.py
rename to lib/mutagen/__init__.py
diff --git a/mutagen/_constants.py b/lib/mutagen/_constants.py
similarity index 100%
rename from mutagen/_constants.py
rename to lib/mutagen/_constants.py
diff --git a/mutagen/_id3frames.py b/lib/mutagen/_id3frames.py
similarity index 100%
rename from mutagen/_id3frames.py
rename to lib/mutagen/_id3frames.py
diff --git a/mutagen/_id3specs.py b/lib/mutagen/_id3specs.py
similarity index 100%
rename from mutagen/_id3specs.py
rename to lib/mutagen/_id3specs.py
diff --git a/mutagen/_id3util.py b/lib/mutagen/_id3util.py
similarity index 100%
rename from mutagen/_id3util.py
rename to lib/mutagen/_id3util.py
diff --git a/mutagen/_util.py b/lib/mutagen/_util.py
similarity index 100%
rename from mutagen/_util.py
rename to lib/mutagen/_util.py
diff --git a/mutagen/_vorbis.py b/lib/mutagen/_vorbis.py
similarity index 100%
rename from mutagen/_vorbis.py
rename to lib/mutagen/_vorbis.py
diff --git a/mutagen/apev2.py b/lib/mutagen/apev2.py
similarity index 100%
rename from mutagen/apev2.py
rename to lib/mutagen/apev2.py
diff --git a/mutagen/asf.py b/lib/mutagen/asf.py
similarity index 100%
rename from mutagen/asf.py
rename to lib/mutagen/asf.py
diff --git a/mutagen/easyid3.py b/lib/mutagen/easyid3.py
similarity index 100%
rename from mutagen/easyid3.py
rename to lib/mutagen/easyid3.py
diff --git a/mutagen/easymp4.py b/lib/mutagen/easymp4.py
similarity index 100%
rename from mutagen/easymp4.py
rename to lib/mutagen/easymp4.py
diff --git a/mutagen/flac.py b/lib/mutagen/flac.py
similarity index 100%
rename from mutagen/flac.py
rename to lib/mutagen/flac.py
diff --git a/mutagen/id3.py b/lib/mutagen/id3.py
similarity index 100%
rename from mutagen/id3.py
rename to lib/mutagen/id3.py
diff --git a/mutagen/m4a.py b/lib/mutagen/m4a.py
similarity index 100%
rename from mutagen/m4a.py
rename to lib/mutagen/m4a.py
diff --git a/mutagen/monkeysaudio.py b/lib/mutagen/monkeysaudio.py
similarity index 100%
rename from mutagen/monkeysaudio.py
rename to lib/mutagen/monkeysaudio.py
diff --git a/mutagen/mp3.py b/lib/mutagen/mp3.py
similarity index 100%
rename from mutagen/mp3.py
rename to lib/mutagen/mp3.py
diff --git a/mutagen/mp4.py b/lib/mutagen/mp4.py
similarity index 100%
rename from mutagen/mp4.py
rename to lib/mutagen/mp4.py
diff --git a/mutagen/musepack.py b/lib/mutagen/musepack.py
similarity index 100%
rename from mutagen/musepack.py
rename to lib/mutagen/musepack.py
diff --git a/mutagen/ogg.py b/lib/mutagen/ogg.py
similarity index 100%
rename from mutagen/ogg.py
rename to lib/mutagen/ogg.py
diff --git a/mutagen/oggflac.py b/lib/mutagen/oggflac.py
similarity index 100%
rename from mutagen/oggflac.py
rename to lib/mutagen/oggflac.py
diff --git a/mutagen/oggopus.py b/lib/mutagen/oggopus.py
similarity index 100%
rename from mutagen/oggopus.py
rename to lib/mutagen/oggopus.py
diff --git a/mutagen/oggspeex.py b/lib/mutagen/oggspeex.py
similarity index 100%
rename from mutagen/oggspeex.py
rename to lib/mutagen/oggspeex.py
diff --git a/mutagen/oggtheora.py b/lib/mutagen/oggtheora.py
similarity index 100%
rename from mutagen/oggtheora.py
rename to lib/mutagen/oggtheora.py
diff --git a/mutagen/oggvorbis.py b/lib/mutagen/oggvorbis.py
similarity index 100%
rename from mutagen/oggvorbis.py
rename to lib/mutagen/oggvorbis.py
diff --git a/mutagen/optimfrog.py b/lib/mutagen/optimfrog.py
similarity index 100%
rename from mutagen/optimfrog.py
rename to lib/mutagen/optimfrog.py
diff --git a/mutagen/trueaudio.py b/lib/mutagen/trueaudio.py
similarity index 100%
rename from mutagen/trueaudio.py
rename to lib/mutagen/trueaudio.py
diff --git a/mutagen/wavpack.py b/lib/mutagen/wavpack.py
similarity index 100%
rename from mutagen/wavpack.py
rename to lib/mutagen/wavpack.py