diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed05ef50b64a64d3d2d7232d2e2d2ed126d2dda6..776e0d0e46e867bbf35b07aa811fc048c4554fc0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ deploy:
         --arg install  $(7z l $COMP_FILE | tail -n 1 | awk '{print $3}') \
         --arg path     "FPSoftware" \
         --arg hash     $(crc32 $COMP_FILE) \
-        --arg depends  "supportpack-activex supportpack-common-secureplayer" \
+        --arg depends  "supportpack-activex supportpack-common-fpnavigator supportpack-common-oldcpusimulator supportpack-common-secureplayer" \
         '{ 
           "title": $name,
           "description": $desc,
diff --git a/BrowserPlugins/SVR/NPSS3D32.dll b/BrowserPlugins/SVR/NPSS3D32.dll
new file mode 100644
index 0000000000000000000000000000000000000000..947101d30266d91faba87367132cf7f6218991f1
--- /dev/null
+++ b/BrowserPlugins/SVR/NPSS3D32.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d0ba21c6b5939871e39e548cc75b20580ff8871b9bbf379a456803a2598228c
+size 106496
diff --git a/FlashpointSecurePlayerConfigs/svr.config b/FlashpointSecurePlayerConfigs/svr.config
index 562d93b455c58855291a1b8a8d78bd71c83cb5c2..8eca41418b8d6cafdda9ca1275897c32442356ec 100644
--- a/FlashpointSecurePlayerConfigs/svr.config
+++ b/FlashpointSecurePlayerConfigs/svr.config
@@ -104,8 +104,8 @@
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\SOFTWARE\CLASSES\.XVR" valueName="CONTENT TYPE" value="x-world/x-xvr" valueKind="String" />
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Name" value="FP" valueKind="String" />
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Company" value="FP" valueKind="String" />
-            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Path" value="SVR" valueKind="String" />
-            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="TempDir" value="SVR\Temp" valueKind="String" />
+            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Path" value="%FP_STARTUP_PATH%\SVR" valueKind="String" />
+            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="TempDir" value="%FP_STARTUP_PATH%\SVR\temp" valueKind="String" />
           </registryStates>
         </modifications>
       </template>
diff --git a/FlashpointSecurePlayerConfigs/svrbasilisk.config b/FlashpointSecurePlayerConfigs/svrbasilisk.config
index 40cfbfde222b1b0edbdde43de16f111fc9d1083c..8c7919e7010b5473b22b99e71a240d76c1419ca7 100644
--- a/FlashpointSecurePlayerConfigs/svrbasilisk.config
+++ b/FlashpointSecurePlayerConfigs/svrbasilisk.config
@@ -104,8 +104,8 @@
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\SOFTWARE\CLASSES\.XVR" valueName="CONTENT TYPE" value="x-world/x-xvr" valueKind="String" />
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Name" value="FP" valueKind="String" />
             <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Company" value="FP" valueKind="String" />
-            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Path" value="..\..\..\SVR\SVR\SVR" valueKind="String" />
-            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="TempDir" value="..\..\..\SVR\SVR\SVR\Temp" valueKind="String" />
+            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="Path" value="%FP_STARTUP_PATH%\SVR" valueKind="String" />
+            <registryState type="VALUE" keyName="HKEY_CURRENT_USER\Software\Superscape\Superscape Viscape\Preferences" valueName="TempDir" value="%FP_STARTUP_PATH%\SVR\temp" valueKind="String" />
           </registryStates>
           <singleInstance executable="flashpointnavigator.exe" strict="false" />
         </modifications>
