diff --git a/flats/gate1.gif b/flats/gate1.gif
deleted file mode 120000
index 83012042..00000000
--- a/flats/gate1.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/gate1.gif
\ No newline at end of file
diff --git a/flats/gate1.gif b/flats/gate1.gif
new file mode 100644
index 00000000..b924eb1d
Binary files /dev/null and b/flats/gate1.gif differ
diff --git a/flats/gate2.gif b/flats/gate2.gif
deleted file mode 120000
index 745577c0..00000000
--- a/flats/gate2.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/gate2.gif
\ No newline at end of file
diff --git a/flats/gate2.gif b/flats/gate2.gif
new file mode 100644
index 00000000..67b47405
Binary files /dev/null and b/flats/gate2.gif differ
diff --git a/flats/gate3.gif b/flats/gate3.gif
deleted file mode 120000
index 34ceb717..00000000
--- a/flats/gate3.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/gate3.gif
\ No newline at end of file
diff --git a/flats/gate3.gif b/flats/gate3.gif
new file mode 100644
index 00000000..f01a3149
Binary files /dev/null and b/flats/gate3.gif differ
diff --git a/flats/gate4.gif b/flats/gate4.gif
deleted file mode 120000
index c1715baa..00000000
--- a/flats/gate4.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/gate4.gif
\ No newline at end of file
diff --git a/flats/gate4.gif b/flats/gate4.gif
new file mode 100644
index 00000000..127652b6
Binary files /dev/null and b/flats/gate4.gif differ
diff --git a/flats/jewellds/README b/flats/jewellds/README
deleted file mode 100644
index 156137eb..00000000
--- a/flats/jewellds/README
+++ /dev/null
@@ -1,5 +0,0 @@
-These teleporter flats use a wholly new background and the symbols
-within them are based on old medieval and Swedish runic symbols, which
-were placed in the public domain and available from:
- * https://commons.wikimedia.org/wiki/File:Dalrunor.svg
- * https://commons.wikimedia.org/wiki/File:Medeltida_runor.svg
diff --git a/flats/jewellds/gate1.gif b/flats/jewellds/gate1.gif
deleted file mode 100644
index b924eb1d..00000000
Binary files a/flats/jewellds/gate1.gif and /dev/null differ
diff --git a/flats/jewellds/gate1_alt.gif b/flats/jewellds/gate1_alt.gif
deleted file mode 100644
index 21bbe7ec..00000000
Binary files a/flats/jewellds/gate1_alt.gif and /dev/null differ
diff --git a/flats/jewellds/gate2.gif b/flats/jewellds/gate2.gif
deleted file mode 100644
index 67b47405..00000000
Binary files a/flats/jewellds/gate2.gif and /dev/null differ
diff --git a/flats/jewellds/gate2_alt.gif b/flats/jewellds/gate2_alt.gif
deleted file mode 100644
index d32aeb4d..00000000
Binary files a/flats/jewellds/gate2_alt.gif and /dev/null differ
diff --git a/flats/jewellds/gate3.gif b/flats/jewellds/gate3.gif
deleted file mode 100644
index f01a3149..00000000
Binary files a/flats/jewellds/gate3.gif and /dev/null differ
diff --git a/flats/jewellds/gate3_alt.gif b/flats/jewellds/gate3_alt.gif
deleted file mode 100644
index e91ea592..00000000
Binary files a/flats/jewellds/gate3_alt.gif and /dev/null differ
diff --git a/flats/jewellds/gate4.gif b/flats/jewellds/gate4.gif
deleted file mode 100644
index 127652b6..00000000
Binary files a/flats/jewellds/gate4.gif and /dev/null differ
diff --git a/flats/jewellds/gate_template_red_metallic.gif b/flats/jewellds/gate_template_red_metallic.gif
deleted file mode 100644
index bdcd98c1..00000000
Binary files a/flats/jewellds/gate_template_red_metallic.gif and /dev/null differ
diff --git a/flats/jewellds/gate_template_silver.gif b/flats/jewellds/gate_template_silver.gif
deleted file mode 100644
index 8c124365..00000000
Binary files a/flats/jewellds/gate_template_silver.gif and /dev/null differ
diff --git a/patches/jewellds/new agm logo rounded v4e 128x40.png b/patches/agm_logo/new agm logo rounded v4e 128x40.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 128x40.png
rename to patches/agm_logo/new agm logo rounded v4e 128x40.png
diff --git a/patches/jewellds/new agm logo rounded v4e 26x8.png b/patches/agm_logo/new agm logo rounded v4e 26x8.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 26x8.png
rename to patches/agm_logo/new agm logo rounded v4e 26x8.png
diff --git a/patches/jewellds/new agm logo rounded v4e 30x9.png b/patches/agm_logo/new agm logo rounded v4e 30x9.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 30x9.png
rename to patches/agm_logo/new agm logo rounded v4e 30x9.png
diff --git a/patches/jewellds/new agm logo rounded v4e 32x10.png b/patches/agm_logo/new agm logo rounded v4e 32x10.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 32x10.png
rename to patches/agm_logo/new agm logo rounded v4e 32x10.png
diff --git a/patches/jewellds/new agm logo rounded v4e 40x12.png b/patches/agm_logo/new agm logo rounded v4e 40x12.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 40x12.png
rename to patches/agm_logo/new agm logo rounded v4e 40x12.png
diff --git a/patches/jewellds/new agm logo rounded v4e 42x13.png b/patches/agm_logo/new agm logo rounded v4e 42x13.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 42x13.png
rename to patches/agm_logo/new agm logo rounded v4e 42x13.png
diff --git a/patches/jewellds/new agm logo rounded v4e 52x16.png b/patches/agm_logo/new agm logo rounded v4e 52x16.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 52x16.png
rename to patches/agm_logo/new agm logo rounded v4e 52x16.png
diff --git a/patches/jewellds/new agm logo rounded v4e 55x17.png b/patches/agm_logo/new agm logo rounded v4e 55x17.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 55x17.png
rename to patches/agm_logo/new agm logo rounded v4e 55x17.png
diff --git a/patches/jewellds/new agm logo rounded v4e 70x22.png b/patches/agm_logo/new agm logo rounded v4e 70x22.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 70x22.png
rename to patches/agm_logo/new agm logo rounded v4e 70x22.png
diff --git a/patches/jewellds/new agm logo rounded v4e 94x29.png b/patches/agm_logo/new agm logo rounded v4e 94x29.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 94x29.png
rename to patches/agm_logo/new agm logo rounded v4e 94x29.png
diff --git a/patches/jewellds/new agm logo rounded v4e 96x30.png b/patches/agm_logo/new agm logo rounded v4e 96x30.png
similarity index 100%
rename from patches/jewellds/new agm logo rounded v4e 96x30.png
rename to patches/agm_logo/new agm logo rounded v4e 96x30.png
diff --git a/patches/jewellds/new agm logo roundedv4e.svg b/patches/agm_logo/new agm logo roundedv4e.svg
similarity index 100%
rename from patches/jewellds/new agm logo roundedv4e.svg
rename to patches/agm_logo/new agm logo roundedv4e.svg
diff --git a/patches/door2_1.gif b/patches/door2_1.gif
deleted file mode 120000
index 4e4aa39d..00000000
--- a/patches/door2_1.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/door2_1.gif
\ No newline at end of file
diff --git a/patches/door2_1.gif b/patches/door2_1.gif
new file mode 100644
index 00000000..d9589107
Binary files /dev/null and b/patches/door2_1.gif differ
diff --git a/patches/door2_5.gif b/patches/door2_5.gif
deleted file mode 120000
index 07623012..00000000
--- a/patches/door2_5.gif
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/door2_5.gif
\ No newline at end of file
diff --git a/patches/door2_5.gif b/patches/door2_5.gif
new file mode 100644
index 00000000..b3367469
Binary files /dev/null and b/patches/door2_5.gif differ
diff --git a/patches/jewellds/door2_1.gif b/patches/jewellds/door2_1.gif
deleted file mode 100644
index d9589107..00000000
Binary files a/patches/jewellds/door2_1.gif and /dev/null differ
diff --git a/patches/jewellds/door2_5.gif b/patches/jewellds/door2_5.gif
deleted file mode 100644
index b3367469..00000000
Binary files a/patches/jewellds/door2_5.gif and /dev/null differ
diff --git a/patches/jewellds/wall03_3.gif b/patches/jewellds/wall03_3.gif
deleted file mode 100644
index 0b18d033..00000000
Binary files a/patches/jewellds/wall03_3.gif and /dev/null differ
diff --git a/patches/wall03_3.gif b/patches/wall03_3.gif
deleted file mode 120000
index b1b44f3e..00000000
--- a/patches/wall03_3.gif
+++ /dev/null
@@ -1 +0,0 @@
-./jewellds/wall03_3.gif
\ No newline at end of file
diff --git a/patches/wall03_3.gif b/patches/wall03_3.gif
new file mode 100644
index 00000000..0b18d033
Binary files /dev/null and b/patches/wall03_3.gif differ
diff --git a/sounds/dsskeact.wav b/sounds/dsskeact.wav
deleted file mode 120000
index 48819a41..00000000
--- a/sounds/dsskeact.wav
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/dsskeact.wav
\ No newline at end of file
diff --git a/sounds/dsskeact.wav b/sounds/dsskeact.wav
new file mode 100644
index 00000000..011de792
Binary files /dev/null and b/sounds/dsskeact.wav differ
diff --git a/sounds/dsskedth.wav b/sounds/dsskedth.wav
deleted file mode 120000
index 213fda88..00000000
--- a/sounds/dsskedth.wav
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/dsskedth.wav
\ No newline at end of file
diff --git a/sounds/dsskedth.wav b/sounds/dsskedth.wav
new file mode 100644
index 00000000..56ab80b4
Binary files /dev/null and b/sounds/dsskedth.wav differ
diff --git a/sounds/dsskepch.wav b/sounds/dsskepch.wav
deleted file mode 120000
index 1aee4cbe..00000000
--- a/sounds/dsskepch.wav
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/dsskepch.wav
\ No newline at end of file
diff --git a/sounds/dsskepch.wav b/sounds/dsskepch.wav
new file mode 100644
index 00000000..be57b825
Binary files /dev/null and b/sounds/dsskepch.wav differ
diff --git a/sounds/dsskesit.wav b/sounds/dsskesit.wav
deleted file mode 120000
index 79d9c6a0..00000000
--- a/sounds/dsskesit.wav
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/dsskesit.wav
\ No newline at end of file
diff --git a/sounds/dsskesit.wav b/sounds/dsskesit.wav
new file mode 100644
index 00000000..1d95b181
Binary files /dev/null and b/sounds/dsskesit.wav differ
diff --git a/sounds/dsskeswg.wav b/sounds/dsskeswg.wav
deleted file mode 120000
index ac86340e..00000000
--- a/sounds/dsskeswg.wav
+++ /dev/null
@@ -1 +0,0 @@
-jewellds/dsskeswg.wav
\ No newline at end of file
diff --git a/sounds/dsskeswg.wav b/sounds/dsskeswg.wav
new file mode 100644
index 00000000..27f4a9a1
Binary files /dev/null and b/sounds/dsskeswg.wav differ
diff --git a/sounds/jewellds/dsskeact.wav b/sounds/jewellds/dsskeact.wav
deleted file mode 100644
index 011de792..00000000
Binary files a/sounds/jewellds/dsskeact.wav and /dev/null differ
diff --git a/sounds/jewellds/dsskedth.wav b/sounds/jewellds/dsskedth.wav
deleted file mode 100644
index 56ab80b4..00000000
Binary files a/sounds/jewellds/dsskedth.wav and /dev/null differ
diff --git a/sounds/jewellds/dsskepch.wav b/sounds/jewellds/dsskepch.wav
deleted file mode 100644
index be57b825..00000000
Binary files a/sounds/jewellds/dsskepch.wav and /dev/null differ
diff --git a/sounds/jewellds/dsskesit.wav b/sounds/jewellds/dsskesit.wav
deleted file mode 100644
index 1d95b181..00000000
Binary files a/sounds/jewellds/dsskesit.wav and /dev/null differ
diff --git a/sounds/jewellds/dsskeswg.wav b/sounds/jewellds/dsskeswg.wav
deleted file mode 100644
index 27f4a9a1..00000000
Binary files a/sounds/jewellds/dsskeswg.wav and /dev/null differ