diff --git a/mods/ts/rules/civilian.yaml b/mods/ts/rules/civilian.yaml
index f085ea3a59..c4f37ad8a8 100644
--- a/mods/ts/rules/civilian.yaml
+++ b/mods/ts/rules/civilian.yaml
@@ -1220,6 +1220,8 @@ GASPOT:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
+	Selectable:
+		Bounds: 48, 82, 0, -25
 	Power:
 		Amount: -10
 	Armor:
@@ -1228,6 +1230,31 @@ GASPOT:
 		HP: 400
 	RenderBuilding:
 		Palette: player
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+
+GALITE:
+	Inherits: ^Building
+	Valued:
+		Cost: 200
+	Tooltip:
+		Name: Light Post
+	RenderBuilding:
+		Palette: terrain
+	-WithMakeAnimation:
+	-WithDeathAnimation:
+	Health:
+		HP: 600
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 2c0
+	Power:
+		Amount: 0
+#	WithIdleOverlay@LIGHTING:
+#		Sequence: lighting
+	Selectable:
+		Bounds: 25, 35, 0, -12
 
 NAMNTK:
 	Inherits: ^CivBuilding
diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index 3c8a4dc674..1dead3b5a8 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -618,62 +618,6 @@ GAARTY:
 	WithMuzzleFlash:
 	-WithDeathAnimation:
 
-GASPOT:
-	Inherits: ^Building
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 10
-		Prerequisites: anypower
-	Valued:
-		Cost: 300
-	Tooltip:
-		Name: Light Tower
-	Building:
-		Footprint: x
-		Dimensions: 1,1
-	Selectable:
-		Bounds: 48, 82, 0, -25
-	Health:
-		HP: 400
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 4c0
-	RenderDetectionCircle:
-	DetectCloaked:
-		Range: 3
-	WithIdleOverlay@LIGHTS:
-		Sequence: idle-lights
-	Power:
-		Amount: -10
-
-GALITE:
-	Inherits: ^Building
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 10
-		Prerequisites: anypower
-	Valued:
-		Cost: 200
-	Tooltip:
-		Name: Light Post
-	RenderBuilding:
-		Palette: terrain
-	-WithMakeAnimation:
-	-WithDeathAnimation:
-	Health:
-		HP: 600
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 2c0
-	Power:
-		Amount: 0
-#	WithIdleOverlay@LIGHTING:
-#		Sequence: lighting
-	Selectable:
-		Bounds: 25, 35, 0, -12
-
 GARADR:
 	Inherits: ^Building
 	Buildable:
diff --git a/mods/ts/sequences/civilian.yaml b/mods/ts/sequences/civilian.yaml
index c065cebbff..ac96d0a489 100644
--- a/mods/ts/sequences/civilian.yaml
+++ b/mods/ts/sequences/civilian.yaml
@@ -658,6 +658,43 @@ gakodk:
 		Start: 2
 		ShadowStart: 5
 
+gaspot:
+	Defaults:
+		Offset: 0, -12
+		UseTilesetCode: true
+	idle:
+		ShadowStart: 3
+	damaged-idle:
+		Start: 1
+		ShadowStart: 4
+	dead:
+		Start: 2
+		ShadowStart: 5
+		Tick: 400
+	idle-lights: gaspot_a
+		Length: 8
+		Tick: 200
+	damaged-idle-lights: gaspot_a
+		Start: 8
+		Length: 8
+		Tick: 200
+	make: gaspotmk
+		Length: 14
+		ShadowStart: 14
+
+galite:
+	Defaults:
+		Offset: 0, -12
+		UseTilesetCode: true
+	idle: gtlite
+		ShadowStart: 2
+	damaged-idle: gtlite
+		Start: 1
+		ShadowStart: 3
+#	lighting: alphatst
+#		ZOffset: -1c511
+#		BlendMode: Alpha
+
 namntk:
 	idle: ntmntk
 		ShadowStart: 3
diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml
index 19d726353f..040e91b7ca 100644
--- a/mods/ts/sequences/structures.yaml
+++ b/mods/ts/sequences/structures.yaml
@@ -762,33 +762,6 @@ gacsam:
 		Offset: 0, 0
 		UseTilesetCode: false
 
-gaspot:
-	Defaults:
-		Offset: 0, -12
-		UseTilesetCode: true
-	idle:
-		ShadowStart: 3
-	damaged-idle:
-		Start: 1
-		ShadowStart: 4
-	dead:
-		Start: 2
-		ShadowStart: 5
-		Tick: 400
-	idle-lights: gaspot_a
-		Length: 8
-		Tick: 200
-	damaged-idle-lights: gaspot_a
-		Start: 8
-		Length: 8
-		Tick: 200
-	make: gaspotmk
-		Length: 14
-		ShadowStart: 14
-	icon: spoticon
-		Offset: 0, 0
-		UseTilesetCode: false
-
 gahpad:
 	Defaults:
 		Offset: 0, -24
@@ -944,22 +917,6 @@ gasilo:
 		Offset: 0, 0
 		UseTilesetCode: false
 
-galite:
-	Defaults:
-		Offset: 0, -12
-		UseTilesetCode: true
-	idle: gtlite
-		ShadowStart: 2
-	damaged-idle: gtlite
-		Start: 1
-		ShadowStart: 3
-#	lighting: alphatst
-#		ZOffset: -1c511
-#		BlendMode: Alpha
-	icon: liteicon
-		Offset: 0, 0
-		UseTilesetCode: false
-
 gadept:
 	Defaults:
 		Offset: 0, -36