diff --git a/SVR/SVR/CXVISCAP.HLP b/SVR/CXVISCAP.HLP
similarity index 100%
rename from SVR/SVR/CXVISCAP.HLP
rename to SVR/CXVISCAP.HLP
diff --git a/SVR/SVR/DShow.dev b/SVR/DShow.dev
similarity index 99%
rename from SVR/SVR/DShow.dev
rename to SVR/DShow.dev
index 08680332c04bd30c8470d5f2748fe0ef572a4a81..38d969930cb40efa85ac03063fc4138aaff0cf8f 100644
Binary files a/SVR/SVR/DShow.dev and b/SVR/DShow.dev differ
diff --git a/SVR/Entity.dll b/SVR/Entity.dll
new file mode 100644
index 0000000000000000000000000000000000000000..6258a2d5a46d88604fd4b590e79082c002b686a8
--- /dev/null
+++ b/SVR/Entity.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:431b1ee4bd1931d12add0618cf88f5fd08b0665630f5423f41f803bd6fe38baf
+size 45056
diff --git a/SVR/SVR/LICEREL.HLP b/SVR/LICEREL.HLP
similarity index 100%
rename from SVR/SVR/LICEREL.HLP
rename to SVR/LICEREL.HLP
diff --git a/SVR/SVR/Mbar.avi b/SVR/Mbar.avi
similarity index 100%
rename from SVR/SVR/Mbar.avi
rename to SVR/Mbar.avi
diff --git a/SVR/NPSS3D32.dll b/SVR/NPSS3D32.dll
deleted file mode 100644
index f8c5fdd58dda4aed007268d13dc8c2c9f0e48f50..0000000000000000000000000000000000000000
--- a/SVR/NPSS3D32.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4dc93d2933fa64a9a595619b9e348657b6bba5908841def4853bf29eb8399dfd
-size 106496
diff --git a/SVR/OldCPUSimulator_viscape.exe b/SVR/OldCPUSimulator_viscape.exe
index 593fa13b3b167fd0fb1e9e519558a3ee2c85097e..fffa78a72311d5f42d0cd9d2940bf4bba185a91c 100644
--- a/SVR/OldCPUSimulator_viscape.exe
+++ b/SVR/OldCPUSimulator_viscape.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ef6abc94ea6b8e07b2c6789d6afe0717a4f763f7d6ae0b8c90cb6121923b671
+oid sha256:35df90623cf785d32d23411df36c28c66818b3fd509d8e5832bbadcaf235bc56
 size 1216512
diff --git a/SVR/SS3DNP.dll b/SVR/SS3DNP.dll
index 6c5d223637dfaee9a61ee7ee054a14ae474ef4e7..a5ddd35d9a3c6710e4b98cf9a429f0ab5c12e9a1 100644
--- a/SVR/SS3DNP.dll
+++ b/SVR/SS3DNP.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d310b5fc9034f1d601d4cef7b174bbf163274a6579e7da9771369fbf39db7da1
+oid sha256:1ad5313632f0e26adfed3eaefec014d592421be8aa1add8aaf93ef9cf752c258
 size 20480
diff --git a/SVR/SSWatch.dll b/SVR/SSWatch.dll
index a1bc821ad95ef3e93e1ca67b713a9a129fe5f72d..855191400b1435884a05ddd6eae21fe67e5ca805 100644
--- a/SVR/SSWatch.dll
+++ b/SVR/SSWatch.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7800b879b03567aae5e781f37a93bb97c77aa247b98b39d917329ccb6e48ac55
+oid sha256:0084992f8fcbbdc13f02db4c61ff387095c02e9a0791fc5e425cf06d38930a45
 size 24576
diff --git a/SVR/SSWatch.exe b/SVR/SSWatch.exe
index e197804cfe6503ad9f5ca57cf6cd2f7ee114d1db..2cb848aa75531639035cf9393b17b87f20669501 100644
--- a/SVR/SSWatch.exe
+++ b/SVR/SSWatch.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:675e5bb08ee71b8fbb005790ad7ac2b248d061f379fd42e0362467fcf100539b
+oid sha256:a528f75d863f9a36bc0cc2f1626c0f3f577f2b4cf05b6357237ffd90b8b52a40
 size 20480
