diff --git a/config.json b/config.json
index 4e4a66f8..f274eb04 100644
--- a/config.json
+++ b/config.json
@@ -60,7 +60,7 @@
     "Custom_Tile.2eca7c",
     "Custom_Tile.fb09d4",
     "3DText.65eb7e",
-    "setactiveinvestigators.f182ee",
+    "InvestigatorCount.f182ee",
     "ScriptingTrigger.c506bf",
     "ScriptingTrigger.cbc751",
     "ScriptingTrigger.57c22c",
diff --git a/objects/Clues.3f22e5.json b/objects/Clues.3f22e5.json
index b394e586..bbf004ea 100644
--- a/objects/Clues.3f22e5.json
+++ b/objects/Clues.3f22e5.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Clues.4111de.json b/objects/Clues.4111de.json
index 4b8bec86..af580566 100644
--- a/objects/Clues.4111de.json
+++ b/objects/Clues.4111de.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Clues.891403.json b/objects/Clues.891403.json
index 01cecada..ad7aa1ea 100644
--- a/objects/Clues.891403.json
+++ b/objects/Clues.891403.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Clues.db85d6.json b/objects/Clues.db85d6.json
index 4ee7f3ae..99bad15b 100644
--- a/objects/Clues.db85d6.json
+++ b/objects/Clues.db85d6.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Damage.1f5a0a.json b/objects/Damage.1f5a0a.json
index 43b01ca0..b97d7fd8 100644
--- a/objects/Damage.1f5a0a.json
+++ b/objects/Damage.1f5a0a.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Damage.591a45.json b/objects/Damage.591a45.json
index de4a7ec4..41937170 100644
--- a/objects/Damage.591a45.json
+++ b/objects/Damage.591a45.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Damage.e64eec.json b/objects/Damage.e64eec.json
index b139388e..1ea4da6b 100644
--- a/objects/Damage.e64eec.json
+++ b/objects/Damage.e64eec.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Damage.eb08d6.json b/objects/Damage.eb08d6.json
index a2cb8816..3e461e08 100644
--- a/objects/Damage.eb08d6.json
+++ b/objects/Damage.eb08d6.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Horror.0257d9.json b/objects/Horror.0257d9.json
index e6657372..6a9ab31a 100644
--- a/objects/Horror.0257d9.json
+++ b/objects/Horror.0257d9.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Horror.468e88.json b/objects/Horror.468e88.json
index 256b9c3a..cdda908d 100644
--- a/objects/Horror.468e88.json
+++ b/objects/Horror.468e88.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Horror.7b5729.json b/objects/Horror.7b5729.json
index 0b0509b0..ba06284c 100644
--- a/objects/Horror.7b5729.json
+++ b/objects/Horror.7b5729.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Horror.beb964.json b/objects/Horror.beb964.json
index 6c3e6c49..39d68205 100644
--- a/objects/Horror.beb964.json
+++ b/objects/Horror.beb964.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "0",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/setactiveinvestigators.f182ee.json b/objects/InvestigatorCount.f182ee.json
similarity index 96%
rename from objects/setactiveinvestigators.f182ee.json
rename to objects/InvestigatorCount.f182ee.json
index 2f494049..218ede08 100644
--- a/objects/setactiveinvestigators.f182ee.json
+++ b/objects/InvestigatorCount.f182ee.json
@@ -37,7 +37,7 @@
   "LuaScriptState": "2",
   "MeasureMovement": false,
   "Name": "Custom_Token",
-  "Nickname": "set active investigators\n",
+  "Nickname": "Investigator Count",
   "Snap": true,
   "Sticky": true,
   "Tooltip": true,
@@ -54,4 +54,4 @@
   },
   "Value": 0,
   "XmlUI": ""
-}
+}
\ No newline at end of file
diff --git a/objects/Resources.4406f0.json b/objects/Resources.4406f0.json
index 5329df96..d3ca7508 100644
--- a/objects/Resources.4406f0.json
+++ b/objects/Resources.4406f0.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "5",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Resources.816d84.json b/objects/Resources.816d84.json
index eadba42d..d95532fe 100644
--- a/objects/Resources.816d84.json
+++ b/objects/Resources.816d84.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "5",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Resources.a4b60d.json b/objects/Resources.a4b60d.json
index 2acfa04c..bfbec567 100644
--- a/objects/Resources.a4b60d.json
+++ b/objects/Resources.a4b60d.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "5",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/objects/Resources.cd15ac.json b/objects/Resources.cd15ac.json
index eeafff2b..d232153d 100644
--- a/objects/Resources.cd15ac.json
+++ b/objects/Resources.cd15ac.json
@@ -33,7 +33,7 @@
   "IgnoreFoW": false,
   "LayoutGroupSortIndex": 0,
   "Locked": true,
-  "LuaScript": "require(\"playermat/GenericCounter\")",
+  "LuaScript": "require(\"core/GenericCounter\")",
   "LuaScriptState": "5",
   "MeasureMovement": false,
   "Name": "Custom_Token",
diff --git a/src/core/ActiveInvestigatorCounter.ttslua b/src/core/ActiveInvestigatorCounter.ttslua
index 82d3388f..e075d01e 100644
--- a/src/core/ActiveInvestigatorCounter.ttslua
+++ b/src/core/ActiveInvestigatorCounter.ttslua
@@ -1,3 +1,3 @@
-require("playermat/GenericCounter")
+require("core/GenericCounter")
 MIN_VALUE = 1
 MAX_VALUE = 4
diff --git a/src/playermat/GenericCounter.ttslua b/src/core/GenericCounter.ttslua
similarity index 100%
rename from src/playermat/GenericCounter.ttslua
rename to src/core/GenericCounter.ttslua