11 files changed, 80 insertions, 80 deletions
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 5b266c3..51ec2d5 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -17,7 +17,7 @@ sky=sky35
 label=navpoint_origin
 name=Navpoint Origin
 location=0 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; GALILEO OUTPOST
@@ -25,7 +25,7 @@ model=static/navpoint
 [station]
 label=galileo_outpost
 name=Galileo Outpost
-model=independent/researchstation
+model=maps/independent/researchstation
 location=128 768 32
 color=106 95 87
 colorsecond=152 166 169
@@ -36,52 +36,52 @@ colorsecond=152 166 169
 label=navpoint_path01
 name=Safety Buoy
 location=128 -640 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path02
 name=Safety Buoy
 location=120 -512 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path03
 name=Safety Buoy
 location=112 -384 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path04
 name=Safety Buoy
 location=104 -256 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path05
 name=Safety Buoy
 location=96 -128 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path06
 name=Safety Buoy
 location=88 0 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path07
 name=Safety Buoy
 location=96 128 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path08
 name=Safety Buoy
 location=112 256 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path09
 name=Safety Buoy
 location=120 384 0
-model=static/navpoint
+model=maps/static/navpoint
 [navpoint]
 label=navpoint_path10
 name=Safety Buoy
 location=128 512 0
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; ANTWERP JUMPGATE
@@ -90,12 +90,12 @@ model=static/navpoint
 label=navpoint_south
 name=Navigation Point South
 location=128 -768 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_antwerp
 name=Jumpgate Anara -> Antwerp
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=antwerp:jumpgate_anara
 color=106 95 87
 colorsecond=152 166 169
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index a2d0879..fa7a286 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -27,7 +27,7 @@ radius=88
 [station]
 label=helianthos
 name=Starbase Helianthos
-model=colonial/helianthos
+model=maps/colonial/helianthos
 location=512 -512 0
 color=100 100 230
 colorsecond=160 160 160
@@ -38,7 +38,7 @@ colorsecond=160 160 160
 [station]
 label=buccaneers
 name=Buccaneers' Den
-model=pirate/juggernaut
+model=maps/pirate/juggernaut
 location=-768 1280 0
 color=158 0 255
 
@@ -49,12 +49,12 @@ color=158 0 255
 label=navpoint_south
 name=Navigation point South
 location=-1024 256 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_ghant
 name=Jumpgate Antwerp -> Ghant
-model=pirate/jumpgate
+model=maps/pirate/jumpgate
 target=ghant:jumpgate_antwerp
 color=158 0 255
 location=-1048 256 8
@@ -67,12 +67,12 @@ direction=0
 label=navpoint_north
 name=Navigation point North
 location=996 -256 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate Antwerp -> Dover
-model=pirate/jumpgate
+model=maps/pirate/jumpgate
 target=dover:jumpgate_antwerp
 color=158 0 255
 location=1024 -302 0
@@ -85,12 +85,12 @@ direction=300
 label=navpoint_west
 name=Navigation point West
 location=256 1024 16
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_anara
 name=Jumpgate Antwerp -> Anara
-model=pirate/jumpgate
+model=maps/pirate/jumpgate
 target=anara:jumpgate_antwerp
 color=158 0 255
 location=384 1056 16
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index ba50e3a..004627f 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -56,7 +56,7 @@ dock=yes
 label=navpoint_solar
 name=Navigation point Solar
 location=-242 0 16
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; CANTOR STATION
@@ -68,7 +68,7 @@ location=-256 0 32
 color=222 192 145
 colorsecond=.5 .4 .4
 direction=135
-model=colonial/cantor
+model=maps/colonial/cantor
 
 ;
 ; GHANT JUMPGATE
@@ -77,12 +77,12 @@ model=colonial/cantor
 label=navpoint_west
 name=Navigation point West
 location=-512 792 128
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_ghant
 name=Jumpgate Brogha -> Ghant
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=ghant:jumpgate_brogha
 location=-512 824 128
 direction=270
@@ -95,12 +95,12 @@ color=222 192 145
 label=navpoint_east
 name=Navigation point East
 location=768 -256 -8
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_eastend
 name=Jumpgate Brogha -> East End
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=eastend:jumpgate_brogha
 location=780 -256 0
 direction=180
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 6734478..a817668 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -20,7 +20,7 @@ name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
 ; [path] path to model
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; STAR
diff --git a/base/ini/zones/dover.ini b/base/ini/zones/dover.ini
index ef66edd..9462d2b 100644
--- a/base/ini/zones/dover.ini
+++ b/base/ini/zones/dover.ini
@@ -20,7 +20,7 @@ name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
 ; [path] path to model
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; STAR
@@ -39,12 +39,12 @@ radius=112
 label=navpoint_north
 name=Navigation point North
 location=504 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_lindblade
 name=Jumpgate Dover -> Lindblade 
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=lindblade:jumpgate_dover
 color=0.5 0.1 0.1
 location=512 0 0
