diff --git a/Obok_calibre_plugin/obok_plugin.zip b/Obok_calibre_plugin/obok_plugin.zip
deleted file mode 100644
index 0c7e19e..0000000
Binary files a/Obok_calibre_plugin/obok_plugin.zip and /dev/null differ
diff --git a/contrib/macos/DeDRM ReadMe.rtf b/contrib/DeDRM_Macintosh_Application/DeDRM ReadMe.rtf
similarity index 100%
rename from contrib/macos/DeDRM ReadMe.rtf
rename to contrib/DeDRM_Macintosh_Application/DeDRM ReadMe.rtf
diff --git a/contrib/macos/DeDRM.app.txt b/contrib/DeDRM_Macintosh_Application/DeDRM.app.txt
similarity index 100%
rename from contrib/macos/DeDRM.app.txt
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app.txt
diff --git a/contrib/macos/DeDRM.app/Contents/Info.plist b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Info.plist
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Info.plist
diff --git a/contrib/macos/DeDRM.app/Contents/MacOS/droplet b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/MacOS/droplet
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/MacOS/droplet
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/MacOS/droplet
diff --git a/contrib/macos/DeDRM.app/Contents/PkgInfo b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/PkgInfo
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/PkgInfo
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/PkgInfo
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress Source.zip b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress Source.zip
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress Source.zip
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress Source.zip
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Info.plist b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Info.plist
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Info.plist
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Info.plist
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/MacOS/DeDRM Progress b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/MacOS/DeDRM Progress
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/MacOS/DeDRM Progress
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/MacOS/DeDRM Progress
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/PkgInfo b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/PkgInfo
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/PkgInfo
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/PkgInfo
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/DeDRM Progress.icns b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/DeDRM Progress.icns
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/DeDRM Progress.icns
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/DeDRM Progress.icns
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/InfoPlist.strings b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/InfoPlist.strings
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/InfoPlist.strings
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/MainMenu.nib b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/MainMenu.nib
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/MainMenu.nib
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/English.lproj/MainMenu.nib
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/Scripts/Window.scpt b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/Scripts/Window.scpt
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/Scripts/Window.scpt
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM Progress.app/Contents/Resources/Scripts/Window.scpt
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/DeDRM.icns b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM.icns
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/DeDRM.icns
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/DeDRM.icns
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/Scripts/main.scpt b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/Scripts/main.scpt
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/Scripts/main.scpt
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/description.rtfd/TXT.rtf
diff --git a/contrib/macos/DeDRM.app/Contents/Resources/droplet.rsrc b/contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/droplet.rsrc
similarity index 100%
rename from contrib/macos/DeDRM.app/Contents/Resources/droplet.rsrc
rename to contrib/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/droplet.rsrc
diff --git a/contrib/windows/DeDRM_App/DeDRM_Drop_Target.bat b/contrib/DeDRM_Windows_Application/DeDRM_App/DeDRM_Drop_Target.bat
similarity index 100%
rename from contrib/windows/DeDRM_App/DeDRM_Drop_Target.bat
rename to contrib/DeDRM_Windows_Application/DeDRM_App/DeDRM_Drop_Target.bat
diff --git a/contrib/windows/DeDRM_App/DeDRM_lib/DeDRM_App.pyw b/contrib/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
similarity index 100%
rename from contrib/windows/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
rename to contrib/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw
diff --git a/contrib/windows/DeDRM_App_ReadMe.txt b/contrib/DeDRM_Windows_Application/DeDRM_App_ReadMe.txt
similarity index 100%
rename from contrib/windows/DeDRM_App_ReadMe.txt
rename to contrib/DeDRM_Windows_Application/DeDRM_App_ReadMe.txt
diff --git a/contrib/calibre/DeDRM_plugin_ReadMe.txt b/contrib/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt
similarity index 100%
rename from contrib/calibre/DeDRM_plugin_ReadMe.txt
rename to contrib/DeDRM_calibre_plugin/DeDRM_plugin_ReadMe.txt
diff --git a/Obok_calibre_plugin/obok_plugin_ReadMe.txt b/contrib/Obok_calibre_plugin/obok_plugin_ReadMe.txt
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin_ReadMe.txt
rename to contrib/Obok_calibre_plugin/obok_plugin_ReadMe.txt
diff --git a/Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js b/contrib/Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js
similarity index 100%
rename from Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js
rename to contrib/Other_Tools/B_and_N_Download_Helper/BN-Dload.user.js
diff --git a/Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt b/contrib/Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt
similarity index 100%
rename from Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt
rename to contrib/Other_Tools/B_and_N_Download_Helper/BN-Dload.user_ReadMe.txt
diff --git a/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Adobe_Digital_Editions/adobekey.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekey.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeyfetch.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeyfetch.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeyfetch.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeyfetch.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Barnes_and_Noble_ePubs/ignoblekeygen.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_Android/androidkindlekey.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_Mac_and_PC/kindlekey.pyw
diff --git a/Other_Tools/DRM_Key_Scripts/Kindle_for_iOS/kindleiospidgen.pyw b/contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_iOS/kindleiospidgen.pyw
similarity index 100%
rename from Other_Tools/DRM_Key_Scripts/Kindle_for_iOS/kindleiospidgen.pyw
rename to contrib/Other_Tools/DRM_Key_Scripts/Kindle_for_iOS/kindleiospidgen.pyw
diff --git a/Other_Tools/Kindle_for_Android_Patches/A_Patching_Experience.txt b/contrib/Other_Tools/Kindle_for_Android_Patches/A_Patching_Experience.txt
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/A_Patching_Experience.txt
rename to contrib/Other_Tools/Kindle_for_Android_Patches/A_Patching_Experience.txt
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/ReadMe_K4Android.txt b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/ReadMe_K4Android.txt
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/ReadMe_K4Android.txt
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/ReadMe_K4Android.txt
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/kindle3.0.1.70.patch b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/kindle3.0.1.70.patch
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/kindle3.0.1.70.patch
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.0.1.70/kindle3.0.1.70.patch
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/ReadMe_K4Android.txt b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/ReadMe_K4Android.txt
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/ReadMe_K4Android.txt
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/ReadMe_K4Android.txt
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/kindle3.7.0.108.patch b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/kindle3.7.0.108.patch
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/kindle3.7.0.108.patch
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_3.7.0.108/kindle3.7.0.108.patch
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.0.2.1/kindle4.0.2.1.patch b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.0.2.1/kindle4.0.2.1.patch
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_4.0.2.1/kindle4.0.2.1.patch
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.0.2.1/kindle4.0.2.1.patch
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/Notes on the Patch.txt
diff --git a/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch b/contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch
similarity index 100%
rename from Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch
rename to contrib/Other_Tools/Kindle_for_Android_Patches/kindle_version_4.8.1.10/kindle4.8.1.10.patch
diff --git a/Other_Tools/Kobo/obok.py b/contrib/Other_Tools/Kobo/obok.py
old mode 100755
new mode 100644
similarity index 100%
rename from Other_Tools/Kobo/obok.py
rename to contrib/Other_Tools/Kobo/obok.py
diff --git a/Other_Tools/Rocket_ebooks/rebhack.zip b/contrib/Other_Tools/Rocket_ebooks/rebhack.zip
similarity index 100%
rename from Other_Tools/Rocket_ebooks/rebhack.zip
rename to contrib/Other_Tools/Rocket_ebooks/rebhack.zip
diff --git a/Other_Tools/Rocket_ebooks/rebhack_ReadMe.txt b/contrib/Other_Tools/Rocket_ebooks/rebhack_ReadMe.txt
similarity index 100%
rename from Other_Tools/Rocket_ebooks/rebhack_ReadMe.txt
rename to contrib/Other_Tools/Rocket_ebooks/rebhack_ReadMe.txt
diff --git a/Other_Tools/Scuolabook_DRM/Scuolabook_ReadMe.txt b/contrib/Other_Tools/Scuolabook_DRM/Scuolabook_ReadMe.txt
similarity index 100%
rename from Other_Tools/Scuolabook_DRM/Scuolabook_ReadMe.txt
rename to contrib/Other_Tools/Scuolabook_DRM/Scuolabook_ReadMe.txt
diff --git a/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51.pyw b/contrib/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51.pyw
similarity index 100%
rename from Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51.pyw
rename to contrib/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51.pyw
diff --git a/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51_ReadMe.txt b/contrib/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51_ReadMe.txt
similarity index 100%
rename from Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51_ReadMe.txt
rename to contrib/Other_Tools/Tetrachroma_FileOpen_ineptpdf/ineptpdf_8.4.51_ReadMe.txt
diff --git a/ReadMe_First.txt b/contrib/ReadMe_First.txt
similarity index 100%
rename from ReadMe_First.txt
rename to contrib/ReadMe_First.txt
diff --git a/src/DeDRM_Adobe Digital Editions Key_Help.htm b/dedrm_src/DeDRM_Adobe Digital Editions Key_Help.htm
similarity index 100%
rename from src/DeDRM_Adobe Digital Editions Key_Help.htm
rename to dedrm_src/DeDRM_Adobe Digital Editions Key_Help.htm
diff --git a/src/DeDRM_Barnes and Noble Key_Help.htm b/dedrm_src/DeDRM_Barnes and Noble Key_Help.htm
similarity index 100%
rename from src/DeDRM_Barnes and Noble Key_Help.htm
rename to dedrm_src/DeDRM_Barnes and Noble Key_Help.htm
diff --git a/src/DeDRM_EInk Kindle Serial Number_Help.htm b/dedrm_src/DeDRM_EInk Kindle Serial Number_Help.htm
similarity index 100%
rename from src/DeDRM_EInk Kindle Serial Number_Help.htm
rename to dedrm_src/DeDRM_EInk Kindle Serial Number_Help.htm
diff --git a/src/DeDRM_Help.htm b/dedrm_src/DeDRM_Help.htm
similarity index 100%
rename from src/DeDRM_Help.htm
rename to dedrm_src/DeDRM_Help.htm
diff --git a/src/DeDRM_Kindle for Android Key_Help.htm b/dedrm_src/DeDRM_Kindle for Android Key_Help.htm
similarity index 100%
rename from src/DeDRM_Kindle for Android Key_Help.htm
rename to dedrm_src/DeDRM_Kindle for Android Key_Help.htm
diff --git a/src/DeDRM_Kindle for Mac and PC Key_Help.htm b/dedrm_src/DeDRM_Kindle for Mac and PC Key_Help.htm
similarity index 100%
rename from src/DeDRM_Kindle for Mac and PC Key_Help.htm
rename to dedrm_src/DeDRM_Kindle for Mac and PC Key_Help.htm
diff --git a/src/DeDRM_Mobipocket PID_Help.htm b/dedrm_src/DeDRM_Mobipocket PID_Help.htm
similarity index 100%
rename from src/DeDRM_Mobipocket PID_Help.htm
rename to dedrm_src/DeDRM_Mobipocket PID_Help.htm
diff --git a/src/DeDRM_eReader Key_Help.htm b/dedrm_src/DeDRM_eReader Key_Help.htm
similarity index 100%
rename from src/DeDRM_eReader Key_Help.htm
rename to dedrm_src/DeDRM_eReader Key_Help.htm
diff --git a/src/__init__.py b/dedrm_src/__init__.py
similarity index 100%
rename from src/__init__.py
rename to dedrm_src/__init__.py
diff --git a/src/activitybar.py b/dedrm_src/activitybar.py
similarity index 100%
rename from src/activitybar.py
rename to dedrm_src/activitybar.py
diff --git a/src/adobekey.py b/dedrm_src/adobekey.py
similarity index 100%
rename from src/adobekey.py
rename to dedrm_src/adobekey.py
diff --git a/src/aescbc.py b/dedrm_src/aescbc.py
similarity index 100%
rename from src/aescbc.py
rename to dedrm_src/aescbc.py
diff --git a/src/alfcrypto.dll b/dedrm_src/alfcrypto.dll
similarity index 100%
rename from src/alfcrypto.dll
rename to dedrm_src/alfcrypto.dll
diff --git a/src/alfcrypto.py b/dedrm_src/alfcrypto.py
similarity index 100%
rename from src/alfcrypto.py
rename to dedrm_src/alfcrypto.py
diff --git a/src/alfcrypto64.dll b/dedrm_src/alfcrypto64.dll
similarity index 100%
rename from src/alfcrypto64.dll
rename to dedrm_src/alfcrypto64.dll
diff --git a/src/alfcrypto_src.zip b/dedrm_src/alfcrypto_src.zip
similarity index 100%
rename from src/alfcrypto_src.zip
rename to dedrm_src/alfcrypto_src.zip
diff --git a/src/androidkindlekey.py b/dedrm_src/androidkindlekey.py
similarity index 100%
rename from src/androidkindlekey.py
rename to dedrm_src/androidkindlekey.py
diff --git a/src/argv_utils.py b/dedrm_src/argv_utils.py
similarity index 100%
rename from src/argv_utils.py
rename to dedrm_src/argv_utils.py
diff --git a/src/askfolder_ed.py b/dedrm_src/askfolder_ed.py
similarity index 100%
rename from src/askfolder_ed.py
rename to dedrm_src/askfolder_ed.py
diff --git a/src/config.py b/dedrm_src/config.py
similarity index 100%
rename from src/config.py
rename to dedrm_src/config.py
diff --git a/src/convert2xml.py b/dedrm_src/convert2xml.py
similarity index 100%
rename from src/convert2xml.py
rename to dedrm_src/convert2xml.py
diff --git a/src/encodebase64.py b/dedrm_src/encodebase64.py
similarity index 100%
rename from src/encodebase64.py
rename to dedrm_src/encodebase64.py
diff --git a/src/epubtest.py b/dedrm_src/epubtest.py
similarity index 100%
rename from src/epubtest.py
rename to dedrm_src/epubtest.py
diff --git a/src/erdr2pml.py b/dedrm_src/erdr2pml.py
similarity index 100%
rename from src/erdr2pml.py
rename to dedrm_src/erdr2pml.py
diff --git a/src/flatxml2html.py b/dedrm_src/flatxml2html.py
similarity index 100%
rename from src/flatxml2html.py
rename to dedrm_src/flatxml2html.py
diff --git a/src/flatxml2svg.py b/dedrm_src/flatxml2svg.py
similarity index 100%
rename from src/flatxml2svg.py
rename to dedrm_src/flatxml2svg.py
diff --git a/src/genbook.py b/dedrm_src/genbook.py
similarity index 100%
rename from src/genbook.py
rename to dedrm_src/genbook.py
diff --git a/src/ignobleepub.py b/dedrm_src/ignobleepub.py
similarity index 100%
rename from src/ignobleepub.py
rename to dedrm_src/ignobleepub.py
diff --git a/src/ignoblekey.py b/dedrm_src/ignoblekey.py
similarity index 100%
rename from src/ignoblekey.py
rename to dedrm_src/ignoblekey.py
diff --git a/src/ignoblekeyfetch.py b/dedrm_src/ignoblekeyfetch.py
similarity index 100%
rename from src/ignoblekeyfetch.py
rename to dedrm_src/ignoblekeyfetch.py
diff --git a/src/ignoblekeygen.py b/dedrm_src/ignoblekeygen.py
similarity index 100%
rename from src/ignoblekeygen.py
rename to dedrm_src/ignoblekeygen.py
diff --git a/src/ineptepub.py b/dedrm_src/ineptepub.py
similarity index 100%
rename from src/ineptepub.py
rename to dedrm_src/ineptepub.py
diff --git a/src/ineptpdf.py b/dedrm_src/ineptpdf.py
similarity index 100%
rename from src/ineptpdf.py
rename to dedrm_src/ineptpdf.py
diff --git a/src/ion.py b/dedrm_src/ion.py
similarity index 100%
rename from src/ion.py
rename to dedrm_src/ion.py
diff --git a/src/k4mobidedrm.py b/dedrm_src/k4mobidedrm.py
similarity index 100%
rename from src/k4mobidedrm.py
rename to dedrm_src/k4mobidedrm.py
diff --git a/src/kfxdedrm.py b/dedrm_src/kfxdedrm.py
similarity index 100%
rename from src/kfxdedrm.py
rename to dedrm_src/kfxdedrm.py
diff --git a/src/kgenpids.py b/dedrm_src/kgenpids.py
similarity index 100%
rename from src/kgenpids.py
rename to dedrm_src/kgenpids.py
diff --git a/src/kindlekey.py b/dedrm_src/kindlekey.py
similarity index 100%
rename from src/kindlekey.py
rename to dedrm_src/kindlekey.py
diff --git a/src/kindlepid.py b/dedrm_src/kindlepid.py
similarity index 100%
rename from src/kindlepid.py
rename to dedrm_src/kindlepid.py
diff --git a/src/libalfcrypto.dylib b/dedrm_src/libalfcrypto.dylib
similarity index 100%
rename from src/libalfcrypto.dylib
rename to dedrm_src/libalfcrypto.dylib
diff --git a/src/libalfcrypto32.so b/dedrm_src/libalfcrypto32.so
similarity index 100%
rename from src/libalfcrypto32.so
rename to dedrm_src/libalfcrypto32.so
diff --git a/src/libalfcrypto64.so b/dedrm_src/libalfcrypto64.so
similarity index 100%
rename from src/libalfcrypto64.so
rename to dedrm_src/libalfcrypto64.so
diff --git a/src/mobidedrm.py b/dedrm_src/mobidedrm.py
similarity index 100%
rename from src/mobidedrm.py
rename to dedrm_src/mobidedrm.py
diff --git a/src/openssl_des.py b/dedrm_src/openssl_des.py
similarity index 100%
rename from src/openssl_des.py
rename to dedrm_src/openssl_des.py
diff --git a/src/plugin-import-name-dedrm.txt b/dedrm_src/plugin-import-name-dedrm.txt
similarity index 100%
rename from src/plugin-import-name-dedrm.txt
rename to dedrm_src/plugin-import-name-dedrm.txt
diff --git a/src/prefs.py b/dedrm_src/prefs.py
similarity index 100%
rename from src/prefs.py
rename to dedrm_src/prefs.py
diff --git a/src/pycrypto_des.py b/dedrm_src/pycrypto_des.py
similarity index 100%
rename from src/pycrypto_des.py
rename to dedrm_src/pycrypto_des.py
diff --git a/src/python_des.py b/dedrm_src/python_des.py
similarity index 100%
rename from src/python_des.py
rename to dedrm_src/python_des.py
diff --git a/src/scriptinterface.py b/dedrm_src/scriptinterface.py
similarity index 100%
rename from src/scriptinterface.py
rename to dedrm_src/scriptinterface.py
diff --git a/src/scrolltextwidget.py b/dedrm_src/scrolltextwidget.py
similarity index 100%
rename from src/scrolltextwidget.py
rename to dedrm_src/scrolltextwidget.py
diff --git a/src/simpleprefs.py b/dedrm_src/simpleprefs.py
similarity index 100%
rename from src/simpleprefs.py
rename to dedrm_src/simpleprefs.py
diff --git a/src/stylexml2css.py b/dedrm_src/stylexml2css.py
similarity index 100%
rename from src/stylexml2css.py
rename to dedrm_src/stylexml2css.py
diff --git a/src/subasyncio.py b/dedrm_src/subasyncio.py
similarity index 100%
rename from src/subasyncio.py
rename to dedrm_src/subasyncio.py
diff --git a/src/topazextract.py b/dedrm_src/topazextract.py
similarity index 100%
rename from src/topazextract.py
rename to dedrm_src/topazextract.py
diff --git a/src/utilities.py b/dedrm_src/utilities.py
similarity index 100%
rename from src/utilities.py
rename to dedrm_src/utilities.py
diff --git a/src/wineutils.py b/dedrm_src/wineutils.py
similarity index 100%
rename from src/wineutils.py
rename to dedrm_src/wineutils.py
diff --git a/src/zipfilerugged.py b/dedrm_src/zipfilerugged.py
similarity index 100%
rename from src/zipfilerugged.py
rename to dedrm_src/zipfilerugged.py
diff --git a/src/zipfix.py b/dedrm_src/zipfix.py
similarity index 100%
rename from src/zipfix.py
rename to dedrm_src/zipfix.py
diff --git a/Obok_calibre_plugin/obok_plugin/__init__.py b/obok_src/__init__.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/__init__.py
rename to obok_src/__init__.py
diff --git a/Obok_calibre_plugin/obok_plugin/action.py b/obok_src/action.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/action.py
rename to obok_src/action.py
diff --git a/Obok_calibre_plugin/obok_plugin/common_utils.py b/obok_src/common_utils.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/common_utils.py
rename to obok_src/common_utils.py
diff --git a/Obok_calibre_plugin/obok_plugin/config.py b/obok_src/config.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/config.py
rename to obok_src/config.py
diff --git a/Obok_calibre_plugin/obok_plugin/dialogs.py b/obok_src/dialogs.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/dialogs.py
rename to obok_src/dialogs.py
diff --git a/Obok_calibre_plugin/obok_plugin/images/obok.png b/obok_src/images/obok.png
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/images/obok.png
rename to obok_src/images/obok.png
diff --git a/Obok_calibre_plugin/obok_plugin/obok/__init__.py b/obok_src/obok/__init__.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/obok/__init__.py
rename to obok_src/obok/__init__.py
diff --git a/Obok_calibre_plugin/obok_plugin/obok/legacy_obok.py b/obok_src/obok/legacy_obok.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/obok/legacy_obok.py
rename to obok_src/obok/legacy_obok.py
diff --git a/Obok_calibre_plugin/obok_plugin/obok/obok.py b/obok_src/obok/obok.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/obok/obok.py
rename to obok_src/obok/obok.py
diff --git a/Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm b/obok_src/obok_dedrm_Help.htm
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/obok_dedrm_Help.htm
rename to obok_src/obok_dedrm_Help.htm
diff --git a/Obok_calibre_plugin/obok_plugin/plugin-import-name-obok_dedrm.txt b/obok_src/plugin-import-name-obok_dedrm.txt
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/plugin-import-name-obok_dedrm.txt
rename to obok_src/plugin-import-name-obok_dedrm.txt
diff --git a/Obok_calibre_plugin/obok_plugin/translations/ar.mo b/obok_src/translations/ar.mo
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/ar.mo
rename to obok_src/translations/ar.mo
diff --git a/Obok_calibre_plugin/obok_plugin/translations/ar.po b/obok_src/translations/ar.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/ar.po
rename to obok_src/translations/ar.po
diff --git a/Obok_calibre_plugin/obok_plugin/translations/de.mo b/obok_src/translations/de.mo
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/de.mo
rename to obok_src/translations/de.mo
diff --git a/Obok_calibre_plugin/obok_plugin/translations/de.po b/obok_src/translations/de.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/de.po
rename to obok_src/translations/de.po
diff --git a/Obok_calibre_plugin/obok_plugin/translations/default.po b/obok_src/translations/default.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/default.po
rename to obok_src/translations/default.po
diff --git a/Obok_calibre_plugin/obok_plugin/translations/es.mo b/obok_src/translations/es.mo
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/es.mo
rename to obok_src/translations/es.mo
diff --git a/Obok_calibre_plugin/obok_plugin/translations/es.po b/obok_src/translations/es.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/es.po
rename to obok_src/translations/es.po
diff --git a/Obok_calibre_plugin/obok_plugin/translations/nl.mo b/obok_src/translations/nl.mo
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/nl.mo
rename to obok_src/translations/nl.mo
diff --git a/Obok_calibre_plugin/obok_plugin/translations/nl.po b/obok_src/translations/nl.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/nl.po
rename to obok_src/translations/nl.po
diff --git a/Obok_calibre_plugin/obok_plugin/translations/pt.mo b/obok_src/translations/pt.mo
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/pt.mo
rename to obok_src/translations/pt.mo
diff --git a/Obok_calibre_plugin/obok_plugin/translations/pt.po b/obok_src/translations/pt.po
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/translations/pt.po
rename to obok_src/translations/pt.po
diff --git a/Obok_calibre_plugin/obok_plugin/utilities.py b/obok_src/utilities.py
similarity index 100%
rename from Obok_calibre_plugin/obok_plugin/utilities.py
rename to obok_src/utilities.py