diff --git a/de4dot.code/de4dot.code.csproj b/de4dot.code/de4dot.code.csproj
index cd366ade..074c942d 100644
--- a/de4dot.code/de4dot.code.csproj
+++ b/de4dot.code/de4dot.code.csproj
@@ -53,6 +53,7 @@
     <Compile Include="AssemblyClient\NewAppDomainAssemblyServerLoader.cs" />
     <Compile Include="AssemblyClient\NewProcessAssemblyServerLoader.cs" />
     <Compile Include="AssemblyClient\SameAppDomainAssemblyServerLoader.cs" />
+    <Compile Include="AssemblyModule.cs" />
     <Compile Include="AssemblyResolver.cs" />
     <Compile Include="DeobfuscatorContext.cs" />
     <Compile Include="deobfuscators\ArrayFinder.cs" />
@@ -67,22 +68,6 @@
     <Compile Include="deobfuscators\Babel_NET\MemberReferenceConverter.cs" />
     <Compile Include="deobfuscators\Babel_NET\MethodBodyReader.cs" />
     <Compile Include="deobfuscators\Babel_NET\MethodReferenceReader.cs" />
-    <Compile Include="deobfuscators\CryptoObfuscator\CoUtils.cs" />
-    <Compile Include="deobfuscators\CryptoObfuscator\MethodBodyReader.cs" />
-    <Compile Include="deobfuscators\CryptoObfuscator\MethodsDecrypter.cs" />
-    <Compile Include="deobfuscators\dotNET_Reactor\v4\ProxyCallFixer.cs" />
-    <Compile Include="deobfuscators\ILProtector\MethodReader.cs" />
-    <Compile Include="deobfuscators\ILProtector\MethodsDecrypter.cs" />
-    <Compile Include="deobfuscators\DeepSea\ArrayBlockState.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\CryptDecrypter.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\Decrypter6.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\DecrypterInfo.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\EncryptionInfos.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\McKey.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\PeHeader.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\CryptoObfuscator\ConstantsDecrypter.cs" />
-    <Compile Include="deobfuscators\MethodBodyReaderBase.cs" />
     <Compile Include="deobfuscators\Babel_NET\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\Babel_NET\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\Babel_NET\ResourceDecrypter.cs" />
@@ -108,68 +93,77 @@
     <Compile Include="deobfuscators\CliSecure\vm\UnknownHandlerInfo.cs" />
     <Compile Include="deobfuscators\CliSecure\vm\VmOpCodeHandlerDetector.cs" />
     <Compile Include="deobfuscators\CliSecure\vm\VmOperands.cs" />
-    <Compile Include="deobfuscators\CodeFort\PasswordFinder.cs" />
     <Compile Include="deobfuscators\CodeFort\AssemblyData.cs" />
     <Compile Include="deobfuscators\CodeFort\AssemblyDecrypter.cs" />
     <Compile Include="deobfuscators\CodeFort\CfMethodCallInliner.cs" />
     <Compile Include="deobfuscators\CodeFort\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\CodeFort\PasswordFinder.cs" />
     <Compile Include="deobfuscators\CodeFort\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\CodeFort\StringDecrypter.cs" />
     <Compile Include="deobfuscators\CodeVeil\AssemblyResolver.cs" />
+    <Compile Include="deobfuscators\CodeVeil\Deobfuscator.cs" />
     <Compile Include="deobfuscators\CodeVeil\ErexResourceReader.cs" />
     <Compile Include="deobfuscators\CodeVeil\InvalidDataException.cs" />
     <Compile Include="deobfuscators\CodeVeil\InvalidMethodsFinder.cs" />
     <Compile Include="deobfuscators\CodeVeil\MainType.cs" />
     <Compile Include="deobfuscators\CodeVeil\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\CodeVeil\ObfuscatorVersion.cs" />
+    <Compile Include="deobfuscators\CodeVeil\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\CodeVeil\ResourceConverter.cs" />
     <Compile Include="deobfuscators\CodeVeil\ResourceDecrypter.cs" />
     <Compile Include="deobfuscators\CodeVeil\ResourceInfo.cs" />
     <Compile Include="deobfuscators\CodeVeil\ResourceReader.cs" />
     <Compile Include="deobfuscators\CodeVeil\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\CodeVeil\Deobfuscator.cs" />
