diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_Drop_Target.bat b/DeDRM_Windows_Application/DeDRM_App/DeDRM_Drop_Target.bat
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_Drop_Target.bat
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_Drop_Target.bat
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/DeDRM_app.pyw b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/DeDRM_app.pyw
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_app.pyw
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/activitybar.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/activitybar.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/activitybar.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/activitybar.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/aescbc.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/aescbc.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/aescbc.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/aescbc.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.dll b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.dll
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.dll
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.dll
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.exp b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.exp
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.exp
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.exp
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto64.dll b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto64.dll
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto64.dll
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto64.dll
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto_src.zip b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto_src.zip
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/alfcrypto_src.zip
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/alfcrypto_src.zip
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/cmbtc_v2.2.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/cmbtc_v2.2.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/cmbtc_v2.2.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/cmbtc_v2.2.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/config.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/config.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/config.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/config.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/convert2xml.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/convert2xml.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptepub.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptepub.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptepub.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptepub.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptpdb.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptpdb.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptpdb.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptpdb.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptpdf.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptpdf.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/decryptpdf.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/decryptpdf.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/erdr2pml.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/erdr2pml.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/erdr2pml.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/erdr2pml.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/flatxml2html.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/flatxml2html.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/flatxml2html.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/flatxml2html.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/flatxml2svg.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/flatxml2svg.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/flatxml2svg.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/flatxml2svg.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/genbook.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/genbook.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/genbook.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/getk4pcpids.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/getk4pcpids.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/getk4pcpids.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/getk4pcpids.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ignobleepub.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignobleepub.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ignobleepub.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignobleepub.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ignoblekeygen.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignoblekeygen.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ignoblekeygen.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ignoblekeygen.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptepub.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptepub.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptepub.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptkey.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptkey.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptkey.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptkey.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptpdf.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/ineptpdf.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/ineptpdf.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mobidedrm.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mutils.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mutils.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mutils.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4mutils.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4pcutils.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4pcutils.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4pcutils.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/k4pcutils.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/kgenpids.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kgenpids.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/kgenpids.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/kgenpids.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/mobidedrm.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/mobidedrm.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/mobidedrm.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/mobidedrm.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/openssl_des.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/openssl_des.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/openssl_des.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/openssl_des.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/pbkdf2.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/pbkdf2.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/pbkdf2.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/pbkdf2.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/pycrypto_des.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/pycrypto_des.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/pycrypto_des.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/pycrypto_des.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/python_des.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/python_des.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/python_des.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/python_des.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/scrolltextwidget.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/scrolltextwidget.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/scrolltextwidget.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/scrolltextwidget.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/simpleprefs.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/simpleprefs.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/simpleprefs.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/simpleprefs.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/stylexml2css.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/stylexml2css.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/stylexml2css.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/stylexml2css.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/subasyncio.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/subasyncio.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/subasyncio.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/subasyncio.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/topazextract.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/topazextract.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/topazextract.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/topazextract.py
diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/zipfix.py b/DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/zipfix.py
similarity index 100%
rename from DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/zipfix.py
rename to DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/zipfix.py