diff --git a/Wavebreakers/ChopShopData/AWG Small Conveyor/bp.sbc b/Wavebreakers/ChopShopData/AWG Small Conveyor/bp.sbc
deleted file mode 100644
index 7b3397b..0000000
--- a/Wavebreakers/ChopShopData/AWG Small Conveyor/bp.sbc	
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-<Definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <ShipBlueprints>
-    <ShipBlueprint xsi:type="MyObjectBuilder_ShipBlueprintDefinition">
-      <Id Type="MyObjectBuilder_ShipBlueprintDefinition" Subtype="AWG Small Conveyor" />
-      <DisplayName>Mekrath [597TH ADR]</DisplayName>
-      <CubeGrids>
-        <CubeGrid>
-          <SubtypeName />
-          <EntityId>89190390127368242</EntityId>
-          <PersistentFlags>CastShadows InScene</PersistentFlags>
-          <Name>89190390127368242</Name>
-          <PositionAndOrientation>
-            <Position x="0" y="0" z="0" />
-            <Forward x="-0.566720665" y="0.810417" z="-0.148499131" />
-            <Up x="0.622723" y="0.303304076" z="-0.72126466" />
-            <Orientation>
-              <X>0.0466691</X>
-              <Y>0.6508244</Y>
-              <Z>-0.5883621</Z>
-              <W>0.477576822</W>
-            </Orientation>
-          </PositionAndOrientation>
-          <LocalPositionAndOrientation xsi:nil="true" />
-          <GridSizeEnum>Small</GridSizeEnum>
-          <CubeBlocks>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>AWGConveyorQuadJunction2</SubtypeName>
-              <EntityId>112475721739116083</EntityId>
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>AWGConveyorStraight</SubtypeName>
-              <EntityId>116972014731228712</EntityId>
-              <Min x="0" y="1" z="0" />
-              <BlockOrientation Forward="Up" Up="Right" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>AWGConveyor45</SubtypeName>
-              <EntityId>124752460769084404</EntityId>
-              <Min x="0" y="2" z="0" />
-              <BlockOrientation Forward="Right" Up="Up" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>AWGConveyorTJunction</SubtypeName>
-              <EntityId>83630287043156189</EntityId>
-              <Min x="0" y="0" z="1" />
-              <BlockOrientation Forward="Forward" Up="Right" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-          </CubeBlocks>
-          <ConveyorLines>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="0" z="0" />
-              <StartDirection>Up</StartDirection>
-              <EndPosition x="0" y="1" z="0" />
-              <EndDirection>Down</EndDirection>
-              <Sections />
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="1" z="0" />
-              <StartDirection>Up</StartDirection>
-              <EndPosition x="0" y="2" z="0" />
-              <EndDirection>Down</EndDirection>
-              <Sections />
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="0" z="0" />
-              <StartDirection>Backward</StartDirection>
-              <EndPosition x="0" y="0" z="1" />
-              <EndDirection>Forward</EndDirection>
-              <Sections />
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-          </ConveyorLines>
-          <DisplayName>AWG Small Conveyor</DisplayName>
-          <DestructibleBlocks>true</DestructibleBlocks>
-          <CreatePhysics>false</CreatePhysics>
-          <EnableSmallToLargeConnections>false</EnableSmallToLargeConnections>
-          <IsRespawnGrid>false</IsRespawnGrid>
-          <LocalCoordSys>0</LocalCoordSys>
-          <TargetingTargets />
-          <NPCGridClaimElapsed xsi:nil="true" />
-        </CubeGrid>
-      </CubeGrids>
-      <EnvironmentType>None</EnvironmentType>
-      <WorkshopId>0</WorkshopId>
-      <OwnerSteamId>76561198406231217</OwnerSteamId>
-      <Points>0</Points>
-    </ShipBlueprint>
-  </ShipBlueprints>
-</Definitions>
\ No newline at end of file
diff --git a/Wavebreakers/ChopShopData/AWG Small Conveyor/thumb.png b/Wavebreakers/ChopShopData/AWG Small Conveyor/thumb.png
deleted file mode 100644
index 5cd8ae0..0000000
Binary files a/Wavebreakers/ChopShopData/AWG Small Conveyor/thumb.png and /dev/null differ
diff --git a/Wavebreakers/ChopShopData/SE Small Conveyor/bp.sbc b/Wavebreakers/ChopShopData/SE Small Conveyor/bp.sbc
deleted file mode 100644
index 7a6d97e..0000000
--- a/Wavebreakers/ChopShopData/SE Small Conveyor/bp.sbc	
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<Definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <ShipBlueprints>
-    <ShipBlueprint xsi:type="MyObjectBuilder_ShipBlueprintDefinition">
-      <Id Type="MyObjectBuilder_ShipBlueprintDefinition" Subtype="SE Small Conveyor" />
-      <DisplayName>Mekrath [597TH ADR]</DisplayName>
-      <CubeGrids>
-        <CubeGrid>
-          <SubtypeName />
-          <EntityId>125104617074641272</EntityId>
-          <PersistentFlags>CastShadows InScene</PersistentFlags>
-          <Name>125104617074641272</Name>
-          <PositionAndOrientation>
-            <Position x="0" y="0" z="0" />
-            <Forward x="0.822244763" y="0.3944743" z="-0.4102482" />
-            <Up x="0.5032392" y="-0.840603352" z="0.200340718" />
-            <Orientation>
-              <X>-0.5395666</X>
-              <Y>-0.061186675</Y>
-              <Z>0.7932021</Z>
-              <W>-0.2755985</W>
-            </Orientation>
-          </PositionAndOrientation>
-          <LocalPositionAndOrientation xsi:nil="true" />
-          <GridSizeEnum>Small</GridSizeEnum>
-          <CubeBlocks>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>SmallBlockConveyor</SubtypeName>
-              <EntityId>90755862412839297</EntityId>
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_ConveyorConnector">
-              <SubtypeName>ConveyorTubeSmall</SubtypeName>
-              <EntityId>112235977686383502</EntityId>
-              <Min x="0" y="1" z="0" />
-              <BlockOrientation Forward="Down" Up="Forward" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_ConveyorConnector">
-              <SubtypeName>ConveyorTubeSmallCurved</SubtypeName>
-              <EntityId>141090608889278544</EntityId>
-              <Min x="0" y="2" z="0" />
-              <BlockOrientation Forward="Left" Up="Up" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_Conveyor">
-              <SubtypeName>ConveyorTubeSmallT</SubtypeName>
-              <EntityId>82135977332854296</EntityId>
-              <Min x="0" y="0" z="1" />
-              <BlockOrientation Forward="Backward" Up="Down" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-            </MyObjectBuilder_CubeBlock>
-            <MyObjectBuilder_CubeBlock xsi:type="MyObjectBuilder_ShipConnector">
-              <SubtypeName>ConnectorSmall</SubtypeName>
-              <EntityId>108424592429867469</EntityId>
-              <Min x="0" y="1" z="1" />
-              <BlockOrientation Forward="Up" Up="Backward" />
-              <ColorMaskHSV x="0.594444454" y="-0.64" z="-0.28" />
-              <SkinSubtypeId>Battered_Armor</SkinSubtypeId>
-              <Owner>144115188075855895</Owner>
-              <ShareMode>Faction</ShareMode>
-              <DeformationRatio>0.5</DeformationRatio>
-              <ComponentContainer>
-                <Components>
-                  <ComponentData>
-                    <TypeId>MyInventoryBase</TypeId>
-                    <Component xsi:type="MyObjectBuilder_Inventory">
-                      <CanPutItems>true</CanPutItems>
-                      <Items />
-                      <nextItemId>0</nextItemId>
-                      <Volume>0.064</Volume>
-                      <Mass>9223372036854.775807</Mass>
-                      <MaxItemCount>2147483647</MaxItemCount>
-                      <Size xsi:nil="true" />
-                      <InventoryFlags>CanReceive CanSend</InventoryFlags>
-                      <RemoveEntityOnEmpty>false</RemoveEntityOnEmpty>
-                    </Component>
-                  </ComponentData>
-                  <ComponentData>
-                    <TypeId>MyTimerComponent</TypeId>
-                    <Component xsi:type="MyObjectBuilder_TimerComponent">
-                      <Repeat>true</Repeat>
-                      <TimeToEvent>0</TimeToEvent>
-                      <SetTimeMinutes>0</SetTimeMinutes>
-                      <TimerEnabled>true</TimerEnabled>
-                      <RemoveEntityOnTimer>false</RemoveEntityOnTimer>
-                      <TimerType>Frame10</TimerType>
-                      <FramesFromLastTrigger>40</FramesFromLastTrigger>
-                      <TimerTickInFrames>80</TimerTickInFrames>
-                      <IsSessionUpdateEnabled>false</IsSessionUpdateEnabled>
-                    </Component>
-                  </ComponentData>
-                </Components>
-              </ComponentContainer>
-              <ShowOnHUD>false</ShowOnHUD>
-              <ShowInTerminal>true</ShowInTerminal>
-              <ShowInToolbarConfig>true</ShowInToolbarConfig>
-              <ShowInInventory>true</ShowInInventory>
-              <NumberInGrid>1</NumberInGrid>
-              <Enabled>true</Enabled>
-              <MasterToSlaveTransform xsi:nil="true" />
-              <MasterToSlaveGrid xsi:nil="true" />
-              <IsMaster>true</IsMaster>
-              <TradingEnabled>false</TradingEnabled>
-              <AutoUnlockTime>0</AutoUnlockTime>
-              <TimeOfConnection>0</TimeOfConnection>
-              <IsParkingEnabled>true</IsParkingEnabled>
-              <IsPowerTransferOverrideEnabled>false</IsPowerTransferOverrideEnabled>
-              <IsApproaching>false</IsApproaching>
-              <IsConnecting>false</IsConnecting>
-            </MyObjectBuilder_CubeBlock>
-          </CubeBlocks>
-          <ConveyorLines>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="0" z="0" />
-              <StartDirection>Up</StartDirection>
-              <EndPosition x="1" y="2" z="0" />
-              <EndDirection>Left</EndDirection>
-              <Sections>
-                <Section Direction="Up" Length="2" />
-                <Section Direction="Right" Length="1" />
-              </Sections>
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="0" z="0" />
-              <StartDirection>Backward</StartDirection>
-              <EndPosition x="0" y="0" z="1" />
-              <EndDirection>Forward</EndDirection>
-              <Sections />
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-            <MyObjectBuilder_ConveyorLine>
-              <StartPosition x="0" y="0" z="1" />
-              <StartDirection>Up</StartDirection>
-              <EndPosition x="0" y="1" z="1" />
-              <EndDirection>Down</EndDirection>
-              <Sections />
-              <ConveyorLineType>SMALL_LINE</ConveyorLineType>
-            </MyObjectBuilder_ConveyorLine>
-          </ConveyorLines>
-          <DisplayName>SE Small Conveyor</DisplayName>
-          <DestructibleBlocks>true</DestructibleBlocks>
-          <CreatePhysics>false</CreatePhysics>
-          <EnableSmallToLargeConnections>false</EnableSmallToLargeConnections>
-          <IsRespawnGrid>false</IsRespawnGrid>
-          <LocalCoordSys>0</LocalCoordSys>
-          <TargetingTargets />
-          <NPCGridClaimElapsed xsi:nil="true" />
-        </CubeGrid>
-      </CubeGrids>
-      <EnvironmentType>None</EnvironmentType>
-      <WorkshopId>0</WorkshopId>
-      <OwnerSteamId>76561198406231217</OwnerSteamId>
-      <Points>0</Points>
-    </ShipBlueprint>
-  </ShipBlueprints>
-</Definitions>
\ No newline at end of file
diff --git a/Wavebreakers/ChopShopData/SE Small Conveyor/thumb.png b/Wavebreakers/ChopShopData/SE Small Conveyor/thumb.png
deleted file mode 100644
index 42f0493..0000000
Binary files a/Wavebreakers/ChopShopData/SE Small Conveyor/thumb.png and /dev/null differ
diff --git a/Wavebreakers/chopshop.json b/Wavebreakers/chopshop.json
index 25dc3b1..d50b550 100644
--- a/Wavebreakers/chopshop.json
+++ b/Wavebreakers/chopshop.json
@@ -1,17 +1,29 @@
 {
-    "smallgrid": [
-      {
-        "repl": "SmallBlockArmor(\\w+)",
-        "with": "CAP_Armor$1"
-      },
-      {
-        "repl": "Half(\\w+)",
-        "with": "CAP_Half$1"
-      },
-      {
-        "repl": "ConveyorTubeSmallT",
-        "with": "AWGConveyorTJunction"
-      }
-    ],
-    "largegrid": []
-  }
\ No newline at end of file
+  "smallgrid": [
+    {
+      "repl": "SmallBlockArmor(\\w+)",
+      "with": "CAP_Armor$1"
+    },
+    {
+      "repl": "Half(\\w+)",
+      "with": "CAP_Half$1"
+    },
+    {
+      "repl": "ConveyorTubeSmallT",
+      "with": "AWGConveyorCube"
+    },
+    {
+      "repl": "ConveyorTubeSmallCurved",
+      "with": "AWGConveyorCube"
+    },
+    {
+      "repl": "ConveyorTubeSmall",
+      "with": "AWGConveyorStraight"
+    },
+    {
+      "repl": "SmallBlockConveyor",
+      "with": "AWGConveyorCube"
+    }
+  ],
+  "largegrid": []
+}