diff --git a/SVR/SVR/Entity.dll b/SVR/SVR/Entity.dll
deleted file mode 100644
index d0a4810fdb2bd3f1d7f7335ae8041e7953ca3a15..0000000000000000000000000000000000000000
--- a/SVR/SVR/Entity.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:192ffa1d323b7ea10bde6905593d86f3d211157ff821d1132899bdfe94e7264c
-size 45056
diff --git a/SVR/SVR/NET.CF2 b/SVR/SVR/NET.CF2
deleted file mode 100644
index 8bf4c6f8cc0c2308cc3bdd32891fe964de8f9222..0000000000000000000000000000000000000000
Binary files a/SVR/SVR/NET.CF2 and /dev/null differ
diff --git a/SVR/SVR/NET.CFG b/SVR/SVR/NET.CFG
deleted file mode 100644
index d201da6d316642c2bfb3d2d783326417ce25b802..0000000000000000000000000000000000000000
Binary files a/SVR/SVR/NET.CFG and /dev/null differ
diff --git a/SVR/SVR/T2.SVR b/SVR/SVR/T2.SVR
deleted file mode 100644
index 52547d7eecc9f7bfcb5251f37523fa823198e84b..0000000000000000000000000000000000000000
Binary files a/SVR/SVR/T2.SVR and /dev/null differ
diff --git a/SVR/SVR/Temp/STREETSOUND.SND b/SVR/SVR/Temp/STREETSOUND.SND
deleted file mode 100644
index f76a389530826e6d6ae993cf12ec11bbe49c9746..0000000000000000000000000000000000000000
Binary files a/SVR/SVR/Temp/STREETSOUND.SND and /dev/null differ
diff --git a/SVR/SVR/Temp/game1.flc b/SVR/SVR/Temp/game1.flc
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/SVR/SVR/Temp/newbold1.fnt b/SVR/SVR/Temp/newbold1.fnt
deleted file mode 100644
index f0912abb0592b73b65b3baa2e2ab64a910c50309..0000000000000000000000000000000000000000
Binary files a/SVR/SVR/Temp/newbold1.fnt and /dev/null differ
diff --git a/SVR/SVR/Wwwlinkw.dll b/SVR/SVR/Wwwlinkw.dll
deleted file mode 100644
index 954ad1fea423a569ce96fc69fa5657e09cef6fa9..0000000000000000000000000000000000000000
--- a/SVR/SVR/Wwwlinkw.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08c49adab557637255189e59b8afc632c8b16d07e53f3580950900c36e8cc814
-size 28672
diff --git a/SVR/SVR/ss1.fnt b/SVR/SVR/ss1.fnt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/SVR/SVR/VISCAPE.HLP b/SVR/VISCAPE.HLP
similarity index 100%
rename from SVR/SVR/VISCAPE.HLP
rename to SVR/VISCAPE.HLP
diff --git a/SVR/SVR/Vis.fnt b/SVR/Vis.fnt
similarity index 100%
rename from SVR/SVR/Vis.fnt
rename to SVR/Vis.fnt
diff --git a/SVR/SVR/Vis.msg b/SVR/Vis.msg
similarity index 96%
rename from SVR/SVR/Vis.msg
rename to SVR/Vis.msg
index 6f878e19b5325759cde6900349b3a1bf7a60a495..534b466d30a87db008bd485236cb274de37c7770 100644
Binary files a/SVR/SVR/Vis.msg and b/SVR/Vis.msg differ
diff --git a/SVR/SVR/Vis.rsc b/SVR/Vis.rsc
similarity index 100%
rename from SVR/SVR/Vis.rsc
rename to SVR/Vis.rsc
diff --git a/SVR/SVR/Vis.spr b/SVR/Vis.spr
similarity index 100%
rename from SVR/SVR/Vis.spr
rename to SVR/Vis.spr
diff --git a/SVR/Wwwlinkw.dll b/SVR/Wwwlinkw.dll
new file mode 100644
index 0000000000000000000000000000000000000000..286f7f347079c9805c131415b460af1bb14c3598
--- /dev/null
+++ b/SVR/Wwwlinkw.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e5af3f402172725f868d0e37a048f5a119ca00442441a2e0e1764c0a44bf688
+size 28672
diff --git a/SVR/SVR/dsound.dev b/SVR/dsound.dev
similarity index 99%
rename from SVR/SVR/dsound.dev
rename to SVR/dsound.dev
index 21ab2e6a21ba1cedb6566d5148e63492ddf6b275..4f0c32e551967724899cedf4835cec6f37d7902c 100644
Binary files a/SVR/SVR/dsound.dev and b/SVR/dsound.dev differ
diff --git a/SVR/SVR/grmix.dev b/SVR/grmix.dev
similarity index 84%
rename from SVR/SVR/grmix.dev
rename to SVR/grmix.dev
index 0e5e8331414084bf405fd8348ede1f0cfdeba740..6771060b87957df88ffa32930dbee775c366d166 100644
Binary files a/SVR/SVR/grmix.dev and b/SVR/grmix.dev differ
diff --git a/SVR/SVR/NET.CF1 b/SVR/net.cfg
similarity index 100%
rename from SVR/SVR/NET.CF1
rename to SVR/net.cfg
diff --git a/SVR/SVR/net_dflt.cfg b/SVR/net_dflt.cfg
similarity index 100%
rename from SVR/SVR/net_dflt.cfg
rename to SVR/net_dflt.cfg
diff --git a/SVR/SVR/vis.dev b/SVR/vis.dev
similarity index 99%
rename from SVR/SVR/vis.dev
rename to SVR/vis.dev
index 58c14ba6fd97e7adc509f1cf8a4fc3c8981b67de..d1896b20f86e2dfb0b8ec36dee8b3192e8118d73 100644
Binary files a/SVR/SVR/vis.dev and b/SVR/vis.dev differ