@@ -57,12 +57,12 @@ direction=180
 label=navpoint_east
 name=Navigation point East
 location=0 -504 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_eastend
 name=Jumpgate Dover -> East End
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=eastend:jumpgate_dover
 color=0.5 0.1 0.1
 location=0 -512 0
@@ -75,12 +75,12 @@ direction=90
 label=navpoint_west
 name=Navigation point West
 location=-32 496 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_antwerp
 name=Jumpgate Dover -> Antwerp
-model=pirate/jumpgate
+model=maps/pirate/jumpgate
 target=antwerp:jumpgate_dover
 color=158 0 255
 location=-32 532 0
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 3337111..a1c4b49 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -15,7 +15,7 @@ sky=sky31
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; ENSOR STATION
@@ -27,7 +27,7 @@ color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
 location=-32 32 2
 direction=30
-model=independent/ensor
+model=maps/independent/ensor
 ; this entity is the default zone view
 default = yes
 
@@ -38,12 +38,12 @@ default = yes
 label=navpoint_north
 name=Navigation point North
 location=504 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate East End -> Dover
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=dover:jumpgate_eastend
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
@@ -57,12 +57,12 @@ direction=270
 label=navpoint_south
 name=Navigation point South
 location=-504 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_brogha
 name=Jumpgate East End -> Brogha
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=brogha:jumpgate_eastend
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index 223a293..847104a 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -25,7 +25,7 @@ location=0 0 0
 ; this entity is the default zone view
 ;default = yes
 ; [path] model path
-model=static/navpoint
+model=maps/static/navpoint
 
 ;
 ; STAR
@@ -71,7 +71,7 @@ label=alexandria
 ; [string] entity name
 name=Alexandria outpost
 ; [string] entity model name
-model=colonial/alexandria
+model=maps/colonial/alexandria
 ; [x y x] entity location
 location=-192 -704 32
 ; [r g b] entity primary color, values in the 0-255 range
@@ -86,7 +86,7 @@ default=yes
 [entity]
 label=alexandria_storage1
 name=storage tanks
-model=colonial/alexandria_storage
+model=maps/colonial/alexandria_storage
 location=-176 -720 32
 color=222 192 145
 colorsecond=160 160 160
@@ -95,7 +95,7 @@ direction=45
 [entity]
 label=alexandria_storage2
 name=storage tanks
-model=colonial/alexandria_storage
+model=maps/colonial/alexandria_storage
 location=-172 -720 32
 color=222 192 145
 colorsecond=160 160 160
@@ -104,7 +104,7 @@ direction=45
 [station]
 label=custodian
 name=battleship Custodian
-model=colonial/custodian
+model=maps/colonial/custodian
 location=-204 -656 32
 direction=305
 color=222 192 145
@@ -134,7 +134,7 @@ radius=68
 [station]
 label=regula
 name=Regula station
-model=colonial/regula
+model=maps/colonial/regula
 location=-128 928 -32
 color=0.4 0.7 0
 direction=225
@@ -142,7 +142,7 @@ direction=225
 [entity]
 label=regula_storage
 name=Storage tanks
-model=colonial/regula_storage
+model=maps/colonial/regula_storage
 location=-122 928 -32
 color=0.4 0.7 0
 
@@ -152,7 +152,7 @@ color=0.4 0.7 0
 [entity]
 label=ikarus
 name=Ikarus satellite
-model=colonial/ikarus
+model=maps/colonial/ikarus
 location=64 -16 0
 color=100 100 230
 direction=120
@@ -165,12 +165,12 @@ pitch=15
 label=navpoint_east
 name=Navigation point East
 location=716 -1008 20
-model=static/navpoint
+model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_brogha
 name=Jumpgate Ghant -> Brogha
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=brogha:jumpgate_ghant
 location=716 -1024 24
 direction=90
@@ -182,7 +182,7 @@ color=222 192 145
 [jumpgate]
 label=jumpgate_antwerp
 name=Jumpgate Ghant -> Antwerp
-model=pirate/jumpgate
+model=maps/pirate/jumpgate
 target=antwerp:jumpgate_ghant
 location=1024 348 32
 direction=180
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index dbe0352..564928a 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -17,7 +17,7 @@ sky=sky36
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 ; 
 ; STAR
@@ -56,7 +56,7 @@ texture=planets/kiana
 label=tsukhan_central
 name=Tsu-Khan Central
 location=-128 -64 12
-model=tsukhan/tsukhan_central
+model=maps/tsukhan/tsukhan_central
 default=yes
 color=127 26 127
 colorsecond=0 0 0
@@ -78,7 +78,7 @@ showonmap=false
 label=civilian_housing1
 name=civilian Housing
 location=-96 -56 12
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -86,7 +86,7 @@ colorsecond=0 0 0
 label=civilian_housing2
 name=civilian Housing
 location=-96 -56 11
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -94,7 +94,7 @@ colorsecond=0 0 0
 label=civilian_housing3
 name=civilian Housing
 location=-96 -55 10
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -102,7 +102,7 @@ colorsecond=0 0 0
 label=civilian_housing4
 name=civilian Housing
 location=-96 -55 12
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -110,7 +110,7 @@ colorsecond=0 0 0
 label=civilian_housing6
 name=civilian Housing
 location=-96 -55 11
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -118,7 +118,7 @@ colorsecond=0 0 0
 label=civilian_housing6
 name=civilian Housing
 location=-96 -56 10
