diff --git a/resources/NMREDEYE/__resource.lua b/resources/NMREDEYE/__resource.lua
deleted file mode 100644
index d780a7fcb..000000000
--- a/resources/NMREDEYE/__resource.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
-
-files {
-
-'handling.meta',
-'vehicles.meta',
-'carvariations.meta',
-'carcols.meta',
-'audioconfig/aq07powerstroke67_game.dat151.rel',
-'audioconfig/aq07powerstroke67_sounds.dat54.rel',
-'sfx/dlc_aq07powerstroke67/aq07powerstroke67.awc',
-'sfx/dlc_aq07powerstroke67/aq07powerstroke67_npc.awc',
-	
-}
-
-data_file 'HANDLING_FILE' 'handling.meta'
-data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
-data_file 'CARCOLS_FILE' 'carcols.meta'
-data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
-data_file 'AUDIO_GAMEDATA' 'audioconfig/aq07powerstroke67_game.dat'
-data_file 'AUDIO_SOUNDDATA' 'audioconfig/aq07powerstroke67_sounds.dat'
-data_file 'AUDIO_WAVEPACK' 'sfx/dlc_aq07powerstroke67'
-
--- specfiy the names of the items being added within this (same as in the lang file in a dlc pack(kinda, the formatting is different))
-client_script 'names.lua'
\ No newline at end of file
diff --git a/resources/NMREDEYE/audioconfig/lg81hcredeye_game.dat151.rel b/resources/NMREDEYE/audioconfig/lg81hcredeye_game.dat151.rel
deleted file mode 100644
index 09d8a7bec..000000000
Binary files a/resources/NMREDEYE/audioconfig/lg81hcredeye_game.dat151.rel and /dev/null differ
diff --git a/resources/NMREDEYE/audioconfig/lg81hcredeye_sounds.dat54.rel b/resources/NMREDEYE/audioconfig/lg81hcredeye_sounds.dat54.rel
deleted file mode 100644
index 78731e15d..000000000
Binary files a/resources/NMREDEYE/audioconfig/lg81hcredeye_sounds.dat54.rel and /dev/null differ
diff --git a/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye.awc b/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye.awc
deleted file mode 100644
index 33cdb10f6..000000000
Binary files a/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye.awc and /dev/null differ
diff --git a/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc b/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc
deleted file mode 100644
index d75e85124..000000000
Binary files a/resources/NMREDEYE/sfx/dlc_lg81hcredeye/lg81hcredeye_npc.awc and /dev/null differ
diff --git a/resources/b407/__resource.lua b/resources/b407/__resource.lua
index 489b76421..fff0be1b8 100644
--- a/resources/b407/__resource.lua
+++ b/resources/b407/__resource.lua
@@ -1,22 +1,15 @@
 resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
- 
+
 files {
-    'vehiclelayouts.meta',
-	'vehicles.meta',
+    'vehicles.meta',
     'carvariations.meta',
     'carcols.meta',
     'handling.meta',
-    
+	'vehiclelayouts.meta',
 }
 
-data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'
 data_file 'HANDLING_FILE' 'handling.meta'
 data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
 data_file 'CARCOLS_FILE' 'carcols.meta'
 data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
-
-
-
--- client_script {
---     'client.lua'    -- Not Required
--- }
\ No newline at end of file
+data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'
\ No newline at end of file
diff --git a/resources/jayhawk/__resource.lua b/resources/b429/__resource.lua
similarity index 67%
rename from resources/jayhawk/__resource.lua
rename to resources/b429/__resource.lua
index 86f6524b7..fff0be1b8 100644
--- a/resources/jayhawk/__resource.lua
+++ b/resources/b429/__resource.lua
@@ -1,13 +1,15 @@
 resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
 
--- Leaked By: Leaking Hub | J. Snow | https://discord.gg/aXWXXst 
-
 files {
     'vehicles.meta',
     'carvariations.meta',
     'carcols.meta',
+    'handling.meta',
+	'vehiclelayouts.meta',
 }
 
+data_file 'HANDLING_FILE' 'handling.meta'
 data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
 data_file 'CARCOLS_FILE' 'carcols.meta'
 data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
