diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Adobe Digital Editions Key_Help.htm b/src/DeDRM_Adobe Digital Editions Key_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Adobe Digital Editions Key_Help.htm
rename to src/DeDRM_Adobe Digital Editions Key_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Barnes and Noble Key_Help.htm b/src/DeDRM_Barnes and Noble Key_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Barnes and Noble Key_Help.htm
rename to src/DeDRM_Barnes and Noble Key_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_EInk Kindle Serial Number_Help.htm b/src/DeDRM_EInk Kindle Serial Number_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_EInk Kindle Serial Number_Help.htm
rename to src/DeDRM_EInk Kindle Serial Number_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Help.htm b/src/DeDRM_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Help.htm
rename to src/DeDRM_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Kindle for Android Key_Help.htm b/src/DeDRM_Kindle for Android Key_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Kindle for Android Key_Help.htm
rename to src/DeDRM_Kindle for Android Key_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Kindle for Mac and PC Key_Help.htm b/src/DeDRM_Kindle for Mac and PC Key_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Kindle for Mac and PC Key_Help.htm
rename to src/DeDRM_Kindle for Mac and PC Key_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Mobipocket PID_Help.htm b/src/DeDRM_Mobipocket PID_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_Mobipocket PID_Help.htm
rename to src/DeDRM_Mobipocket PID_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_eReader Key_Help.htm b/src/DeDRM_eReader Key_Help.htm
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/DeDRM_eReader Key_Help.htm
rename to src/DeDRM_eReader Key_Help.htm
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/__init__.py b/src/__init__.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/__init__.py
rename to src/__init__.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/activitybar.py b/src/activitybar.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/activitybar.py
rename to src/activitybar.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/adobekey.py b/src/adobekey.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/adobekey.py
rename to src/adobekey.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/aescbc.py b/src/aescbc.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/aescbc.py
rename to src/aescbc.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto.dll b/src/alfcrypto.dll
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto.dll
rename to src/alfcrypto.dll
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto.py b/src/alfcrypto.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto.py
rename to src/alfcrypto.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto64.dll b/src/alfcrypto64.dll
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto64.dll
rename to src/alfcrypto64.dll
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto_src.zip b/src/alfcrypto_src.zip
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/alfcrypto_src.zip
rename to src/alfcrypto_src.zip
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py b/src/androidkindlekey.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/androidkindlekey.py
rename to src/androidkindlekey.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/argv_utils.py b/src/argv_utils.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/argv_utils.py
rename to src/argv_utils.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/askfolder_ed.py b/src/askfolder_ed.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/askfolder_ed.py
rename to src/askfolder_ed.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/config.py b/src/config.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/config.py
rename to src/config.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/convert2xml.py b/src/convert2xml.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/convert2xml.py
rename to src/convert2xml.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/encodebase64.py b/src/encodebase64.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/encodebase64.py
rename to src/encodebase64.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/epubtest.py b/src/epubtest.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/epubtest.py
rename to src/epubtest.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/erdr2pml.py b/src/erdr2pml.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/erdr2pml.py
rename to src/erdr2pml.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/flatxml2html.py b/src/flatxml2html.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/flatxml2html.py
rename to src/flatxml2html.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/flatxml2svg.py b/src/flatxml2svg.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/flatxml2svg.py
rename to src/flatxml2svg.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/genbook.py b/src/genbook.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/genbook.py
rename to src/genbook.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ignobleepub.py b/src/ignobleepub.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ignobleepub.py
rename to src/ignobleepub.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ignoblekey.py b/src/ignoblekey.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ignoblekey.py
rename to src/ignoblekey.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeyfetch.py b/src/ignoblekeyfetch.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeyfetch.py
rename to src/ignoblekeyfetch.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeygen.py b/src/ignoblekeygen.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ignoblekeygen.py
rename to src/ignoblekeygen.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py b/src/ineptepub.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ineptepub.py
rename to src/ineptepub.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py b/src/ineptpdf.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ineptpdf.py
rename to src/ineptpdf.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/ion.py b/src/ion.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/ion.py
rename to src/ion.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py b/src/k4mobidedrm.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/k4mobidedrm.py
rename to src/k4mobidedrm.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kfxdedrm.py b/src/kfxdedrm.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/kfxdedrm.py
rename to src/kfxdedrm.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py b/src/kgenpids.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/kgenpids.py
rename to src/kgenpids.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py b/src/kindlekey.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/kindlekey.py
rename to src/kindlekey.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/kindlepid.py b/src/kindlepid.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/kindlepid.py
rename to src/kindlepid.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto.dylib b/src/libalfcrypto.dylib
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto.dylib
rename to src/libalfcrypto.dylib
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto32.so b/src/libalfcrypto32.so
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto32.so
rename to src/libalfcrypto32.so
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto64.so b/src/libalfcrypto64.so
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/libalfcrypto64.so
rename to src/libalfcrypto64.so
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/mobidedrm.py b/src/mobidedrm.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/mobidedrm.py
rename to src/mobidedrm.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/openssl_des.py b/src/openssl_des.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/openssl_des.py
rename to src/openssl_des.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/plugin-import-name-dedrm.txt b/src/plugin-import-name-dedrm.txt
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/plugin-import-name-dedrm.txt
rename to src/plugin-import-name-dedrm.txt
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/prefs.py b/src/prefs.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/prefs.py
rename to src/prefs.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/pycrypto_des.py b/src/pycrypto_des.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/pycrypto_des.py
rename to src/pycrypto_des.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/python_des.py b/src/python_des.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/python_des.py
rename to src/python_des.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/scriptinterface.py b/src/scriptinterface.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/scriptinterface.py
rename to src/scriptinterface.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/scrolltextwidget.py b/src/scrolltextwidget.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/scrolltextwidget.py
rename to src/scrolltextwidget.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/simpleprefs.py b/src/simpleprefs.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/simpleprefs.py
rename to src/simpleprefs.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/stylexml2css.py b/src/stylexml2css.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/stylexml2css.py
rename to src/stylexml2css.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/subasyncio.py b/src/subasyncio.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/subasyncio.py
rename to src/subasyncio.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/topazextract.py b/src/topazextract.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/topazextract.py
rename to src/topazextract.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/utilities.py b/src/utilities.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/utilities.py
rename to src/utilities.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/wineutils.py b/src/wineutils.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/wineutils.py
rename to src/wineutils.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/zipfilerugged.py b/src/zipfilerugged.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/zipfilerugged.py
rename to src/zipfilerugged.py
diff --git a/DeDRM_calibre_plugin/DeDRM_plugin/zipfix.py b/src/zipfix.py
similarity index 100%
rename from DeDRM_calibre_plugin/DeDRM_plugin/zipfix.py
rename to src/zipfix.py