-    <Compile Include="deobfuscators\CodeVeil\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\CodeVeil\TamperDetection.cs" />
     <Compile Include="deobfuscators\CodeWall\AssemblyDecrypter.cs" />
     <Compile Include="deobfuscators\CodeWall\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\CodeWall\KeyGenerator.cs" />
     <Compile Include="deobfuscators\CodeWall\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\CodeWall\randomc\CRandomMersenne.cs" />
     <Compile Include="deobfuscators\CodeWall\randomc\CRandomMother.cs" />
-    <Compile Include="deobfuscators\CodeWall\KeyGenerator.cs" />
     <Compile Include="deobfuscators\CodeWall\StringDecrypter.cs" />
     <Compile Include="deobfuscators\ConstantsReader.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\AntiDebugger.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\AssemblyResolver.cs" />
+    <Compile Include="deobfuscators\CryptoObfuscator\ConstantsDecrypter.cs" />
+    <Compile Include="deobfuscators\CryptoObfuscator\CoUtils.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\CryptoObfuscator\MethodBodyReader.cs" />
+    <Compile Include="deobfuscators\CryptoObfuscator\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\ResourceDecrypter.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\ResourceResolver.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\StringDecrypter.cs" />
     <Compile Include="deobfuscators\CryptoObfuscator\TamperDetection.cs" />
     <Compile Include="deobfuscators\DeepSea\ArrayBlockDeobfuscator.cs" />
+    <Compile Include="deobfuscators\DeepSea\ArrayBlockState.cs" />
+    <Compile Include="deobfuscators\DeepSea\AssemblyResolver.cs" />
     <Compile Include="deobfuscators\DeepSea\CastDeobfuscator.cs" />
+    <Compile Include="deobfuscators\DeepSea\Deobfuscator.cs" />
     <Compile Include="deobfuscators\DeepSea\DsConstantsReader.cs" />
+    <Compile Include="deobfuscators\DeepSea\DsInlinedMethodsFinder.cs" />
+    <Compile Include="deobfuscators\DeepSea\DsMethodCallInliner.cs" />
     <Compile Include="deobfuscators\DeepSea\DsUtils.cs" />
     <Compile Include="deobfuscators\DeepSea\FieldsRestorer.cs" />
-    <Compile Include="deobfuscators\DeobfuscatorBase.cs" />
-    <Compile Include="deobfuscators\DeobfuscatorInfoBase.cs" />
-    <Compile Include="deobfuscators\DeobUtils.cs" />
-    <Compile Include="deobfuscators\DeepSea\AssemblyResolver.cs" />
-    <Compile Include="deobfuscators\DeepSea\DsInlinedMethodsFinder.cs" />
     <Compile Include="deobfuscators\DeepSea\ResolverBase.cs" />
     <Compile Include="deobfuscators\DeepSea\ResourceResolver.cs" />
     <Compile Include="deobfuscators\DeepSea\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\DeepSea\Deobfuscator.cs" />
-    <Compile Include="deobfuscators\DeepSea\DsMethodCallInliner.cs" />
+    <Compile Include="deobfuscators\DeobfuscatorBase.cs" />
+    <Compile Include="deobfuscators\DeobfuscatorInfoBase.cs" />
+    <Compile Include="deobfuscators\DeobUtils.cs" />
     <Compile Include="deobfuscators\Dotfuscator\Deobfuscator.cs" />
     <Compile Include="deobfuscators\Dotfuscator\StringDecrypter.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\AntiStrongName.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeDecrypter.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\ApplicationModeUnpacker.cs" />
+    <Compile Include="deobfuscators\dotNET_Reactor\v3\AssemblyResolver.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\DecrypterType.cs" />
+    <Compile Include="deobfuscators\dotNET_Reactor\v3\DecryptMethod.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\Deobfuscator.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\LibAssemblyResolver.cs" />
+    <Compile Include="deobfuscators\dotNET_Reactor\v3\MemoryPatcher.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v3\NativeLibSaver.cs" />
+    <Compile Include="deobfuscators\dotNET_Reactor\v4\AntiStrongName.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\AssemblyResolver.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\BooleanDecrypter.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\Deobfuscator.cs" />
@@ -179,26 +173,20 @@
     <Compile Include="deobfuscators\dotNET_Reactor\v4\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\NativeFileDecrypter.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\NativeImageUnpacker.cs" />
