diff --git a/config/gameConfig.json b/config/gameConfig.json
index 27842d3f9..df6092966 100644
--- a/config/gameConfig.json
+++ b/config/gameConfig.json
@@ -48,19 +48,23 @@
 
 	"objects" :
 	[
-		"config/objects/generic.json",
-		"config/objects/moddables.json",
+		"config/objects/cartographer.json",
+		"config/objects/coverOfDarkness.json",
 		"config/objects/creatureBanks.json",
 		"config/objects/dwellings.json",
-		"config/objects/rewardableObservatories.json",
-		"config/objects/rewardableWitchHut.json",
-		"config/objects/rewardableShrine.json",
-		"config/objects/rewardableScholar.json",
-		"config/objects/rewardableOncePerWeek.json",
-		"config/objects/rewardablePickable.json",
-		"config/objects/rewardableOnceVisitable.json",
+		"config/objects/generic.json",
+		"config/objects/magicSpring.json",
+		"config/objects/magicWell.json",
+		"config/objects/moddables.json",
+		"config/objects/observatory.json",
+		"config/objects/rewardableBonusing.json",
 		"config/objects/rewardableOncePerHero.json",
-		"config/objects/rewardableBonusing.json"
+		"config/objects/rewardableOncePerWeek.json",
+		"config/objects/rewardableOnceVisitable.json",
+		"config/objects/rewardablePickable.json",
+		"config/objects/scholar.json",
+		"config/objects/shrine.json",
+		"config/objects/witchHut.json"
 	],
 
 	"artifacts" :
