diff --git a/gamedir/Data-UB/TableData/MercStartingGear25.xml b/gamedir/Data-UB/TableData/Inventory/MercStartingGear25.xml
similarity index 100%
rename from gamedir/Data-UB/TableData/MercStartingGear25.xml
rename to gamedir/Data-UB/TableData/Inventory/MercStartingGear25.xml
diff --git a/gamedir/Data-UB/TableData/NPCInventory/TinaInventory.xml b/gamedir/Data-UB/TableData/NPCInventory/TinaInventory.xml
deleted file mode 100644
index ce847da38..000000000
--- a/gamedir/Data-UB/TableData/NPCInventory/TinaInventory.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>1607</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>1608</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>1609</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>1610</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>1611</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>1612</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>1613</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>1615</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>1616</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>1617</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>1619</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>1621</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>1622</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>	
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>1079</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>1080</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>1081</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>1082</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>17</uiIndex>
-		<sItemIndex>1083</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>18</uiIndex>
-		<sItemIndex>1084</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>19</uiIndex>
-		<sItemIndex>1086</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>20</uiIndex>
-		<sItemIndex>1087</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>21</uiIndex>
-		<sItemIndex>1088</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>22</uiIndex>
-		<sItemIndex>1089</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>23</uiIndex>
-		<sItemIndex>1090</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>24</uiIndex>
-		<sItemIndex>1091</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>25</uiIndex>
-		<sItemIndex>1093</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>26</uiIndex>
-		<sItemIndex>1094</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>27</uiIndex>
-		<sItemIndex>1095</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>28</uiIndex>
-		<sItemIndex>1096</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>29</uiIndex>
-		<sItemIndex>1097</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>30</uiIndex>
-		<sItemIndex>1098</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>31</uiIndex>
-		<sItemIndex>1099</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>32</uiIndex>
-		<sItemIndex>311</sItemIndex>
-		<ubOptimalNumber>10</ubOptimalNumber>
-	</INVENTORY>
-</INVENTORYLIST>
\ No newline at end of file