+    <Compile Include="deobfuscators\dotNET_Reactor\v4\ProxyCallFixer.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\ResourceResolver.cs" />
     <Compile Include="deobfuscators\dotNET_Reactor\v4\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\dotNET_Reactor\v4\AntiStrongName.cs" />
-    <Compile Include="deobfuscators\dotNET_Reactor\v3\AssemblyResolver.cs" />
-    <Compile Include="deobfuscators\dotNET_Reactor\v3\DecryptMethod.cs" />
-    <Compile Include="deobfuscators\dotNET_Reactor\v3\MemoryPatcher.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\AssemblyResolver.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\CodeCompilerMethodCallRestorer.cs" />
-    <Compile Include="deobfuscators\Eazfuscator_NET\EfConstantsReader.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\DecrypterType.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\Eazfuscator_NET\EfConstantsReader.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\EfUtils.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\ResourceMethodsRestorer.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\ResourceResolver.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\StringDecrypter.cs" />
     <Compile Include="deobfuscators\Eazfuscator_NET\VersionDetector.cs" />
     <Compile Include="deobfuscators\ExceptionLoggerRemover.cs" />
-    <Compile Include="deobfuscators\ILProtector\Deobfuscator.cs" />
-    <Compile Include="deobfuscators\ILProtector\MainType.cs" />
-    <Compile Include="deobfuscators\MethodCallRestorerBase.cs" />
     <Compile Include="deobfuscators\Goliath_NET\ArrayDecrypter.cs" />
     <Compile Include="deobfuscators\Goliath_NET\ArrayValueInliner.cs" />
     <Compile Include="deobfuscators\Goliath_NET\DecrypterBase.cs" />
@@ -212,19 +200,34 @@
     <Compile Include="deobfuscators\IDeobfuscatedFile.cs" />
     <Compile Include="deobfuscators\IDeobfuscator.cs" />
     <Compile Include="deobfuscators\IDeobfuscatorInfo.cs" />
+    <Compile Include="deobfuscators\ILProtector\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\ILProtector\MainType.cs" />
+    <Compile Include="deobfuscators\ILProtector\MethodReader.cs" />
+    <Compile Include="deobfuscators\ILProtector\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\InitializedDataCreator.cs" />
     <Compile Include="deobfuscators\InlinedMethodsFinder.cs" />
     <Compile Include="deobfuscators\ISimpleDeobfuscator.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\CryptDecrypter.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\Decrypter6.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\DecrypterInfo.cs" />
     <Compile Include="deobfuscators\MaxtoCode\Deobfuscator.cs" />
-    <Compile Include="deobfuscators\MaxtoCode\MethodsDecrypter.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\EncryptionInfos.cs" />
     <Compile Include="deobfuscators\MaxtoCode\MainType.cs" />
-    <Compile Include="deobfuscators\MethodBodyParser.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\McKey.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\MethodsDecrypter.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\PeHeader.cs" />
+    <Compile Include="deobfuscators\MaxtoCode\StringDecrypter.cs" />
     <Compile Include="deobfuscators\MemberReferenceBuilder.cs" />
+    <Compile Include="deobfuscators\MethodBodyParser.cs" />
+    <Compile Include="deobfuscators\MethodBodyReaderBase.cs" />
+    <Compile Include="deobfuscators\MethodCallRestorerBase.cs" />
     <Compile Include="deobfuscators\MethodCollection.cs" />
     <Compile Include="deobfuscators\MethodsDecrypter.cs" />
     <Compile Include="deobfuscators\MethodStack.cs" />
     <Compile Include="deobfuscators\MPRESS\Deobfuscator.cs" />
     <Compile Include="deobfuscators\MPRESS\Lzmat.cs" />
+    <Compile Include="deobfuscators\Operations.cs" />
+    <Compile Include="deobfuscators\ProxyCallFixerBase.cs" />
     <Compile Include="deobfuscators\QuickLZ.cs" />
     <Compile Include="deobfuscators\RandomNameChecker.cs" />
     <Compile Include="deobfuscators\Rummage\Deobfuscator.cs" />
