diff --git a/collate.py b/collate.py
index a47b4a45..5ba0731a 100755
--- a/collate.py
+++ b/collate.py
@@ -4,6 +4,7 @@
 import csv
 import json
 import os
+import pathlib
 import sys
 from os.path import isfile
 from traceback import print_exc
@@ -38,7 +39,7 @@ def addcommodities(data) -> None:  # noqa: CCR001
     if not data['lastStarport'].get('commodities'):
         return
 
-    commodityfile = 'commodity.csv'
+    commodityfile = pathlib.Path('FDevIDs/commodity.csv')
     commodities = {}
 
     # slurp existing
diff --git a/companion.py b/companion.py
index 9a175a1d..91b306e3 100644
--- a/companion.py
+++ b/companion.py
@@ -22,7 +22,6 @@ import urllib.parse
 import webbrowser
 from builtins import object, range, str
 from email.utils import parsedate
-from os.path import join
 from queue import Queue
 from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Optional, OrderedDict, TypeVar, Union
 
@@ -1065,7 +1064,7 @@ def fixup(data: CAPIData) -> CAPIData:  # noqa: C901, CCR001 # Can't be usefully
     if not commodity_map:
         # Lazily populate
         for f in ('commodity.csv', 'rare_commodity.csv'):
-            with open(join(config.respath_path, f), 'r') as csvfile:
+            with open(config.respath_path / 'FDevIDs' / f, 'r') as csvfile:
                 reader = csv.DictReader(csvfile)
 
                 for row in reader:
diff --git a/setup.py b/setup.py
index 8bb8fb30..4a9ed68d 100755
--- a/setup.py
+++ b/setup.py
@@ -144,8 +144,10 @@ if sys.platform == 'darwin':
                 ('plugins', x) for x in PLUGINS
             ],
             'resources': [
-                'commodity.csv',
-                'rare_commodity.csv',
+                '.gitversion',  # Contains git short hash
+                'ChangeLog.md',
+                join('FDevIDs', 'commodity.csv'),
+                join('FDevIDs', 'rare_commodity.csv'),
                 'snd_good.wav',
                 'snd_bad.wav',
                 'modules.p',
@@ -213,8 +215,8 @@ elif sys.platform == 'win32':
             'WinSparkle.pdb',  # For debugging - don't include in package
             'EUROCAPS.TTF',
             'ChangeLog.md',
-            'commodity.csv',
-            'rare_commodity.csv',
+            join('FDevIDs', 'commodity.csv'),
+            join('FDevIDs', 'rare_commodity.csv'),
             'snd_good.wav',
             'snd_bad.wav',
             'modules.p',