diff --git a/app/Library/getid3-new/.gitattributes b/app/Library/getid3/.gitattributes
similarity index 100%
rename from app/Library/getid3-new/.gitattributes
rename to app/Library/getid3/.gitattributes
diff --git a/app/Library/getid3-new/.gitignore b/app/Library/getid3/.gitignore
similarity index 100%
rename from app/Library/getid3-new/.gitignore
rename to app/Library/getid3/.gitignore
diff --git a/app/Library/getid3-new/README.md b/app/Library/getid3/README.md
similarity index 100%
rename from app/Library/getid3-new/README.md
rename to app/Library/getid3/README.md
diff --git a/app/Library/getid3-new/changelog.txt b/app/Library/getid3/changelog.txt
similarity index 100%
rename from app/Library/getid3-new/changelog.txt
rename to app/Library/getid3/changelog.txt
diff --git a/app/Library/getid3-new/composer.json b/app/Library/getid3/composer.json
similarity index 100%
rename from app/Library/getid3-new/composer.json
rename to app/Library/getid3/composer.json
diff --git a/app/Library/getid3-new/demos/demo.audioinfo.class.php b/app/Library/getid3/demos/demo.audioinfo.class.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.audioinfo.class.php
rename to app/Library/getid3/demos/demo.audioinfo.class.php
diff --git a/app/Library/getid3-new/demos/demo.basic.php b/app/Library/getid3/demos/demo.basic.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.basic.php
rename to app/Library/getid3/demos/demo.basic.php
diff --git a/app/Library/getid3-new/demos/demo.browse.php b/app/Library/getid3/demos/demo.browse.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.browse.php
rename to app/Library/getid3/demos/demo.browse.php
diff --git a/app/Library/getid3-new/demos/demo.cache.dbm.php b/app/Library/getid3/demos/demo.cache.dbm.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.cache.dbm.php
rename to app/Library/getid3/demos/demo.cache.dbm.php
diff --git a/app/Library/getid3-new/demos/demo.cache.mysql.php b/app/Library/getid3/demos/demo.cache.mysql.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.cache.mysql.php
rename to app/Library/getid3/demos/demo.cache.mysql.php
diff --git a/app/Library/getid3-new/demos/demo.joinmp3.php b/app/Library/getid3/demos/demo.joinmp3.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.joinmp3.php
rename to app/Library/getid3/demos/demo.joinmp3.php
diff --git a/app/Library/getid3-new/demos/demo.mimeonly.php b/app/Library/getid3/demos/demo.mimeonly.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.mimeonly.php
rename to app/Library/getid3/demos/demo.mimeonly.php
diff --git a/app/Library/getid3-new/demos/demo.mp3header.php b/app/Library/getid3/demos/demo.mp3header.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.mp3header.php
rename to app/Library/getid3/demos/demo.mp3header.php
diff --git a/app/Library/getid3-new/demos/demo.mysql.php b/app/Library/getid3/demos/demo.mysql.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.mysql.php
rename to app/Library/getid3/demos/demo.mysql.php
diff --git a/app/Library/getid3-new/demos/demo.simple.php b/app/Library/getid3/demos/demo.simple.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.simple.php
rename to app/Library/getid3/demos/demo.simple.php
diff --git a/app/Library/getid3-new/demos/demo.simple.write.php b/app/Library/getid3/demos/demo.simple.write.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.simple.write.php
rename to app/Library/getid3/demos/demo.simple.write.php
diff --git a/app/Library/getid3-new/demos/demo.write.php b/app/Library/getid3/demos/demo.write.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.write.php
rename to app/Library/getid3/demos/demo.write.php
diff --git a/app/Library/getid3-new/demos/demo.zip.php b/app/Library/getid3/demos/demo.zip.php
similarity index 100%
rename from app/Library/getid3-new/demos/demo.zip.php
rename to app/Library/getid3/demos/demo.zip.php
diff --git a/app/Library/getid3-new/demos/getid3.css b/app/Library/getid3/demos/getid3.css
similarity index 100%
rename from app/Library/getid3-new/demos/getid3.css
rename to app/Library/getid3/demos/getid3.css
diff --git a/app/Library/getid3-new/demos/getid3.demo.dirscan.php b/app/Library/getid3/demos/getid3.demo.dirscan.php
similarity index 100%
rename from app/Library/getid3-new/demos/getid3.demo.dirscan.php
rename to app/Library/getid3/demos/getid3.demo.dirscan.php
diff --git a/app/Library/getid3-new/demos/index.php b/app/Library/getid3/demos/index.php
similarity index 100%
rename from app/Library/getid3-new/demos/index.php
rename to app/Library/getid3/demos/index.php
diff --git a/app/Library/getid3-new/dependencies.txt b/app/Library/getid3/dependencies.txt
similarity index 100%
rename from app/Library/getid3-new/dependencies.txt
rename to app/Library/getid3/dependencies.txt
diff --git a/app/Library/getid3-new/getid3/extension.cache.dbm.php b/app/Library/getid3/getid3/extension.cache.dbm.php
similarity index 100%
rename from app/Library/getid3-new/getid3/extension.cache.dbm.php
rename to app/Library/getid3/getid3/extension.cache.dbm.php
diff --git a/app/Library/getid3-new/getid3/extension.cache.mysql.php b/app/Library/getid3/getid3/extension.cache.mysql.php
similarity index 100%
rename from app/Library/getid3-new/getid3/extension.cache.mysql.php
rename to app/Library/getid3/getid3/extension.cache.mysql.php
diff --git a/app/Library/getid3-new/getid3/extension.cache.sqlite3.php b/app/Library/getid3/getid3/extension.cache.sqlite3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/extension.cache.sqlite3.php
rename to app/Library/getid3/getid3/extension.cache.sqlite3.php
diff --git a/app/Library/getid3-new/getid3/getid3.lib.php b/app/Library/getid3/getid3/getid3.lib.php
similarity index 100%
rename from app/Library/getid3-new/getid3/getid3.lib.php
rename to app/Library/getid3/getid3/getid3.lib.php
diff --git a/app/Library/getid3-new/getid3/getid3.php b/app/Library/getid3/getid3/getid3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/getid3.php
rename to app/Library/getid3/getid3/getid3.php
diff --git a/app/Library/getid3-new/getid3/module.archive.gzip.php b/app/Library/getid3/getid3/module.archive.gzip.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.archive.gzip.php
rename to app/Library/getid3/getid3/module.archive.gzip.php
diff --git a/app/Library/getid3-new/getid3/module.archive.rar.php b/app/Library/getid3/getid3/module.archive.rar.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.archive.rar.php
rename to app/Library/getid3/getid3/module.archive.rar.php
diff --git a/app/Library/getid3-new/getid3/module.archive.szip.php b/app/Library/getid3/getid3/module.archive.szip.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.archive.szip.php
rename to app/Library/getid3/getid3/module.archive.szip.php
diff --git a/app/Library/getid3-new/getid3/module.archive.tar.php b/app/Library/getid3/getid3/module.archive.tar.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.archive.tar.php
rename to app/Library/getid3/getid3/module.archive.tar.php
diff --git a/app/Library/getid3-new/getid3/module.archive.zip.php b/app/Library/getid3/getid3/module.archive.zip.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.archive.zip.php
rename to app/Library/getid3/getid3/module.archive.zip.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.asf.php b/app/Library/getid3/getid3/module.audio-video.asf.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.asf.php
rename to app/Library/getid3/getid3/module.audio-video.asf.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.bink.php b/app/Library/getid3/getid3/module.audio-video.bink.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.bink.php
rename to app/Library/getid3/getid3/module.audio-video.bink.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.flv.php b/app/Library/getid3/getid3/module.audio-video.flv.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.flv.php
rename to app/Library/getid3/getid3/module.audio-video.flv.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.matroska.php b/app/Library/getid3/getid3/module.audio-video.matroska.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.matroska.php
rename to app/Library/getid3/getid3/module.audio-video.matroska.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.mpeg.php b/app/Library/getid3/getid3/module.audio-video.mpeg.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.mpeg.php
rename to app/Library/getid3/getid3/module.audio-video.mpeg.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.nsv.php b/app/Library/getid3/getid3/module.audio-video.nsv.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.nsv.php
rename to app/Library/getid3/getid3/module.audio-video.nsv.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.quicktime.php b/app/Library/getid3/getid3/module.audio-video.quicktime.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.quicktime.php
rename to app/Library/getid3/getid3/module.audio-video.quicktime.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.real.php b/app/Library/getid3/getid3/module.audio-video.real.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.real.php
rename to app/Library/getid3/getid3/module.audio-video.real.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.riff.php b/app/Library/getid3/getid3/module.audio-video.riff.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.riff.php
rename to app/Library/getid3/getid3/module.audio-video.riff.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.swf.php b/app/Library/getid3/getid3/module.audio-video.swf.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.swf.php
rename to app/Library/getid3/getid3/module.audio-video.swf.php
diff --git a/app/Library/getid3-new/getid3/module.audio-video.ts.php b/app/Library/getid3/getid3/module.audio-video.ts.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio-video.ts.php
rename to app/Library/getid3/getid3/module.audio-video.ts.php
diff --git a/app/Library/getid3-new/getid3/module.audio.aa.php b/app/Library/getid3/getid3/module.audio.aa.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.aa.php
rename to app/Library/getid3/getid3/module.audio.aa.php
diff --git a/app/Library/getid3-new/getid3/module.audio.aac.php b/app/Library/getid3/getid3/module.audio.aac.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.aac.php
rename to app/Library/getid3/getid3/module.audio.aac.php
diff --git a/app/Library/getid3-new/getid3/module.audio.ac3.php b/app/Library/getid3/getid3/module.audio.ac3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.ac3.php
rename to app/Library/getid3/getid3/module.audio.ac3.php
diff --git a/app/Library/getid3-new/getid3/module.audio.amr.php b/app/Library/getid3/getid3/module.audio.amr.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.amr.php
rename to app/Library/getid3/getid3/module.audio.amr.php
diff --git a/app/Library/getid3-new/getid3/module.audio.au.php b/app/Library/getid3/getid3/module.audio.au.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.au.php
rename to app/Library/getid3/getid3/module.audio.au.php
diff --git a/app/Library/getid3-new/getid3/module.audio.avr.php b/app/Library/getid3/getid3/module.audio.avr.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.avr.php
rename to app/Library/getid3/getid3/module.audio.avr.php
diff --git a/app/Library/getid3-new/getid3/module.audio.bonk.php b/app/Library/getid3/getid3/module.audio.bonk.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.bonk.php
rename to app/Library/getid3/getid3/module.audio.bonk.php
diff --git a/app/Library/getid3-new/getid3/module.audio.dss.php b/app/Library/getid3/getid3/module.audio.dss.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.dss.php
rename to app/Library/getid3/getid3/module.audio.dss.php
diff --git a/app/Library/getid3-new/getid3/module.audio.dts.php b/app/Library/getid3/getid3/module.audio.dts.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.dts.php
rename to app/Library/getid3/getid3/module.audio.dts.php
diff --git a/app/Library/getid3-new/getid3/module.audio.flac.php b/app/Library/getid3/getid3/module.audio.flac.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.flac.php
rename to app/Library/getid3/getid3/module.audio.flac.php
diff --git a/app/Library/getid3-new/getid3/module.audio.la.php b/app/Library/getid3/getid3/module.audio.la.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.la.php
rename to app/Library/getid3/getid3/module.audio.la.php
diff --git a/app/Library/getid3-new/getid3/module.audio.lpac.php b/app/Library/getid3/getid3/module.audio.lpac.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.lpac.php
rename to app/Library/getid3/getid3/module.audio.lpac.php
diff --git a/app/Library/getid3-new/getid3/module.audio.midi.php b/app/Library/getid3/getid3/module.audio.midi.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.midi.php
rename to app/Library/getid3/getid3/module.audio.midi.php
diff --git a/app/Library/getid3-new/getid3/module.audio.mod.php b/app/Library/getid3/getid3/module.audio.mod.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.mod.php
rename to app/Library/getid3/getid3/module.audio.mod.php
diff --git a/app/Library/getid3-new/getid3/module.audio.monkey.php b/app/Library/getid3/getid3/module.audio.monkey.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.monkey.php
rename to app/Library/getid3/getid3/module.audio.monkey.php
diff --git a/app/Library/getid3-new/getid3/module.audio.mp3.php b/app/Library/getid3/getid3/module.audio.mp3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.mp3.php
rename to app/Library/getid3/getid3/module.audio.mp3.php
diff --git a/app/Library/getid3-new/getid3/module.audio.mpc.php b/app/Library/getid3/getid3/module.audio.mpc.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.mpc.php
rename to app/Library/getid3/getid3/module.audio.mpc.php
diff --git a/app/Library/getid3-new/getid3/module.audio.ogg.php b/app/Library/getid3/getid3/module.audio.ogg.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.ogg.php
rename to app/Library/getid3/getid3/module.audio.ogg.php
diff --git a/app/Library/getid3-new/getid3/module.audio.optimfrog.php b/app/Library/getid3/getid3/module.audio.optimfrog.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.optimfrog.php
rename to app/Library/getid3/getid3/module.audio.optimfrog.php
diff --git a/app/Library/getid3-new/getid3/module.audio.rkau.php b/app/Library/getid3/getid3/module.audio.rkau.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.rkau.php
rename to app/Library/getid3/getid3/module.audio.rkau.php
diff --git a/app/Library/getid3-new/getid3/module.audio.shorten.php b/app/Library/getid3/getid3/module.audio.shorten.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.shorten.php
rename to app/Library/getid3/getid3/module.audio.shorten.php
diff --git a/app/Library/getid3-new/getid3/module.audio.tta.php b/app/Library/getid3/getid3/module.audio.tta.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.tta.php
rename to app/Library/getid3/getid3/module.audio.tta.php
diff --git a/app/Library/getid3-new/getid3/module.audio.voc.php b/app/Library/getid3/getid3/module.audio.voc.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.voc.php
rename to app/Library/getid3/getid3/module.audio.voc.php
diff --git a/app/Library/getid3-new/getid3/module.audio.vqf.php b/app/Library/getid3/getid3/module.audio.vqf.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.vqf.php
rename to app/Library/getid3/getid3/module.audio.vqf.php
diff --git a/app/Library/getid3-new/getid3/module.audio.wavpack.php b/app/Library/getid3/getid3/module.audio.wavpack.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.audio.wavpack.php
rename to app/Library/getid3/getid3/module.audio.wavpack.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.bmp.php b/app/Library/getid3/getid3/module.graphic.bmp.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.bmp.php
rename to app/Library/getid3/getid3/module.graphic.bmp.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.efax.php b/app/Library/getid3/getid3/module.graphic.efax.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.efax.php
rename to app/Library/getid3/getid3/module.graphic.efax.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.gif.php b/app/Library/getid3/getid3/module.graphic.gif.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.gif.php
rename to app/Library/getid3/getid3/module.graphic.gif.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.jpg.php b/app/Library/getid3/getid3/module.graphic.jpg.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.jpg.php
rename to app/Library/getid3/getid3/module.graphic.jpg.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.pcd.php b/app/Library/getid3/getid3/module.graphic.pcd.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.pcd.php
rename to app/Library/getid3/getid3/module.graphic.pcd.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.png.php b/app/Library/getid3/getid3/module.graphic.png.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.png.php
rename to app/Library/getid3/getid3/module.graphic.png.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.svg.php b/app/Library/getid3/getid3/module.graphic.svg.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.svg.php
rename to app/Library/getid3/getid3/module.graphic.svg.php
diff --git a/app/Library/getid3-new/getid3/module.graphic.tiff.php b/app/Library/getid3/getid3/module.graphic.tiff.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.graphic.tiff.php
rename to app/Library/getid3/getid3/module.graphic.tiff.php
diff --git a/app/Library/getid3-new/getid3/module.misc.cue.php b/app/Library/getid3/getid3/module.misc.cue.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.cue.php
rename to app/Library/getid3/getid3/module.misc.cue.php
diff --git a/app/Library/getid3-new/getid3/module.misc.exe.php b/app/Library/getid3/getid3/module.misc.exe.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.exe.php
rename to app/Library/getid3/getid3/module.misc.exe.php
diff --git a/app/Library/getid3-new/getid3/module.misc.iso.php b/app/Library/getid3/getid3/module.misc.iso.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.iso.php
rename to app/Library/getid3/getid3/module.misc.iso.php
diff --git a/app/Library/getid3-new/getid3/module.misc.msoffice.php b/app/Library/getid3/getid3/module.misc.msoffice.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.msoffice.php
rename to app/Library/getid3/getid3/module.misc.msoffice.php
diff --git a/app/Library/getid3-new/getid3/module.misc.par2.php b/app/Library/getid3/getid3/module.misc.par2.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.par2.php
rename to app/Library/getid3/getid3/module.misc.par2.php
diff --git a/app/Library/getid3-new/getid3/module.misc.pdf.php b/app/Library/getid3/getid3/module.misc.pdf.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.misc.pdf.php
rename to app/Library/getid3/getid3/module.misc.pdf.php
diff --git a/app/Library/getid3-new/getid3/module.tag.apetag.php b/app/Library/getid3/getid3/module.tag.apetag.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.tag.apetag.php
rename to app/Library/getid3/getid3/module.tag.apetag.php
diff --git a/app/Library/getid3-new/getid3/module.tag.id3v1.php b/app/Library/getid3/getid3/module.tag.id3v1.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.tag.id3v1.php
rename to app/Library/getid3/getid3/module.tag.id3v1.php
diff --git a/app/Library/getid3-new/getid3/module.tag.id3v2.php b/app/Library/getid3/getid3/module.tag.id3v2.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.tag.id3v2.php
rename to app/Library/getid3/getid3/module.tag.id3v2.php
diff --git a/app/Library/getid3-new/getid3/module.tag.lyrics3.php b/app/Library/getid3/getid3/module.tag.lyrics3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.tag.lyrics3.php
rename to app/Library/getid3/getid3/module.tag.lyrics3.php
diff --git a/app/Library/getid3-new/getid3/module.tag.xmp.php b/app/Library/getid3/getid3/module.tag.xmp.php
similarity index 100%
rename from app/Library/getid3-new/getid3/module.tag.xmp.php
rename to app/Library/getid3/getid3/module.tag.xmp.php
diff --git a/app/Library/getid3-new/getid3/write.apetag.php b/app/Library/getid3/getid3/write.apetag.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.apetag.php
rename to app/Library/getid3/getid3/write.apetag.php
diff --git a/app/Library/getid3-new/getid3/write.id3v1.php b/app/Library/getid3/getid3/write.id3v1.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.id3v1.php
rename to app/Library/getid3/getid3/write.id3v1.php
diff --git a/app/Library/getid3-new/getid3/write.id3v2.php b/app/Library/getid3/getid3/write.id3v2.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.id3v2.php
rename to app/Library/getid3/getid3/write.id3v2.php
diff --git a/app/Library/getid3-new/getid3/write.lyrics3.php b/app/Library/getid3/getid3/write.lyrics3.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.lyrics3.php
rename to app/Library/getid3/getid3/write.lyrics3.php
diff --git a/app/Library/getid3-new/getid3/write.metaflac.php b/app/Library/getid3/getid3/write.metaflac.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.metaflac.php
rename to app/Library/getid3/getid3/write.metaflac.php
diff --git a/app/Library/getid3-new/getid3/write.php b/app/Library/getid3/getid3/write.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.php
rename to app/Library/getid3/getid3/write.php
diff --git a/app/Library/getid3-new/getid3/write.real.php b/app/Library/getid3/getid3/write.real.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.real.php
rename to app/Library/getid3/getid3/write.real.php
diff --git a/app/Library/getid3-new/getid3/write.vorbiscomment.php b/app/Library/getid3/getid3/write.vorbiscomment.php
similarity index 100%
rename from app/Library/getid3-new/getid3/write.vorbiscomment.php
rename to app/Library/getid3/getid3/write.vorbiscomment.php
diff --git a/app/Library/getid3-new/helperapps/head.exe b/app/Library/getid3/helperapps/head.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/head.exe
rename to app/Library/getid3/helperapps/head.exe
diff --git a/app/Library/getid3-new/helperapps/md5sum.exe b/app/Library/getid3/helperapps/md5sum.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/md5sum.exe
rename to app/Library/getid3/helperapps/md5sum.exe
diff --git a/app/Library/getid3-new/helperapps/metaflac.exe b/app/Library/getid3/helperapps/metaflac.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/metaflac.exe
rename to app/Library/getid3/helperapps/metaflac.exe
diff --git a/app/Library/getid3-new/helperapps/readme.helperapps.txt b/app/Library/getid3/helperapps/readme.helperapps.txt
similarity index 100%
rename from app/Library/getid3-new/helperapps/readme.helperapps.txt
rename to app/Library/getid3/helperapps/readme.helperapps.txt
diff --git a/app/Library/getid3-new/helperapps/shorten.exe b/app/Library/getid3/helperapps/shorten.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/shorten.exe
rename to app/Library/getid3/helperapps/shorten.exe
diff --git a/app/Library/getid3-new/helperapps/tail.exe b/app/Library/getid3/helperapps/tail.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/tail.exe
rename to app/Library/getid3/helperapps/tail.exe
diff --git a/app/Library/getid3-new/helperapps/vorbiscomment.exe b/app/Library/getid3/helperapps/vorbiscomment.exe
similarity index 100%
rename from app/Library/getid3-new/helperapps/vorbiscomment.exe
rename to app/Library/getid3/helperapps/vorbiscomment.exe
diff --git a/app/Library/getid3-new/license.txt b/app/Library/getid3/license.txt
similarity index 100%
rename from app/Library/getid3-new/license.txt
rename to app/Library/getid3/license.txt
diff --git a/app/Library/getid3-new/licenses/licence.gpl-10.txt b/app/Library/getid3/licenses/licence.gpl-10.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/licence.gpl-10.txt
rename to app/Library/getid3/licenses/licence.gpl-10.txt
diff --git a/app/Library/getid3-new/licenses/licence.gpl-20.txt b/app/Library/getid3/licenses/licence.gpl-20.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/licence.gpl-20.txt
rename to app/Library/getid3/licenses/licence.gpl-20.txt
diff --git a/app/Library/getid3-new/licenses/licence.gpl-30.txt b/app/Library/getid3/licenses/licence.gpl-30.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/licence.gpl-30.txt
rename to app/Library/getid3/licenses/licence.gpl-30.txt
diff --git a/app/Library/getid3-new/licenses/licence.lgpl-30.txt b/app/Library/getid3/licenses/licence.lgpl-30.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/licence.lgpl-30.txt
rename to app/Library/getid3/licenses/licence.lgpl-30.txt
diff --git a/app/Library/getid3-new/licenses/licence.mpl-20.txt b/app/Library/getid3/licenses/licence.mpl-20.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/licence.mpl-20.txt
rename to app/Library/getid3/licenses/licence.mpl-20.txt
diff --git a/app/Library/getid3-new/licenses/license.commercial.txt b/app/Library/getid3/licenses/license.commercial.txt
similarity index 100%
rename from app/Library/getid3-new/licenses/license.commercial.txt
rename to app/Library/getid3/licenses/license.commercial.txt
diff --git a/app/Library/getid3-new/readme.txt b/app/Library/getid3/readme.txt
similarity index 100%
rename from app/Library/getid3-new/readme.txt
rename to app/Library/getid3/readme.txt
diff --git a/app/Library/getid3-new/structure.txt b/app/Library/getid3/structure.txt
similarity index 100%
rename from app/Library/getid3-new/structure.txt
rename to app/Library/getid3/structure.txt