@@ -232,14 +235,6 @@
     <Compile Include="deobfuscators\Skater_NET\Deobfuscator.cs" />
     <Compile Include="deobfuscators\Skater_NET\EnumClassFinder.cs" />
     <Compile Include="deobfuscators\Skater_NET\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\Spices_Net\Deobfuscator.cs" />
-    <Compile Include="deobfuscators\Spices_Net\QclzDecompressor.cs" />
-    <Compile Include="deobfuscators\Spices_Net\ResourceNamesRestorer.cs" />
-    <Compile Include="deobfuscators\Spices_Net\SpicesMethodCallInliner.cs" />
-    <Compile Include="deobfuscators\Spices_Net\StringDecrypter.cs" />
-    <Compile Include="deobfuscators\StringCounts.cs" />
-    <Compile Include="deobfuscators\Operations.cs" />
-    <Compile Include="deobfuscators\ProxyCallFixerBase.cs" />
     <Compile Include="deobfuscators\SmartAssembly\AssemblyResolver.cs" />
     <Compile Include="deobfuscators\SmartAssembly\AssemblyResolverInfo.cs" />
     <Compile Include="deobfuscators\SmartAssembly\AutomatedErrorReportingFinder.cs" />
@@ -256,6 +251,12 @@
     <Compile Include="deobfuscators\SmartAssembly\StringDecrypterInfo.cs" />
     <Compile Include="deobfuscators\SmartAssembly\StringEncoderClassFinder.cs" />
     <Compile Include="deobfuscators\SmartAssembly\TamperProtectionRemover.cs" />
+    <Compile Include="deobfuscators\Spices_Net\Deobfuscator.cs" />
+    <Compile Include="deobfuscators\Spices_Net\QclzDecompressor.cs" />
+    <Compile Include="deobfuscators\Spices_Net\ResourceNamesRestorer.cs" />
+    <Compile Include="deobfuscators\Spices_Net\SpicesMethodCallInliner.cs" />
+    <Compile Include="deobfuscators\Spices_Net\StringDecrypter.cs" />
+    <Compile Include="deobfuscators\StringCounts.cs" />
     <Compile Include="deobfuscators\TypesRestorer.cs" />
     <Compile Include="deobfuscators\Unknown\Deobfuscator.cs" />
     <Compile Include="deobfuscators\UnpackedFile.cs" />
@@ -263,10 +264,10 @@
     <Compile Include="deobfuscators\ValueInlinerBase.cs" />
     <Compile Include="deobfuscators\Xenocode\Deobfuscator.cs" />
     <Compile Include="deobfuscators\Xenocode\StringDecrypter.cs" />
+    <Compile Include="ExternalAssemblies.cs" />
     <Compile Include="IDeobfuscatorContext.cs" />
     <Compile Include="IObfuscatedFile.cs" />
     <Compile Include="Log.cs" />
-    <Compile Include="AssemblyModule.cs" />
     <Compile Include="MethodPrinter.cs" />
     <Compile Include="MethodReturnValueInliner.cs" />
     <Compile Include="NameRegexes.cs" />
@@ -274,7 +275,6 @@
     <Compile Include="Option.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="renamer\asmmodules\EventDef.cs" />
-    <Compile Include="ExternalAssemblies.cs" />
     <Compile Include="renamer\asmmodules\FieldDef.cs" />
     <Compile Include="renamer\asmmodules\GenericParamDef.cs" />
     <Compile Include="renamer\asmmodules\IResolver.cs" />
@@ -302,11 +302,11 @@
     <Compile Include="renamer\VariableNameState.cs" />
     <Compile Include="resources\BuiltInResourceData.cs" />
     <Compile Include="resources\IResourceData.cs" />
+    <Compile Include="resources\ResourceDataCreator.cs" />
     <Compile Include="resources\ResourceElement.cs" />
     <Compile Include="resources\ResourceElementSet.cs" />
     <Compile Include="resources\ResourceReader.cs" />
     <Compile Include="resources\ResourceTypeCode.cs" />
-    <Compile Include="resources\ResourceDataCreator.cs" />
     <Compile Include="resources\ResourceWriter.cs" />
     <Compile Include="resources\UserResourceData.cs" />
     <Compile Include="resources\UserResourceType.cs" />