-model=tsukhan/civilian_housing
+model=maps/tsukhan/civilian_housing
 color=127 26 127
 colorsecond=0 0 0
 
@@ -129,6 +129,6 @@ colorsecond=0 0 0
 label=battleship_kt98
 name=battleship K-T98
 location=256 16 16
-model=tsukhan/ravager
+model=maps/tsukhan/ravager
 color=127 26 127
 colorsecond=0 0 0
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index 7aaa425..2215f40 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -51,7 +51,7 @@ radius=72
 [station]
 label=lindblade_central
 name=Lindblade Central
-model=lindblade/lindblade_central
+model=maps/lindblade/lindblade_central
 location=500 672 18
 color=0.5 0.1 0.1
 direction=250
@@ -62,7 +62,7 @@ pitch=0
 [station]
 label=station15
 name=Station 15
-model=lindblade/station15
+model=maps/lindblade/station15
 color=0.5 0.1 0.1
 location=-292 -68 8
 direction=315
@@ -83,7 +83,7 @@ location=-324 -768 12
 [jumpgate]
 label=jumpgate_dover
 name=Jumpgate Lindblade -> Dover
-model=colonial/jumpgate
+model=maps/colonial/jumpgate
 target=dover:jumpgate_lindblade
 color=0.5 0.1 0.1
 location=-332 -768 16
diff --git a/base/ini/zones/race.ini b/base/ini/zones/race.ini
index 1861ea4..a3233b1 100644
--- a/base/ini/zones/race.ini
+++ b/base/ini/zones/race.ini
@@ -5,12 +5,12 @@ name=Race Track system
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [racetrack]
 label=racetrack
 name=Race Start
-model=race/checkpoint
+model=maps/race/checkpoint
 location=64 0 0
 direction=180
 color=.5 .5 .5
@@ -18,28 +18,28 @@ color=.5 .5 .5
 [checkpoint]
 label=checkpoint1
 name=Checkpoint 1
-model=race/checkpoint
+model=maps/race/checkpoint
 location=96 0 0
 direction=180
 
 [checkpoint]
 label=checkpoint2
 name=Checkpoint 2
-model=race/checkpoint
+model=maps/race/checkpoint
 location=128 0 4
 direction=180
 
 [checkpoint]
 label=checkpoint3
 name=Checkpoint 3
-model=race/checkpoint
+model=maps/race/checkpoint
 location=138 -10 4
 direction=135
 
 [checkpoint]
 label=checkpoint4
 name=Race Finish
-model=race/checkpoint
+model=maps/race/checkpoint
 location=138 -28 4
 direction=90
 
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index a0028a4..26b147f 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -5,12 +5,12 @@ name=Unknown system
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=static/navpoint
+model=maps/static/navpoint
 
 [entity]
 label=vector
 name=Micron Vector
-model=merchant/vector
+model=maps/merchant/vector
 location=4 -8 0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
@@ -18,7 +18,7 @@ colorsecond=0.8 0.2 0
 [entity]
 label=matrix
 name=Micron Tensor
-model=merchant/tensor
+model=maps/merchant/tensor
 location=4 0  0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
@@ -26,7 +26,7 @@ colorsecond=0.8 0.2 0
 [entity]
 label=matrix
 name=Micron Matrix
-model=merchant/matrix
+model=maps/merchant/matrix
 location=4 8 0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
@@ -34,20 +34,20 @@ colorsecond=0.8 0.2 0
 [entity]
 label=heavycruiser
 label=Tsu'Khan Heavy Cruiser
-model=tsukhan/heavycruiser
+model=maps/tsukhan/heavycruiser
 location=32 -16 0
 color=127 26 127
 
 [entity]
 label=juggernaut
 name=Pirate Juggernaut
-model=pirate/juggernaut
+model=maps/pirate/juggernaut
 location=32 16 0
 
 [entity]
 label=custodian
 name=Colonial Battleship
-model=colonial/custodian
+model=maps/colonial/custodian
 location=32 32 0
 color=222 192 145
 colorsecond=160 160 160
@@ -55,7 +55,7 @@ colorsecond=160 160 160
 [entity]
 label=alexandria
 name=Alexandria outpost
-model=colonial/alexandria
+model=maps/colonial/alexandria
 location=32 64 0
 direction=270
 color=222 192 145
@@ -64,7 +64,7 @@ colorsecond=160 160 160
 [entity]
 label=ensor
 name=Ensor station
-model=independent/ensor
+model=maps/independent/ensor
 location=32 -64 0
 color=0.7 0.7 0.9
 colorsecond=0.7 0.8 0.95