+data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'
\ No newline at end of file
diff --git a/resources/hpcmd21/__resource.lua b/resources/hpcmd21/__resource.lua
new file mode 100644
index 000000000..fff0be1b8
--- /dev/null
+++ b/resources/hpcmd21/__resource.lua
@@ -0,0 +1,15 @@
+resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
+
+files {
+    'vehicles.meta',
+    'carvariations.meta',
+    'carcols.meta',
+    'handling.meta',
+	'vehiclelayouts.meta',
+}
+
+data_file 'HANDLING_FILE' 'handling.meta'
+data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
+data_file 'CARCOLS_FILE' 'carcols.meta'
+data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
+data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'
\ No newline at end of file
diff --git a/resources/jayhawk/carvariations.meta b/resources/jayhawk/carvariations.meta
deleted file mode 100644
index 25b1f9553..000000000
--- a/resources/jayhawk/carvariations.meta
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<CVehicleModelInfoVariation>
-  <variationData>
-    <Item>
-      <modelName>jayhawk</modelName>
-      <colors>
-        <Item>
-          <indices content="char_array">
-            14 
-            14 
-            14 
-            14 
-          </indices>
-          <liveries>
-            <Item value="true" />
-            <Item value="false" />
-            <Item value="false" />
-            <Item value="false" />
-            <Item value="false" />
-            <Item value="false" />
-            <Item value="false" />
-            <Item value="false" />
-          </liveries>
-        </Item>
-      </colors>
-      <kits />
-      <windowsWithExposedEdges />
-      <plateProbabilities>
-        <Probabilities />
-      </plateProbabilities>
-      <lightSettings value="18" />
-      <sirenSettings value="0" />
-    </Item>
-  </variationData>
-</CVehicleModelInfoVariation>
\ No newline at end of file
diff --git a/resources/jayhawk/dlctext.meta b/resources/jayhawk/dlctext.meta
deleted file mode 100644
index 22bb4c390..000000000
--- a/resources/jayhawk/dlctext.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<CExtraTextMetaFile>
-	<hasGlobalTextFile value="true"/>
-	<hasAdditionalText value="false"/>
-	<isTitleUpdate value="false"/>
-</CExtraTextMetaFile>
\ No newline at end of file
diff --git a/resources/jayhawk/handling.meta b/resources/jayhawk/handling.meta
deleted file mode 100644
index 043b88680..000000000
--- a/resources/jayhawk/handling.meta
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<CHandlingDataMgr>
-  <HandlingData>
-    <Item type="CHandlingData">
-      <handlingName>JAYHAWK</handlingName>
-      <fMass value="9580.000000" />
-      <fInitialDragCoeff value="10.000000" />
-      <fPercentSubmerged value="75.000000" />
-      <vecCentreOfMassOffset x="0.000000" y="0.000000" z="0.000000" />
-      <vecInertiaMultiplier x="1.000000" y="1.000000" z="1.000000" />
-      <fDriveBiasFront value="0.000000" />
-      <nInitialDriveGears value="1" />
-      <fInitialDriveForce value="0.300000" />
-      <fDriveInertia value="1.000000" />
-      <fClutchChangeRateScaleUpShift value="1.300000" />
-      <fClutchChangeRateScaleDownShift value="1.300000" />
-      <fInitialDriveMaxFlatVel value="205.000000" />
-      <fBrakeForce value="0.400000" />
-      <fBrakeBiasFront value="0.600000" />
-      <fHandBrakeForce value="0.700000" />
-      <fSteeringLock value="35.000000" />
-      <fTractionCurveMax value="1.300000" />
-      <fTractionCurveMin value="1.200000" />
-      <fTractionCurveLateral value="12.000000" />
-      <fTractionSpringDeltaMax value="0.100000" />
-      <fLowSpeedTractionLossMult value="0.000000" />
-      <fCamberStiffnesss value="0.000000" />
-      <fTractionBiasFront value="0.500000" />
-      <fTractionLossMult value="1.000000" />
-      <fSuspensionForce value="2.000000" />
-      <fSuspensionCompDamp value="2.000000" />
-      <fSuspensionReboundDamp value="2.000000" />
-      <fSuspensionUpperLimit value="0.200000" />
-      <fSuspensionLowerLimit value="-0.100000" />
-      <fSuspensionRaise value="0.000000" />
-      <fSuspensionBiasFront value="0.850000" />
-      <fAntiRollBarForce value="0.000000" />
-      <fAntiRollBarBiasFront value="0.000000" />
-      <fRollCentreHeightFront value="0.000000" />
-      <fRollCentreHeightRear value="0.000000" />
-      <fCollisionDamageMult value="1.500000" />
-      <fWeaponDamageMult value="0.500000" />
-      <fDeformationDamageMult value="3.000000" />
-      <fEngineDamageMult value="1.500000" />
-      <fPetrolTankVolume value="100.000000" />
-      <fOilVolume value="8.000000" />
-      <fSeatOffsetDistX value="0.000000" />
-      <fSeatOffsetDistY value="0.000000" />
-      <fSeatOffsetDistZ value="0.000000" />
-      <nMonetaryValue value="52000" />
-      <strModelFlags>2022000</strModelFlags>
-      <strHandlingFlags>401000</strHandlingFlags>
-      <strDamageFlags>20</strDamageFlags>
-      <AIHandling>AVERAGE</AIHandling>
-      <SubHandlingData>
-        <Item type="CFlyingHandlingData">
-          <fThrust value="0.470000" />
-          <fThrustFallOff value="0.035000" />
-          <fThrustVectoring value="0.300000" />
-          <fYawMult value="-1.050000" />
-          <fYawStabilise value="0.000700" />
-          <fSideSlipMult value="0.004000" />
-          <fRollMult value="1.350000" />
-          <fRollStabilise value="0.012000" />
-          <fPitchMult value="1.500000" />
-          <fPitchStabilise value="0.002000" />
-          <fFormLiftMult value="0.800000" />
-          <fAttackLiftMult value="2.500000" />
-          <fAttackDiveMult value="2.500000" />
-          <fGearDownDragV value="0.100000" />
-          <fGearDownLiftMult value="1.000000" />
-          <fWindMult value="0.000250" />
-          <fMoveRes value="0.050000" />
-          <vecTurnRes x="0.750000" y="0.650000" z="0.750000" />
-          <vecSpeedRes x="0.500000" y="0.500000" z="0.700000" />
-          <fGearDoorFrontOpen value="90.000000" />
-          <fGearDoorRearOpen value="90.000000" />
-          <fGearDoorRearOpen2 value="90.000000" />
-          <fGearDoorRearMOpen value="90.000000" />
-          <fTurublenceMagnitudeMax value="0.000000" />
-          <fTurublenceForceMulti value="0.000000" />
-          <fTurublenceRollTorqueMulti value="0.000000" />
-          <fTurublencePitchTorqueMulti value="0.000000" />
-          <fBodyDamageControlEffectMult value="0.500000" />
-          <fInputSensitivityForDifficulty value="0.180000" />
-          <fOnGroundYawBoostSpeedPeak value="1.000000" />
-          <fOnGroundYawBoostSpeedCap value="1.000000" />
-          <fEngineOffGlideMulti value="1.000000" />
-          <handlingType>HANDLING_TYPE_FLYING</handlingType>
-        </Item>
-        <Item type="CVehicleWeaponHandlingData">
-          <uWeaponHash>
-						<Item>VEHICLE_WEAPON_USCG_LIGHT</Item>
-            <Item>VEHICLE_WEAPON_USCG_LIGHT</Item>
-            <Item>VEHICLE_WEAPON_SEARCHLIGHT</Item>
-          </uWeaponHash>
-          <WeaponSeats content="int_array">
-            0 
-            1 
-            0 
-          </WeaponSeats>
-          <fTurretSpeed content="float_array">
-            15.000000
-			15.000000
-          </fTurretSpeed>
-          <fTurretPitchMin content="float_array">
-             -1.500000
-			 -1.500000
-          </fTurretPitchMin>
-          <fTurretPitchMax content="float_array">
-            0.707000
-			0.707000
-          </fTurretPitchMax>
-          <fTurretCamPitchMin content="float_array">
-             -1.500000
-			 -1.500000
-          </fTurretCamPitchMin>
-          <fTurretCamPitchMax content="float_array">
-            0.707000
-			0.707000
-          </fTurretCamPitchMax>
-          <fBulletVelocityForGravity content="float_array">
-            25.000000
-			25.000000
-          </fBulletVelocityForGravity>
-          <fTurretPitchForwardMin content="float_array">
-             -1.500000
-			 -1.500000
-          </fTurretPitchForwardMin>
-          <fUvAnimationMult value="0.000000" />
-          <fMiscGadgetVar value="0.000000" />
-          <fWheelImpactOffset value="0.000000" />
-        </Item>
-        <Item type="NULL" />
-      </SubHandlingData>
-    </Item>
-  </HandlingData>
-</CHandlingDataMgr>
\ No newline at end of file
diff --git a/resources/jayhawk/stream/jayhawk.yft b/resources/jayhawk/stream/jayhawk.yft
deleted file mode 100644
index cce53a13e..000000000
--- a/resources/jayhawk/stream/jayhawk.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:212a322ee1f080f5c2b43d733f8b564d23045fc14c47b4a53080761b4141a36b
-size 3390126
diff --git a/resources/jayhawk/stream/jayhawk.ytd b/resources/jayhawk/stream/jayhawk.ytd
deleted file mode 100644
index a364678bf..000000000
--- a/resources/jayhawk/stream/jayhawk.ytd
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5d1a50099601b8ed08c775c69c20777707b1a3019870ccca76bbe87d8bc2f65
-size 9737765
diff --git a/resources/jayhawk/stream/jayhawk_hi.yft b/resources/jayhawk/stream/jayhawk_hi.yft
deleted file mode 100644
index 84313dbc9..000000000
--- a/resources/jayhawk/stream/jayhawk_hi.yft
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a65c2c58192b37a60e9df4200b159719faf54bc8b74f4654657f371f86e7939a
-size 2391768
diff --git a/resources/jayhawk/vehiclelayouts.meta b/resources/jayhawk/vehiclelayouts.meta
deleted file mode 100644
index 9723fc51f..000000000
--- a/resources/jayhawk/vehiclelayouts.meta
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<CVehicleMetadataMgr>
-  <VehicleLayoutInfos>
-  <Item type="CVehicleLayoutInfo">
-	  <Name>LAYOUT_HELI_JAYHAWK</Name>
-	  <Seats>
-		<!-- Pilot -->
-		<Item>
-		  <SeatInfo ref="SEAT_STANDARD_FRONT_LEFT" />
-		  <SeatAnimInfo ref="SEAT_ANIM_HELI_FRONT_LEFT" />
-		</Item>
-		<!-- copilot -->
-		<Item>
-		  <SeatInfo ref="SEAT_STANDARD_FRONT_RIGHT" />
-		  <SeatAnimInfo ref="SEAT_ANIM_HELI_FRONT_RIGHT" />
-		</Item>
-		<!-- left side jump seat 1 -->
-		<Item>
-		  <SeatInfo ref="SEAT_STANDARD_REAR_LEFT" />
-		  <SeatAnimInfo ref="SEAT_ANIM_HELI_REAR_LEFT" />
-		</Item>
-		<!-- right side door -->
-		<Item>
-		  <SeatInfo ref="SEAT_STANDARD_REAR_RIGHT" />
-		  <SeatAnimInfo ref="SEAT_ANIM_HELI_REAR_RIGHT" />
-		</Item>
-		<!-- left rear jump seat -->
-		<Item>
-		  <SeatInfo ref="SEAT_EXTRA_NO_SHUFFLE_LEFT_1" />
-		  <SeatAnimInfo ref="SEAT_ANIM_PLANE_TITAN_LEFT" />
-		</Item>
-		<!-- right rear jump seat -->
-		<Item>
-		  <SeatInfo ref="SEAT_EXTRA_NO_SHUFFLE_RIGHT_1" />
-		  <SeatAnimInfo ref="SEAT_ANIM_PLANE_TITAN_RIGHT" />
-		</Item>
-		<!-- left side jump seat 2 -->
-		<Item>
-		  <SeatInfo ref="SEAT_EXTRA_NO_SHUFFLE_LEFT_2" />
-		  <SeatAnimInfo ref="SEAT_ANIM_PLANE_TITAN_LEFT" />
-		</Item>
-		<!-- stretcher -->
-		<Item>
-		  <SeatInfo ref="SEAT_EXTRA_NO_SHUFFLE_RIGHT_2" />
-		  <SeatAnimInfo ref="SEAT_ANIM_LOW_FRONT_RIGHT" />
-		</Item>
-	  </Seats>
-	  <EntryPoints>
-		<!-- driver seat -->
-		<Item>
-		  <EntryPointInfo ref="ENTRY_POINT_STANDARD_FRONT_LEFT" />
-		  <EntryPointAnimInfo ref="ENTRY_POINT_ANIM_HELI_ANNIHILATOR_FRONT_LEFT" />
-		</Item>
-		<!-- copilot seat -->
-		<Item>
-		  <EntryPointInfo ref="ENTRY_POINT_STANDARD_FRONT_RIGHT" />
-		  <EntryPointAnimInfo ref="ENTRY_POINT_ANIM_HELI_ANNIHILATOR_FRONT_RIGHT" />
-		</Item>
-		<!-- left side jump seat 1 -->
-		<!-- left rear jump seat -->
-		<!-- left side jump seat 2 -->
-		<!-- stretcher -->
-		<Item>
-		  <EntryPointInfo ref="ENTRY_POINT_JAYHAWK_WARP_RIGHT" />
-		  <EntryPointAnimInfo ref="ENTRY_POINT_ANIM_HELI_CARGOBOB_REAR_RIGHT" />
-		</Item>
-		<!-- right side door -->
-		<Item>
-		  <!-- <EntryPointInfo ref="ENTRY_POINT_HELI_REAR_RIGHT" /> -->
-		  <EntryPointInfo ref="ENTRY_POINT_JAYHAWK_DOOR_RIGHT" />
-		  <EntryPointAnimInfo ref="ENTRY_POINT_ANIM_JAYHAWK_DOOR_RIGHT" />
-		</Item>
-		<!-- right rear jump seat -->
-		<Item>
-		  <EntryPointInfo ref="ENTRY_POINT_JAYHAWK_REAR_RIGHT" />
-		  <EntryPointAnimInfo ref="ENTRY_POINT_ANIM_HELI_REAR_LEFT" />
-		</Item>
-		
-		
-	  </EntryPoints>
-	  <LayoutFlags>StreamAnims UseFinerAlignTolerance Use2DBodyBlend</LayoutFlags>
-	  <BicycleInfo ref="NULL" />
-	  <HandsUpClipSetId>busted_vehicle_std</HandsUpClipSetId>
-	  <SteeringWheelOffset x="0.000000" y="0.350000" z="0.320000" />
-	</Item>
-  
-  </VehicleLayoutInfos>
-  <VehicleEntryPointInfos>
-	<Item type="CVehicleEntryPointInfo">
-      <Name>ENTRY_POINT_JAYHAWK_DOOR_RIGHT</Name>
-      <DoorBoneName>door_pside_r</DoorBoneName>
-      <SecondDoorBoneName />
-      <DoorHandleBoneName>handle_pside_r</DoorHandleBoneName>
-      <WindowId>INVALID</WindowId>
-      <VehicleSide>SIDE_RIGHT</VehicleSide>
-      <AccessableSeats>
-        <Item ref="SEAT_STANDARD_REAR_RIGHT" />
-      </AccessableSeats>
-      <VehicleExtraPointsInfo ref="NULL" />
-      <Flags />
-      <BlockJackReactionSides />
-    </Item>
-	<Item type="CVehicleEntryPointInfo">
-      <Name>ENTRY_POINT_JAYHAWK_REAR_RIGHT</Name>
-      <DoorBoneName />
-      <SecondDoorBoneName />
-      <DoorHandleBoneName />
-      <WindowId>INVALID</WindowId>
-      <VehicleSide>SIDE_RIGHT</VehicleSide>
-      <AccessableSeats>
-        <Item ref="SEAT_EXTRA_NO_SHUFFLE_RIGHT_1" />
-      </AccessableSeats>
-      <VehicleExtraPointsInfo ref="NULL" />
-      <Flags />
-      <BlockJackReactionSides />
-    </Item>
-	<Item type="CVehicleEntryPointInfo">
-      <Name>ENTRY_POINT_JAYHAWK_WARP_RIGHT</Name>
-      <DoorBoneName />
-      <SecondDoorBoneName />
-      <DoorHandleBoneName />
-      <WindowId>INVALID</WindowId>
-      <VehicleSide>SIDE_RIGHT</VehicleSide>
-      <AccessableSeats>
-        <Item ref="SEAT_STANDARD_REAR_LEFT" />
-        <Item ref="SEAT_EXTRA_NO_SHUFFLE_LEFT_1" />
-        <Item ref="SEAT_EXTRA_NO_SHUFFLE_LEFT_2" />
-        <Item ref="SEAT_EXTRA_NO_SHUFFLE_RIGHT_2" />
-      </AccessableSeats>
-      <VehicleExtraPointsInfo ref="NULL" />
-      <Flags>MPWarpInOut</Flags>
-      <BlockJackReactionSides />
-    </Item>
-  </VehicleEntryPointInfos>
-  
-  <VehicleExtraPointsInfos>
-	<Item type="CVehicleExtraPointsInfo">
-      <Name>EXTRA_VEHICLE_POINTS_INVALID_DRIVER</Name>
-      <ExtraVehiclePoints>
-        <Item>
-          <LocationType>SEAT_RELATIVE</LocationType>
-          <PointType>GET_IN</PointType>
-          <Position x="1.80000" y="0.50000" z="-0.075000" />
-          <Heading value="1.570000" />
-          <BoneName />
-        </Item>
-<!--         <Item>
-          <LocationType>SEAT_RELATIVE</LocationType>
-          <PointType>GET_IN_2</PointType>
-          <Position x="-0.600000" y="-0.600000" z="0.75000" />
-          <Heading value="0.000000" />
-          <BoneName />
-        </Item> -->
-        <Item>
-          <LocationType>SEAT_RELATIVE</LocationType>
-          <PointType>GET_OUT</PointType>
-          <Position x="0.600000" y="0.600000" z="0.5000" />
-          <Heading value="0.000000" />
-          <BoneName />
-        </Item>
-      </ExtraVehiclePoints>
-    </Item>
-  </VehicleExtraPointsInfos>
-  <VehicleEntryPointAnimInfos>
-	  <Item type="CVehicleEntryPointAnimInfo">
-		  <Name>ENTRY_POINT_ANIM_JAYHAWK_DOOR_RIGHT</Name>
-		  <CommonClipSetMap ref="COMMON_CLIPSET_MAP_TRUCK_RIGHT" />
-		  <EntryClipSetMap ref="ENTRY_CLIPSET_MAP_HELI_REAR_RIGHT" />
-		  <ExitClipSetMap ref="EXIT_CLIPSET_MAP_HELI_REAR_RIGHT" />
-		  <AlternateTryLockedDoorClipId />
-		  <AlternateForcedEntryClipId />
-		  <AlternateJackFromOutSideClipId />
-		  <AlternateBeJackedFromOutSideClipId />
-		  <AlternateEntryPointClipSetId />
-		  <EnterVehicleMoveNetwork>ENTER_VEHICLE_STD</EnterVehicleMoveNetwork>
-		  <EntryTranslation x="1.061200" y="-0.232100" z="0.043100" />
-		  <OpenDoorTranslation x="0.000000" y="0.000000" />
-		  <OpenDoorHeadingChange value="-1.570000" />
-		  <EntryHeadingChange value="1.570000" />
-		  <ExtraZForWaterEntry value="0.000000" />
-		  <EntryPointFlags>JackIncludesGetIn UseGetUpAfterJack JackVariationsIncludeGetIn DeadJackIncludesGetIn DontCloseDoorInside DontCloseDoorOutside UsesNoDoorTransitionForEnter</EntryPointFlags>
-		  <EntryAnimVariations ref="ENTRY_ANIM_VARIATIONS_HELICOPTER_REAR_RIGHT" />
-		</Item>
-	</VehicleEntryPointAnimInfos>
-   <VehicleSeatAnimInfos>
-	
-	
-	    <Item type="CVehicleSeatInfo">
-      <Name>SEAT_EXTRA_NO_SHUFFLE_RIGHT_6</Name>
-      <SeatBoneName>seat_pside_r6</SeatBoneName>
-      <ShuffleLink />
-      <RearSeatLink />
-      <DefaultCarTask>TASK_DRIVE_WANDER</DefaultCarTask>
-      <SeatFlags />
-      <HairScale value="0.000000" />
-    </Item>
-	
-	  <Item type="CVehicleSeatAnimInfo">
-		  <Name>SEAT_ANIM_BOAT_INVALID_FRONT_LEFT</Name>
-		  <DriveByInfo ref="DRIVEBY_BOAT_SPEED_FRONT_RIGHT" />
-		  <InsideClipSetMap ref="INSIDE_CLIPSET_MAP_BOAT_TROPIC_FRONT_RIGHT" />
-		  <PanicClipSet>clipset@veh@boat@tropic@ps@idle_panic</PanicClipSet>
-		  <AgitatedClipSet />
-		  <DuckedClipSet>clipset@veh@boat@speed@ps@idle_duck</DuckedClipSet>
-		  <FemaleClipSet />
-		  <LowLODIdleAnim>BOAT_PASSENGER</LowLODIdleAnim>
-		  <SeatAmbientContext />
-		  <InVehicleMoveNetwork>VEHICLE_DEFAULT</InVehicleMoveNetwork>
-		  <SeatAnimFlags>WeaponAttachedToLeftHand HasPanicAnims PreventShuffleJack UseBoatInVehicleAnims</SeatAnimFlags>
-		  <SteeringSmoothing value="0.050000" />
-		  <ExitToAimInfoName />
-		  <MaleGestureClipSetId />
-		  <FemaleGestureClipSetId />
-	  </Item>
-	  <Item type="CVehicleSeatAnimInfo">
-		  <Name>SEAT_ANIM_BOAT_INVALID_FRONT_RIGHT</Name>
-		  <DriveByInfo ref="DRIVEBY_BOAT_SPEED_FRONT_LEFT" />
-		  <InsideClipSetMap ref="INSIDE_CLIPSET_MAP_BOAT_TROPIC_FRONT_LEFT" />
-		  <PanicClipSet />
-		  <AgitatedClipSet />
-		  <DuckedClipSet>clipset@veh@boat@speed@ds@idle_duck</DuckedClipSet>
-		  <FemaleClipSet />
-		  <LowLODIdleAnim>BOAT_DRIVER</LowLODIdleAnim>
-		  <SeatAmbientContext />
-		  <InVehicleMoveNetwork>VEHICLE_DEFAULT</InVehicleMoveNetwork>
-		  <SeatAnimFlags>UseBoatInVehicleAnims PreventShuffleJack</SeatAnimFlags>
-		  <SteeringSmoothing value="0.050000" />
-		  <ExitToAimInfoName />
-		  <MaleGestureClipSetId />
-		  <FemaleGestureClipSetId />
-	  </Item>
-	</VehicleSeatAnimInfos>
-   <VehicleSeatInfos>
-       <Item type="CVehicleSeatInfo">
-      <Name>SEAT_EXTRA_NO_SHUFFLE_LEFT_7</Name>
-      <SeatBoneName>seat_dside_r7</SeatBoneName>
-      <ShuffleLink />
-      <RearSeatLink />
-      <DefaultCarTask>TASK_DRIVE_WANDER</DefaultCarTask>
-      <SeatFlags />
-      <HairScale value="0.000000" />
-    </Item>
-   </VehicleSeatInfos>
-	
-	</CVehicleMetadataMgr>
diff --git a/resources/jayhawk/vehicles.meta b/resources/jayhawk/vehicles.meta
deleted file mode 100644
index 23883ee03..000000000
--- a/resources/jayhawk/vehicles.meta
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CVehicleModelInfo__InitDataList>
-  <residentTxd>vehshare</residentTxd>
-  <residentAnims />
-
-  <InitDatas>
-    <Item>
-      <modelName>jayhawk</modelName>
-      <txdName>jayhawk</txdName>
-      <handlingId>JAYHAWK</handlingId>
-      <gameName>JAYHAWK</gameName>
-      <vehicleMakeName>SIKORSKY</vehicleMakeName>
-      <expressionDictName>null</expressionDictName>
-      <expressionName>null</expressionName>
-      <animConvRoofDictName>null</animConvRoofDictName>
-      <animConvRoofName>null</animConvRoofName>
-      <animConvRoofWindowsAffected />
-      <ptfxAssetName>null</ptfxAssetName>
-      <audioNameHash>ANNIHL</audioNameHash>
-      <!-- <layout>LAYOUT_HELI_ANNIHILATOR</layout> -->
-      <layout>LAYOUT_HELI_JAYHAWK</layout>
-      <coverBoundOffsets>ANNIHILATOR_COVER_OFFSET_INFO</coverBoundOffsets>
-      <explosionInfo>EXPLOSION_INFO_DEFAULT</explosionInfo>
-      <scenarioLayout />
-      <cameraName>FOLLOW_HELI_CAMERA</cameraName>
-      <aimCameraName>HELI_AIM_CAMERA</aimCameraName>
-      <bonnetCameraName>DEFAULT_VEHICLE_BONNET_CAMERA</bonnetCameraName>
-      <povCameraName>HELI_POV_CAMERA</povCameraName>
-      <FirstPersonDriveByIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonDriveByUnarmedIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonProjectileDriveByIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonProjectileDriveByPassengerIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonDriveByLeftPassengerIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonDriveByRightPassengerIKOffset x="-0.053000" y="-0.053000" z="-0.068000" />
-      <FirstPersonDriveByLeftPassengerUnarmedIKOffset x="0.000000" y="0.000000" z="0.000000" />
-      <FirstPersonDriveByRightPassengerUnarmedIKOffset x="0.000000" y="-0.080000" z="-0.033000" />
-      <FirstPersonPassengerMobilePhoneOffset x="0.173000" y="0.273000" z="0.518000" />
-      <FirstPersonMobilePhoneOffset x="0.183000" y="0.383000" z="0.553000" />
-      <PovCameraOffset x="0.000000" y="-0.100000" z="0.670000" />
-      <vfxInfoName>VFXVEHICLEINFO_HELI_ANNIHILATOR</vfxInfoName>
-      <shouldUseCinematicViewMode value="true" />
-      <shouldCameraTransitionOnClimbUpDown value="false" />
-      <shouldCameraIgnoreExiting value="false" />
-      <AllowPretendOccupants value="false" />
-      <AllowJoyriding value="true" />
-      <AllowSundayDriving value="true" />
-      <AllowBodyColorMapping value="true" />
-      <wheelScale value="0.200100" />
-      <wheelScaleRear value="0.117600" />
-      <dirtLevelMin value="0.000000" />
-      <dirtLevelMax value="0.450000" />
-      <envEffScaleMin value="0.000000" />
-      <envEffScaleMax value="0.200000" />
-      <envEffScaleMin2 value="0.000000" />
-      <envEffScaleMax2 value="0.200000" />
-      <damageMapScale value="0.300000" />
-      <damageOffsetScale value="1.000000" />
-      <diffuseTint value="0x00FFFFFF" />
-      <steerWheelMult value="1.000000" />
-      <HDTextureDist value="5.000000" />
-      <lodDistances content="float_array">
-        25.000000
-        35.000000
-        100.000000
-        200.000000
-        1000.000000
-        1000.000000
-      </lodDistances>
-      <minSeatHeight value="0.969" />
-      <identicalModelSpawnDistance value="20" />
-      <maxNumOfSameColor value="10" />
-      <defaultBodyHealth value="1000.000000" />
-      <pretendOccupantsScale value="1.000000" />
-      <visibleSpawnDistScale value="1.000000" />
-      <trackerPathWidth value="2.000000" />
-      <weaponForceMult value="1.000000" />
-      <frequency value="100" />
-      <swankness>SWANKNESS_4</swankness>
-      <maxNum value="999" />
-      <flags>FLAG_NO_BOOT FLAG_LAW_ENFORCEMENT FLAG_HAS_LIVERY FLAG_HEADLIGHTS_USE_ACTUAL_BONE_POS FLAG_DRIVER_NO_DRIVE_BY FLAG_NO_RESPRAY FLAG_ALLOWS_RAPPEL FLAG_DONT_SPAWN_IN_CARGEN FLAG_DONT_SPAWN_AS_AMBIENT FLAG_DONT_TIMESLICE_WHEELS FLAG_HAS_TURRET_SEAT_ON_VEHICLE FLAG_USE_TURRET_RELATIVE_AIM_CALCULATION FLAG_EQUIP_UNARMED_ON_ENTER</flags>
-      <type>VEHICLE_TYPE_HELI</type>
-      <plateType>VPT_NONE</plateType>
-      <dashboardType>VDT_MAVERICK</dashboardType>
-      <vehicleClass>VC_HELICOPTER</vehicleClass>
-      <wheelType>VWT_SPORT</wheelType>
-      <trailers />
-      <additionalTrailers />
-      <drivers>
-        <Item>
-          <driverName>s_m_y_uscg_03</driverName>
-          <npcName>Pilot</npcName>
-        </Item>
-      </drivers>
-      <extraIncludes />
-      <doorsWithCollisionWhenClosed />
-      <driveableDoors />
-      <bumpersNeedToCollideWithMap value="false" />
-      <needsRopeTexture value="true" />
-      <requiredExtras />
-      <rewards />
-      <cinematicPartCamera>
-        <Item>HELI_REAR_ROTOR_CAMERA</Item>
-      </cinematicPartCamera>
-      <NmBraceOverrideSet />
-      <buoyancySphereOffset x="0.000000" y="0.000000" z="0.000000" />
-      <buoyancySphereSizeScale value="1.000000" />
-      <pOverrideRagdollThreshold type="NULL" />
-      <firstPersonDrivebyData>
-        <Item>STD_FRONT_LEFT</Item>
-        <Item>HELI_FRONT_RIGHT</Item>
-      </firstPersonDrivebyData>
-    </Item>
- </InitDatas>
-
-  <txdRelationships>
-    <Item>
-      <parent>vehicles_jet_interior</parent>
-      <child>jayhawk</child>
-    </Item>
-  </txdRelationships>
-
-</CVehicleModelInfo__InitDataList>
\ No newline at end of file
diff --git a/resources/s30/__resource.lua b/resources/s30/__resource.lua
new file mode 100644
index 000000000..fff0be1b8
--- /dev/null
+++ b/resources/s30/__resource.lua
@@ -0,0 +1,15 @@
+resource_manifest_version '77731fab-63ca-442c-a67b-abc70f28dfa5'
+
+files {
+    'vehicles.meta',
+    'carvariations.meta',
+    'carcols.meta',
+    'handling.meta',
+	'vehiclelayouts.meta',
+}
+
+data_file 'HANDLING_FILE' 'handling.meta'
+data_file 'VEHICLE_METADATA_FILE' 'vehicles.meta'
+data_file 'CARCOLS_FILE' 'carcols.meta'
+data_file 'VEHICLE_VARIATION_FILE' 'carvariations.meta'
+data_file 'VEHICLE_LAYOUTS_FILE' 'vehiclelayouts.meta'
\ No newline at end of file