diff --git a/tools/itssecurity/.vs/itssecurity/v16/.suo b/tools/itssecurity/.vs/itssecurity/v16/.suo
index a3057c330d559ebc2fc6e80ba567231e96d70b1b..5c6dbe7350426a2bc4da9b8b0dc157b4b416c02d 100644
Binary files a/tools/itssecurity/.vs/itssecurity/v16/.suo and b/tools/itssecurity/.vs/itssecurity/v16/.suo differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/Browse.VC.db b/tools/itssecurity/.vs/itssecurity/v16/Browse.VC.db
index fbc8fde843d19d8fa896430dfab668c1d9e78ca2..74f43caea75b5740601309713ea7e9630adce857 100644
Binary files a/tools/itssecurity/.vs/itssecurity/v16/Browse.VC.db and b/tools/itssecurity/.vs/itssecurity/v16/Browse.VC.db differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/1ee3db2fc2bf098/COM_SPIRENT_ITS_SECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/1ee3db2fc2bf098/COM_SPIRENT_ITS_SECURITY.ipch
deleted file mode 100644
index 86ab7044261ead52564c1f44b325a4efcd21bb5b..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/1ee3db2fc2bf098/COM_SPIRENT_ITS_SECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/3946801aa34e60d3/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/3946801aa34e60d3/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch
deleted file mode 100644
index 2d5aafaa3872d9465bb22153d4b2174d5150e629..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/3946801aa34e60d3/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/403d4330dabcb9cb/COM_SPIRENT_ITS_SECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/403d4330dabcb9cb/COM_SPIRENT_ITS_SECURITY.ipch
deleted file mode 100644
index 40645b8c3c294b3f9be72377ad2b8c6b48ab2cb7..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/403d4330dabcb9cb/COM_SPIRENT_ITS_SECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/5f9167d1ee025d78/COM_SPIRENT_ITS_SECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/5f9167d1ee025d78/COM_SPIRENT_ITS_SECURITY.ipch
deleted file mode 100644
index f29fb7376c8d53bf49078f246b141b62c3bc5c3f..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/5f9167d1ee025d78/COM_SPIRENT_ITS_SECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/bbf5104d398540e0/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/bbf5104d398540e0/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch
deleted file mode 100644
index 3e930ef9c79ae9542f51e89da781ab5749b274aa..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/bbf5104d398540e0/COM_SPIRENT_ITS_SECURITY_NATIVESECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/fa071e5da418d69b/COM_SPIRENT_ITS_SECURITY.ipch b/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/fa071e5da418d69b/COM_SPIRENT_ITS_SECURITY.ipch
deleted file mode 100644
index 504e35c4d72bee58e5ac46dd26cebceecea9dc49..0000000000000000000000000000000000000000
Binary files a/tools/itssecurity/.vs/itssecurity/v16/ipch/AutoPCH/fa071e5da418d69b/COM_SPIRENT_ITS_SECURITY.ipch and /dev/null differ
diff --git a/tools/itssecurity/itssecurity.sln b/tools/itssecurity/itssecurity.sln
index 973e97725c3fa1e4ea0af5d96988e061b9a69a16..c01f3b545a1e17124e9727bfff0d2b340db0ab8d 100644
--- a/tools/itssecurity/itssecurity.sln
+++ b/tools/itssecurity/itssecurity.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_its_security", "lib_its
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_its_security_tests_unit", "test\lib_its_security_tests_unit.vcxproj", "{5151573E-B7B3-44B4-BA0B-5410831C3D9D}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "org_etsi_its_security", "org_etsi_its_security\org_etsi_its_security.vcxproj", "{B5C77DAC-BC05-426F-8E13-E60BD2732A02}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -31,14 +33,14 @@ Global
{5151573E-B7B3-44B4-BA0B-5410831C3D9D}.Release|x64.Build.0 = Release|x64
{5151573E-B7B3-44B4-BA0B-5410831C3D9D}.Release|x86.ActiveCfg = Release|Win32
{5151573E-B7B3-44B4-BA0B-5410831C3D9D}.Release|x86.Build.0 = Release|Win32
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Debug|x64.ActiveCfg = Debug|x64
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Debug|x64.Build.0 = Debug|x64
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Debug|x86.ActiveCfg = Debug|Win32
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Debug|x86.Build.0 = Debug|Win32
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Release|x64.ActiveCfg = Release|x64
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Release|x64.Build.0 = Release|x64
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Release|x86.ActiveCfg = Release|Win32
- {A5E5C89A-7B89-443A-9972-E0145DBA3B7E}.Release|x86.Build.0 = Release|Win32
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Debug|x64.ActiveCfg = Debug|x64
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Debug|x64.Build.0 = Debug|x64
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Debug|x86.ActiveCfg = Debug|Win32
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Debug|x86.Build.0 = Debug|Win32
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Release|x64.ActiveCfg = Release|x64
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Release|x64.Build.0 = Release|x64
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Release|x86.ActiveCfg = Release|Win32
+ {B5C77DAC-BC05-426F-8E13-E60BD2732A02}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tools/itssecurity/lib_its_security/lib_its_security.vcxproj b/tools/itssecurity/lib_its_security/lib_its_security.vcxproj
index 8ca7805617aa1a7550a54db8c90c25f40cebad6c..56294ec5eb8cba60248efa9171bf6ee338661aa7 100644
--- a/tools/itssecurity/lib_its_security/lib_its_security.vcxproj
+++ b/tools/itssecurity/lib_its_security/lib_its_security.vcxproj
@@ -160,7 +160,7 @@
libcrypto64MDd.lib;libssl64MDd.lib;Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
- cp "$(TargetPath)" "$(MSBuildProjectDirectory)\..\..\..\tt3plugins\TT_TestSystem\itssecurity\win32\x86_64"
+ cp "$(TargetPath)" "$(MSBuildProjectDirectory)\..\..\..\javasrc\nativeLibs\win32\x86_64"