diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/NTServApp.aps b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/NTServApp.aps
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/NTServApp.aps
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/NTServApp.aps
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.001 b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.001
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.001
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.001
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.dsp b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.dsp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.dsp
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.dsp
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.dsw b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.dsw
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.dsw
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.dsw
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.mak b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.mak
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.mak
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.mak
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.mdp b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.mdp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.mdp
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.mdp
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.plg b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.plg
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.plg
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.plg
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.sln b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.sln
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.sln
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.sln
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.vcp b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.vcp
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.vcp
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.vcp
diff --git a/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.vcproj b/src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.vcproj
similarity index 100%
rename from src/tests/add-ons/kernel/file_systems/beserved/server-Windows/ntservice.vcproj
rename to src/tests/add-ons/kernel/file_systems/beserved/server-Windows/VS2002/ntservice.vcproj