diff --git a/config/objects/cartographer.json b/config/objects/cartographer.json
new file mode 100644
index 000000000..4df883c5c
--- /dev/null
+++ b/config/objects/cartographer.json
@@ -0,0 +1,97 @@
+{
+	"cartographer" : {
+		"index" :13,
+		"handler": "configurable",
+		"lastReservedIndex" : 2,
+		"base" : {
+			"sounds" : {
+				"visit" : ["LIGHTHOUSE"]
+			}
+		},
+		"types" : {
+			"cartographerWater" : {
+				"index" : 0,
+				"aiValue" : 5000,
+				"rmg" : {
+					"zoneLimit" : 1,
+					"value" : 5000,
+					"rarity" : 20
+				},
+				"compatibilityIdentifiers" : [ "water" ],
+				"visitMode" : "unlimited",
+				"canRefuse" : true,
+				"rewards" : [
+					{
+						"limiter" : { "resources" : { "gold" : 1000 } },
+						"message" : 25,
+						"resources" : {
+							"gold" : -1000
+						},
+						"revealTiles" : {
+							"water" : 1
+						}
+					}
+				],
+				"onEmptyMessage" : 28,
+				"onVisitedMessage" : 24
+			},
+			"cartographerLand" : {
+				"index" : 1,
+				"aiValue": 10000,
+				"rmg" : {
+					"zoneLimit" : 1,
+					"value" : 10000,
+					"rarity" : 2
+				},
+				"compatibilityIdentifiers" : [ "land" ],
+				"visitMode" : "unlimited",
+				"canRefuse" : true,
+				"rewards" : [
+					{
+						"limiter" : { "resources" : { "gold" : 1000 } },
+						"message" : 26,
+						"resources" : {
+							"gold" : -1000
+						},
+						"revealTiles" : {
+							"surface" : 1,
+							"water" : -1,
+							"rock" : -1
+						}
+					}
+				],
+				"onEmptyMessage" : 28,
+				"onVisitedMessage" : 24
+			},
+			"cartographerSubterranean" : {
+				"index" : 2,
+				"aiValue" : 7500,
+				"rmg" : {
+					"zoneLimit" : 1,
+					"value" : 7500,
+					"rarity" : 20
+				},
+				"compatibilityIdentifiers" : [ "subterra" ],
+				"visitMode" : "unlimited",
+				"canRefuse" : true,
+				"rewards" : [
+					{
+						"limiter" : { "resources" : { "gold" : 1000 } },
+						"message" : 27,
+						"resources" : {
+							"gold" : -1000
+						},
+						"revealTiles" : {
+							"subterra" : 1,
+							"water" : -1,
+							"rock" : -1,
+							"surface" : -1
+						}
+					}
+				],
+				"onEmptyMessage" : 28,
+				"onVisitedMessage" : 24
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/config/objects/coverOfDarkness.json b/config/objects/coverOfDarkness.json
new file mode 100644
index 000000000..0cb733547
--- /dev/null
+++ b/config/objects/coverOfDarkness.json
@@ -0,0 +1,35 @@
+{
+	"coverOfDarkness" : {
+		"index" :15,
+		"handler" : "configurable",
+		"base" : {
+			"sounds" : {
+				"visit" : ["LIGHTHOUSE"]
+			}
+		},
+		"types" : {
+			"coverOfDarkness" : {
+				"index" : 0,
+				"aiValue" : 100,
+				"rmg" : {
+				},
+				
+				"compatibilityIdentifiers" : [ "object" ],
+				"visitMode" : "unlimited",
+				"rewards" : [
+					{
+						"message" : 31,
+						"revealTiles" : {
+							"radius" : 20,
+							"surface" : 1,
+							"subterra" : 1,
+							"water" : 1,
+							"rock" : 1,
+							"hide" : true
+						}
+					}
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/config/objects/magicSpring.json b/config/objects/magicSpring.json
new file mode 100644
index 000000000..6013353c3
--- /dev/null
+++ b/config/objects/magicSpring.json
@@ -0,0 +1,44 @@
+{
+	"magicSpring" : {
+		"index" : 48,
+		"handler": "configurable",
+		"base" : {
+			"sounds" : {
+				"ambient" : ["LOOPFOUN"],
+				"visit" : ["FAERIE"]
+			}
+		},
+		"types" : {
+			"magicSpring" : {
+				"index" : 0,
+				"aiValue" : 500,
+				//banned due to problems with 2 viistable offsets
+				//"rmg" : {
+				//	"zoneLimit"	: 1,
+				//	"value"		: 500,
+				//	"rarity"	: 50
+				//},
+				"compatibilityIdentifiers" : [ "object" ],
+
+				"onEmptyMessage" : 76,
+				"onVisitedMessage" : 75,
+				"description" : "@core.xtrainfo.15",
+				"resetParameters" : {
+					"period" : 7,
+					"visitors" : true
+				},
+				"visitMode" : "once",
+				"selectMode" : "selectFirst",
+				"rewards" : [
+					{
+						"limiter" : {
+							"noneOf" : [ { "manaPercentage" : 200 } ]
+						},
+						"message" : 74,
+						"manaPercentage" : 200
+					}
+				]
+			}
+		}
+	}
+}
diff --git a/config/objects/magicWell.json b/config/objects/magicWell.json
new file mode 100644
index 000000000..4f15e1aa2
--- /dev/null
+++ b/config/objects/magicWell.json
@@ -0,0 +1,39 @@
+{
+	"magicWell" : {
+		"index" :49,
+		"handler" : "configurable",
+		"base" : {
+			"sounds" : {
+				"visit" : ["FAERIE"]
+			}
+		},
+		"types" : {
+			"magicWell" : {
+				"index" : 0,
+				"aiValue" : 250,
+				"rmg" : {
+					"zoneLimit" : 1,
+					"value"		: 250,
+					"rarity"	: 100
+				},
+				"compatibilityIdentifiers" : [ "object" ],
+
+				"onEmptyMessage" : 79,
+				"onVisitedMessage" : 78,
+				"description" : "@core.xtrainfo.25",
+				"visitMode" : "bonus",
+				"selectMode" : "selectFirst",
+				"rewards" : [
+					{
+						"limiter" : {
+							"noneOf" : [ { "manaPercentage" : 100 } ]
+						},
+						"bonuses" : [ { "type" : "NONE", "duration" : "ONE_DAY"} ],
+						"message" : 77,
+						"manaPercentage" : 100
+					}
+				]	
+			},
+		}
+	}
+}
diff --git a/config/objects/observatory.json b/config/objects/observatory.json
new file mode 100644
index 000000000..c4999b4aa
--- /dev/null
+++ b/config/objects/observatory.json
@@ -0,0 +1,79 @@
+{
+	"redwoodObservatory" : {
+		"index" :58,
+		"handler" : "configurable",
+		"base" : {
+			"sounds" : {
+				"visit" : ["LIGHTHOUSE"]
+			}
+		},
+		"types" : {
+			"redwoodObservatory" : {
+				"index" : 0,
+				"aiValue" : 750,
+				"templates" :
+				{
+					"base" : { "animation" : "avxredw.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["grass", "swamp", "dirt", "sand", "lava", "rough"] },
+					"snow" : { "animation" : "avxreds0.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["snow"] }
+				},
+				"rmg" : {
+					"zoneLimit"	: 1,
+					"value"		: 750,
+					"rarity"	: 100
+				},
+				
+				"compatibilityIdentifiers" : [ "object" ],
+				"visitMode" : "unlimited",
+				"rewards" : [
+					{
+						"message" : 98,
+						"revealTiles" : {
+							"radius" : 20,
+							"surface" : 1,
+							"subterra" : 1,
+							"water" : 1,
+							"rock" : 1
+						}
+					}
+				]
+			}
+		}
+	},
+
+	"pillarOfFire" : {
+		"index" :60,
+		"handler" : "configurable",
+		"base" : {
+			"sounds" : {
+				"ambient" : ["LOOPFIRE"],
+				"visit" : ["LIGHTHOUSE"]
+			}
+		},
+		"types" : {
+			"pillarOfFire" : {
+				"index" : 0,
+				"aiValue" : 750,
+				"rmg" : {
+					"zoneLimit"	: 1,
+					"value"		: 750,
+					"rarity"	: 100
+				},
+				
+				"compatibilityIdentifiers" : [ "object" ],
+				"visitMode" : "unlimited",
+				"rewards" : [
+					{
+						"message" : 99,
+						"revealTiles" : {
+							"radius" : 20,
+							"surface" : 1,
+							"subterra" : 1,
+							"water" : 1,
+							"rock" : 1
+						}
+					}
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/config/objects/rewardableObservatories.json b/config/objects/rewardableObservatories.json
deleted file mode 100644
index 7e6d60fdf..000000000
--- a/config/objects/rewardableObservatories.json
+++ /dev/null
@@ -1,209 +0,0 @@
-{
-	"redwoodObservatory" : {
-		"index" :58,
-		"handler" : "configurable",
-		"base" : {
-			"sounds" : {
-				"visit" : ["LIGHTHOUSE"]
-			}
-		},
-		"types" : {
-			"redwoodObservatory" : {
-				"index" : 0,
-				"aiValue" : 750,
-				"templates" :
-				{
-					"base" : { "animation" : "avxredw.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["grass", "swamp", "dirt", "sand", "lava", "rough"] },
-					"snow" : { "animation" : "avxreds0.def", "visitableFrom" : [ "---", "+++", "+++" ], "mask" : [ "VV", "VV", "VA"], "allowedTerrains":["snow"] }
-				},
-				"rmg" : {
-					"zoneLimit"	: 1,
-					"value"		: 750,
-					"rarity"	: 100
-				},
-				
-				"compatibilityIdentifiers" : [ "object" ],
-				"visitMode" : "unlimited",
-				"rewards" : [
-					{
-						"message" : 98,
-						"revealTiles" : {
-							"radius" : 20,
-							"surface" : 1,
-							"subterra" : 1,
-							"water" : 1,
-							"rock" : 1
-						}
-					}
-				]
-			}
-		}
-	},
-
-	"pillarOfFire" : {
-		"index" :60,
-		"handler" : "configurable",
-		"base" : {
-			"sounds" : {
-				"ambient" : ["LOOPFIRE"],
-				"visit" : ["LIGHTHOUSE"]
-			}
-		},
-		"types" : {
-			"pillarOfFire" : {
-				"index" : 0,
-				"aiValue" : 750,
-				"rmg" : {
-					"zoneLimit"	: 1,
-					"value"		: 750,
-					"rarity"	: 100
-				},
-				
-				"compatibilityIdentifiers" : [ "object" ],
-				"visitMode" : "unlimited",
-				"rewards" : [
-					{
-						"message" : 99,
-						"revealTiles" : {
-							"radius" : 20,
-							"surface" : 1,
-							"subterra" : 1,
-							"water" : 1,
-							"rock" : 1
-						}
-					}
-				]
-			}
-		}
-	},
-
-	"coverOfDarkness" : {
-		"index" :15,
-		"handler" : "configurable",
-		"base" : {
-			"sounds" : {
-				"visit" : ["LIGHTHOUSE"]
-			}
-		},
-		"types" : {
-			"coverOfDarkness" : {
-				"index" : 0,
-				"aiValue" : 100,
-				"rmg" : {
-				},
-				
-				"compatibilityIdentifiers" : [ "object" ],
-				"visitMode" : "unlimited",
-				"rewards" : [
-					{
-						"message" : 31,
-						"revealTiles" : {
-							"radius" : 20,
-							"surface" : 1,
-							"subterra" : 1,
-							"water" : 1,
-							"rock" : 1,
-							"hide" : true
-						}
-					}
-				]
-			}
-		}
-	},
-	
-	"cartographer" : {
-		"index" :13,
-		"handler": "configurable",
-		"lastReservedIndex" : 2,
-		"base" : {
-			"sounds" : {
-				"visit" : ["LIGHTHOUSE"]
-			}
-		},
-		"types" : {
-			"cartographerWater" : {
-				"index" : 0,
-				"aiValue" : 5000,
-				"rmg" : {
-					"zoneLimit" : 1,
-					"value" : 5000,
-					"rarity" : 20
-				},
-				"compatibilityIdentifiers" : [ "water" ],
-				"visitMode" : "unlimited",
-				"canRefuse" : true,
-				"rewards" : [
-					{
-						"limiter" : { "resources" : { "gold" : 1000 } },
-						"message" : 25,
-						"resources" : {
-							"gold" : -1000
-						},
-						"revealTiles" : {
-							"water" : 1
-						}
-					}
-				],
-				"onEmptyMessage" : 28,
-				"onVisitedMessage" : 24
-			},
-			"cartographerLand" : {
-				"index" : 1,
-				"aiValue": 10000,
-				"rmg" : {
-					"zoneLimit" : 1,
-					"value" : 10000,
-					"rarity" : 2
-				},
-				"compatibilityIdentifiers" : [ "land" ],
-				"visitMode" : "unlimited",
-				"canRefuse" : true,
-				"rewards" : [
-					{
-						"limiter" : { "resources" : { "gold" : 1000 } },
-						"message" : 26,
-						"resources" : {
-							"gold" : -1000
-						},
-						"revealTiles" : {
-							"surface" : 1,
-							"water" : -1,
-							"rock" : -1
-						}
-					}
-				],
-				"onEmptyMessage" : 28,
-				"onVisitedMessage" : 24
-			},
-			"cartographerSubterranean" : {
-				"index" : 2,
-				"aiValue" : 7500,
-				"rmg" : {
-					"zoneLimit" : 1,
-					"value" : 7500,
-					"rarity" : 20
-				},
-				"compatibilityIdentifiers" : [ "subterra" ],
-				"visitMode" : "unlimited",
-				"canRefuse" : true,
-				"rewards" : [
-					{
-						"limiter" : { "resources" : { "gold" : 1000 } },
-						"message" : 27,
-						"resources" : {
-							"gold" : -1000
-						},
-						"revealTiles" : {
-							"subterra" : 1,
-							"water" : -1,
-							"rock" : -1,
-							"surface" : -1
-						}
-					}
-				],
-				"onEmptyMessage" : 28,
-				"onVisitedMessage" : 24
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/config/objects/rewardableOncePerWeek.json b/config/objects/rewardableOncePerWeek.json
index 110943c32..7b2005848 100644
--- a/config/objects/rewardableOncePerWeek.json
+++ b/config/objects/rewardableOncePerWeek.json
@@ -1,84 +1,4 @@
 {
-	/// These are objects that covered by concept of "configurable object" and have their entire configuration in this config
-	"magicWell" : {
-		"index" :49,
-		"handler" : "configurable",
-		"base" : {
-			"sounds" : {
-				"visit" : ["FAERIE"]
-			}
-		},
-		"types" : {
-			"magicWell" : {
-				"index" : 0,
-				"aiValue" : 250,
-				"rmg" : {
-					"zoneLimit" : 1,
-					"value"		: 250,
-					"rarity"	: 100
-				},
-				"compatibilityIdentifiers" : [ "object" ],
-
-				"onEmptyMessage" : 79,
-				"onVisitedMessage" : 78,
-				"description" : "@core.xtrainfo.25",
-				"visitMode" : "bonus",
-				"selectMode" : "selectFirst",
-				"rewards" : [
-					{
-						"limiter" : {
-							"noneOf" : [ { "manaPercentage" : 100 } ]
-						},
-						"bonuses" : [ { "type" : "NONE", "duration" : "ONE_DAY"} ],
-						"message" : 77,
-						"manaPercentage" : 100
-					}
-				]	
-			},
-		}
-	},
-	"magicSpring" : {
-		"index" : 48,
-		"handler": "configurable",
-		"base" : {
-			"sounds" : {
-				"ambient" : ["LOOPFOUN"],
-				"visit" : ["FAERIE"]
-			}
-		},
-		"types" : {
-			"magicSpring" : {
-				"index" : 0,
-				"aiValue" : 500,
-				//banned due to problems with 2 viistable offsets
-				//"rmg" : {
-				//	"zoneLimit"	: 1,
-				//	"value"		: 500,
-				//	"rarity"	: 50
-				//},
-				"compatibilityIdentifiers" : [ "object" ],
-
-				"onEmptyMessage" : 76,
-				"onVisitedMessage" : 75,
-				"description" : "@core.xtrainfo.15",
-				"resetParameters" : {
-					"period" : 7,
-					"visitors" : true
-				},
-				"visitMode" : "once",
-				"selectMode" : "selectFirst",
-				"rewards" : [
-					{
-						"limiter" : {
-							"noneOf" : [ { "manaPercentage" : 200 } ]
-						},
-						"message" : 74,
-						"manaPercentage" : 200
-					}
-				]				
-			}
-		}
-	},
 	"mysticalGarden" : {
 		"index" : 55,
 		"handler": "configurable",
diff --git a/config/objects/rewardableScholar.json b/config/objects/scholar.json
similarity index 100%
rename from config/objects/rewardableScholar.json
rename to config/objects/scholar.json
diff --git a/config/objects/rewardableShrine.json b/config/objects/shrine.json
similarity index 100%
rename from config/objects/rewardableShrine.json
rename to config/objects/shrine.json
diff --git a/config/objects/rewardableWitchHut.json b/config/objects/witchHut.json
similarity index 100%
rename from config/objects/rewardableWitchHut.json
rename to config/objects/witchHut.json