diff --git a/.bashrc b/.bashrc
index 5554f3ff320650017c22c66e83c8161f54b2eda1..0e9a9b5eea5655948c0fbe497d20ba9dcc8d3bf1 100644
--- a/.bashrc
+++ b/.bashrc
@@ -361,7 +361,7 @@ fi
 
 if [ -n "${BASH:-}" ]
 then
-    export CDPATH=".:$HOME:$HOME/Documents:$HOME/Documents/Shore:$HOME/Repositories/Shore:$HOME/Repositories/Endless:$HOME/Documents/Endless"
+    export CDPATH=".:$HOME:$HOME/Documents:$HOME/Documents/Shore:$HOME/Repositories/Shore"
     # shellcheck disable=SC2016
     export PROMPT_COMMAND='__prompt'
     shopt -s checkwinsize
diff --git a/.ssh/config.d/20_endless b/.ssh/config.d/20_endless
deleted file mode 100644
index a2a5e0e21ed56207bf338feef44f300e1d2bc0ca..0000000000000000000000000000000000000000
--- a/.ssh/config.d/20_endless
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# vim:ft=sshconfig
-#Endless
-
-Host 10.17.*.* *.dev.endlessm.com *.dev.endlessm-sf.com *.dev.endlessos.org
-ProxyCommand ssh vpn-router.uw1.endlessm.com -W %h:%p
-
-Host 172.31.*.* 10.*.*.* *.endlessm-sf.com *.endlessos.org endlessm-sf.com endlessm.com
-ProxyCommand ssh openvpn.endlessm.com -W %h:%p
-
-Host 172.31.*.* 10.*.*.* *.endlessm.com *.endlessm-sf.com endlessm.com *.endlessos.org endlessm-sf.com endlessm.com
-User nimrod
-IdentityFile ~/Documents/Endless/endless_ecdsa
-IdentityFile ~/Documents/Endless/endless_rsa
-IdentityFile ~/Documents/Endless/endless_us-west-2
-IdentityFile ~/Documents/Endless/endless_us-west-1
diff --git a/Documents/Endless/.envrc b/Archive/Endless/.envrc
similarity index 100%
rename from Documents/Endless/.envrc
rename to Archive/Endless/.envrc
diff --git a/Documents/Endless/.gitkeep b/Archive/Endless/.gitkeep
similarity index 100%
rename from Documents/Endless/.gitkeep
rename to Archive/Endless/.gitkeep
diff --git a/Documents/Endless/.gnupg/.gitkeep b/Archive/Endless/.gnupg/.gitkeep
similarity index 100%
rename from Documents/Endless/.gnupg/.gitkeep
rename to Archive/Endless/.gnupg/.gitkeep
diff --git a/Documents/Endless/Pipfile b/Archive/Endless/Pipfile
similarity index 100%
rename from Documents/Endless/Pipfile
rename to Archive/Endless/Pipfile
diff --git a/Documents/Endless/Pipfile.lock b/Archive/Endless/Pipfile.lock
similarity index 100%
rename from Documents/Endless/Pipfile.lock
rename to Archive/Endless/Pipfile.lock
diff --git a/Documents/Endless/ldaprc b/Archive/Endless/ldaprc
similarity index 100%
rename from Documents/Endless/ldaprc
rename to Archive/Endless/ldaprc
diff --git a/Repositories/Endless/.envrc b/Repositories/Endless/.envrc
deleted file mode 120000
index 8246b3d4f90eb28bdb35aa35499d4b97d373ce17..0000000000000000000000000000000000000000
--- a/Repositories/Endless/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-../../Documents/Endless/.envrc
\ No newline at end of file
diff --git a/Repositories/Endless/.envrc.private b/Repositories/Endless/.envrc.private
deleted file mode 120000
index da83a39af50fe80fc15a5dc69a96870da06edf92..0000000000000000000000000000000000000000
--- a/Repositories/Endless/.envrc.private
+++ /dev/null
@@ -1 +0,0 @@
-../../Documents/Endless/.envrc.private
\ No newline at end of file
diff --git a/Repositories/Endless/Pipfile b/Repositories/Endless/Pipfile
deleted file mode 120000
index 59e9c450e18fbaf83a4352c1af2b9c5880bc2360..0000000000000000000000000000000000000000
--- a/Repositories/Endless/Pipfile
+++ /dev/null
@@ -1 +0,0 @@
-../../Documents/Endless/Pipfile
\ No newline at end of file
diff --git a/Repositories/Endless/Pipfile.lock b/Repositories/Endless/Pipfile.lock
deleted file mode 120000
index 3f0c37a7be9ab17d5161d73b2b389146e5a6c8a6..0000000000000000000000000000000000000000
--- a/Repositories/Endless/Pipfile.lock
+++ /dev/null
@@ -1 +0,0 @@
-../../Documents/Endless/Pipfile.lock
\ No newline at end of file
diff --git a/Repositories/Endless/gcloud.json b/Repositories/Endless/gcloud.json
deleted file mode 120000
index b8ae3b26282e9452dc2868b9f97e89c82c9986c5..0000000000000000000000000000000000000000
--- a/Repositories/Endless/gcloud.json
+++ /dev/null
@@ -1 +0,0 @@
-../../Documents/Endless/gcloud.json
\ No newline at end of file