diff --git a/client/src/api/controlPointsSlice.ts b/client/src/api/controlPointsSlice.ts
index 085c9d69..0a92e713 100644
--- a/client/src/api/controlPointsSlice.ts
+++ b/client/src/api/controlPointsSlice.ts
@@ -1,6 +1,6 @@
 import { RootState } from "../app/store";
 import { gameLoaded, gameUnloaded } from "./actions";
-import { ControlPoint } from "./controlpoint";
+import { ControlPoint } from "./liberationApi";
 import { PayloadAction, createSlice } from "@reduxjs/toolkit";
 
 interface ControlPointsState {
diff --git a/client/src/api/controlpoint.ts b/client/src/api/controlpoint.ts
deleted file mode 100644
index 4fc02248..00000000
--- a/client/src/api/controlpoint.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { LatLng } from "leaflet";
-
-export interface ControlPoint {
-  id: number;
-  name: string;
-  blue: boolean;
-  position: LatLng;
-  mobile: boolean;
-  destination: LatLng | null;
-  sidc: string;
-}
diff --git a/client/src/api/eventstream.tsx b/client/src/api/eventstream.tsx
index 6b11b9bd..a12cdbe8 100644
--- a/client/src/api/eventstream.tsx
+++ b/client/src/api/eventstream.tsx
@@ -4,8 +4,6 @@ import backend from "./backend";
 import Combat from "./combat";
 import { endCombat, newCombat, updateCombat } from "./combatSlice";
 import { updateControlPoint } from "./controlPointsSlice";
-import { ControlPoint } from "./controlpoint";
-import { Flight } from "./flight";
 import {
   deselectFlight,
   registerFlight,
@@ -19,11 +17,15 @@ import {
   deleteFrontLine,
   updateFrontLine,
 } from "./frontLinesSlice";
-import FrontLine from "./frontline";
 import reloadGameState from "./gamestate";
-import { liberationApi } from "./liberationApi";
+import {
+  liberationApi,
+  ControlPoint,
+  Flight,
+  FrontLine,
+  Tgo,
+} from "./liberationApi";
 import { navMeshUpdated } from "./navMeshSlice";
-import Tgo from "./tgo";
 import { updateTgo } from "./tgosSlice";
 import { threatZonesUpdated } from "./threatZonesSlice";
 import { LatLng } from "leaflet";
diff --git a/client/src/api/flight.ts b/client/src/api/flight.ts
deleted file mode 100644
index 2306117a..00000000
--- a/client/src/api/flight.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Waypoint } from "./waypoint";
-import { LatLng } from "leaflet";
-
-export interface Flight {
-  id: string;
-  blue: boolean;
-  position: LatLng | null;
-  sidc: string;
-  waypoints: Waypoint[] | null;
-}
diff --git a/client/src/api/flightsSlice.ts b/client/src/api/flightsSlice.ts
index b6372e82..84ab5cce 100644
--- a/client/src/api/flightsSlice.ts
+++ b/client/src/api/flightsSlice.ts
@@ -1,6 +1,6 @@
 import { RootState } from "../app/store";
 import { gameLoaded, gameUnloaded } from "./actions";
-import { Flight } from "./flight";
+import { Flight } from "./liberationApi";
 import { PayloadAction, createSlice } from "@reduxjs/toolkit";
 import { LatLng } from "leaflet";
 
diff --git a/client/src/api/frontLinesSlice.ts b/client/src/api/frontLinesSlice.ts
index 3b1af109..2f2b3331 100644
--- a/client/src/api/frontLinesSlice.ts
+++ b/client/src/api/frontLinesSlice.ts
@@ -1,6 +1,6 @@
 import { RootState } from "../app/store";
 import { gameLoaded, gameUnloaded } from "./actions";
-import FrontLine from "./frontline";
+import { FrontLine } from "./liberationApi";
 import { PayloadAction, createSlice } from "@reduxjs/toolkit";
 
 interface FrontLinesState {
diff --git a/client/src/api/frontline.ts b/client/src/api/frontline.ts
deleted file mode 100644
index 5a04c3ed..00000000
--- a/client/src/api/frontline.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LatLng } from "leaflet";
-
-export interface FrontLine {
-  id: string;
-  extents: LatLng[];
-}
-
-export default FrontLine;
diff --git a/client/src/api/game.ts b/client/src/api/game.ts
index 764daf79..63c88285 100644
--- a/client/src/api/game.ts
+++ b/client/src/api/game.ts
@@ -1,9 +1,12 @@
-import { ControlPoint } from "./controlpoint";
-import { Flight } from "./flight";
-import FrontLine from "./frontline";
-import { NavMeshes, ThreatZoneContainer } from "./liberationApi";
-import SupplyRoute from "./supplyroute";
-import Tgo from "./tgo";
+import {
+  ControlPoint,
+  Flight,
+  FrontLine,
+  NavMeshes,
+  SupplyRoute,
+  Tgo,
+  ThreatZoneContainer,
+} from "./liberationApi";
 import { LatLngLiteral } from "leaflet";
 
 export default interface Game {
diff --git a/client/src/api/supplyRoutesSlice.ts b/client/src/api/supplyRoutesSlice.ts
index b6fc0639..d5683b89 100644
--- a/client/src/api/supplyRoutesSlice.ts
+++ b/client/src/api/supplyRoutesSlice.ts
@@ -1,6 +1,6 @@
 import { RootState } from "../app/store";
 import { gameLoaded, gameUnloaded } from "./actions";
-import SupplyRoute from "./supplyroute";
+import { SupplyRoute } from "./liberationApi";
 import { createSlice } from "@reduxjs/toolkit";
 
 interface SupplyRoutesState {
diff --git a/client/src/api/supplyroute.ts b/client/src/api/supplyroute.ts
deleted file mode 100644
index 4ef2a349..00000000
--- a/client/src/api/supplyroute.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { LatLng } from "leaflet";
-
-export interface SupplyRoute {
-  points: LatLng[];
-  front_active: boolean;
-  is_sea: boolean;
-  blue: boolean;
-  active_transports: string[];
-}
-
-export default SupplyRoute;
diff --git a/client/src/api/tgo.ts b/client/src/api/tgo.ts
deleted file mode 100644
index 6f2e22b2..00000000
--- a/client/src/api/tgo.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { LatLng } from "leaflet";
-
-export interface Tgo {
-  id: string;
-  name: string;
-  control_point_name: string;
-  category: string;
-  blue: boolean;
-  position: LatLng;
-  units: string[];
-  threat_ranges: number[];
-  detection_ranges: number[];
-  dead: boolean;
-  sidc: string;
-}
-
-export default Tgo;
diff --git a/client/src/api/tgosSlice.ts b/client/src/api/tgosSlice.ts
index 52b838bb..a02d3226 100644
--- a/client/src/api/tgosSlice.ts
+++ b/client/src/api/tgosSlice.ts
@@ -1,6 +1,6 @@
 import { RootState } from "../app/store";
 import { gameLoaded, gameUnloaded } from "./actions";
-import { Tgo } from "./tgo";
+import { Tgo } from "./liberationApi";
 import { PayloadAction, createSlice } from "@reduxjs/toolkit";
 
 interface TgosState {
diff --git a/client/src/api/waypoint.ts b/client/src/api/waypoint.ts
deleted file mode 100644
index 150d1c30..00000000
--- a/client/src/api/waypoint.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { LatLng } from "leaflet";
-
-export interface Waypoint {
-  name: string;
-  position: LatLng;
-  altitude_ft: number;
-  altitude_reference: string;
-  is_movable: boolean;
-  should_mark: boolean;
-  include_in_path: boolean;
-  timing: string;
-}
diff --git a/client/src/components/aircraft/Aircraft.tsx b/client/src/components/aircraft/Aircraft.tsx
index 2d283f35..d8f3a1a7 100644
--- a/client/src/components/aircraft/Aircraft.tsx
+++ b/client/src/components/aircraft/Aircraft.tsx
@@ -1,4 +1,4 @@
-import { Flight } from "../../api/flight";
+import { Flight } from "../../api/liberationApi";
 import { Icon, Point } from "leaflet";
 import { Symbol } from "milsymbol";
 import { Marker } from "react-leaflet";
diff --git a/client/src/components/airdefenserangelayer/AirDefenseRangeLayer.tsx b/client/src/components/airdefenserangelayer/AirDefenseRangeLayer.tsx
index fa3d2482..1763160d 100644
--- a/client/src/components/airdefenserangelayer/AirDefenseRangeLayer.tsx
+++ b/client/src/components/airdefenserangelayer/AirDefenseRangeLayer.tsx
@@ -1,4 +1,4 @@
-import Tgo from "../../api/tgo";
+import { Tgo } from "../../api/liberationApi";
 import { selectTgos } from "../../api/tgosSlice";
 import { useAppSelector } from "../../app/hooks";
 import { Circle, LayerGroup } from "react-leaflet";
diff --git a/client/src/components/controlpoints/ControlPoint.tsx b/client/src/components/controlpoints/ControlPoint.tsx
index 7630a8ca..5baf131d 100644
--- a/client/src/components/controlpoints/ControlPoint.tsx
+++ b/client/src/components/controlpoints/ControlPoint.tsx
@@ -1,5 +1,5 @@
 import backend from "../../api/backend";
-import { ControlPoint as ControlPointModel } from "../../api/controlpoint";
+import { ControlPoint as ControlPointModel } from "../../api/liberationApi";
 import {
   useClearControlPointDestinationMutation,
   useSetControlPointDestinationMutation,
@@ -10,6 +10,7 @@ import {
   Point,
   Marker as LMarker,
   Polyline as LPolyline,
+  LatLngLiteral,
 } from "leaflet";
 import { Symbol as MilSymbol } from "milsymbol";
 import {
@@ -64,7 +65,7 @@ function formatLatLng(latLng: LatLng) {
 
 function destinationTooltipText(
   cp: ControlPointModel,
-  destinationish: LatLng,
+  destinationish: LatLngLiteral,
   inRange: boolean
 ) {
   const destination = new LatLng(destinationish.lat, destinationish.lng);
@@ -93,12 +94,12 @@ function PrimaryMarker(props: ControlPointProps) {
   const [hasDestination, setHasDestination] = useState<boolean>(
     props.controlPoint.destination != null
   );
-  const [pathDestination, setPathDestination] = useState<LatLng>(
+  const [pathDestination, setPathDestination] = useState<LatLngLiteral>(
     props.controlPoint.destination
       ? props.controlPoint.destination
       : props.controlPoint.position
   );
-  const [position, setPosition] = useState<LatLng>(
+  const [position, setPosition] = useState<LatLngLiteral>(
     props.controlPoint.destination
       ? props.controlPoint.destination
       : props.controlPoint.position
@@ -189,8 +190,7 @@ function PrimaryMarker(props: ControlPointProps) {
           dragend: async (event) => {
             const currentPosition = new LatLng(
               pathDestination.lat,
-              pathDestination.lng,
-              pathDestination.alt
+              pathDestination.lng
             );
             const destination = event.target.getLatLng();
             setDestination(destination);
@@ -225,7 +225,7 @@ function PrimaryMarker(props: ControlPointProps) {
 
 interface SecondaryMarkerProps {
   controlPoint: ControlPointModel;
-  destination: LatLng | null;
+  destination: LatLngLiteral | undefined;
 }
 
 function SecondaryMarker(props: SecondaryMarkerProps) {
diff --git a/client/src/components/flightplan/FlightPlan.tsx b/client/src/components/flightplan/FlightPlan.tsx
index 87820bb8..320f4d70 100644
--- a/client/src/components/flightplan/FlightPlan.tsx
+++ b/client/src/components/flightplan/FlightPlan.tsx
@@ -1,4 +1,4 @@
-import { Flight } from "../../api/flight";
+import { Flight } from "../../api/liberationApi";
 import { useGetCommitBoundaryForFlightQuery } from "../../api/liberationApi";
 import WaypointMarker from "../waypointmarker";
 import { ReactElement } from "react";
diff --git a/client/src/components/flightplanslayer/FlightPlansLayer.tsx b/client/src/components/flightplanslayer/FlightPlansLayer.tsx
index eb77dc04..3b152e2d 100644
--- a/client/src/components/flightplanslayer/FlightPlansLayer.tsx
+++ b/client/src/components/flightplanslayer/FlightPlansLayer.tsx
@@ -1,5 +1,5 @@
-import { Flight } from "../../api/flight";
 import { selectFlights, selectSelectedFlight } from "../../api/flightsSlice";
+import { Flight } from "../../api/liberationApi";
 import { useAppSelector } from "../../app/hooks";
 import FlightPlan from "../flightplan";
 import { LayerGroup } from "react-leaflet";
diff --git a/client/src/components/frontline/FrontLine.tsx b/client/src/components/frontline/FrontLine.tsx
index 72f2385b..f63db0ae 100644
--- a/client/src/components/frontline/FrontLine.tsx
+++ b/client/src/components/frontline/FrontLine.tsx
@@ -1,4 +1,4 @@
-import { FrontLine as FrontLineModel } from "../../api/frontline";
+import { FrontLine as FrontLineModel } from "../../api/liberationApi";
 import { Polyline } from "react-leaflet";
 
 interface FrontLineProps {
diff --git a/client/src/components/supplyroute/SupplyRoute.tsx b/client/src/components/supplyroute/SupplyRoute.tsx
index 92898817..c2605928 100644
--- a/client/src/components/supplyroute/SupplyRoute.tsx
+++ b/client/src/components/supplyroute/SupplyRoute.tsx
@@ -1,4 +1,4 @@
-import { SupplyRoute as SupplyRouteModel } from "../../api/supplyroute";
+import { SupplyRoute as SupplyRouteModel } from "../../api/liberationApi";
 import SplitLines from "../splitlines/SplitLines";
 import { Polyline as LPolyline } from "leaflet";
 import { useEffect, useRef } from "react";
diff --git a/client/src/components/tgos/Tgo.tsx b/client/src/components/tgos/Tgo.tsx
index 0aac5800..e3e18d5e 100644
--- a/client/src/components/tgos/Tgo.tsx
+++ b/client/src/components/tgos/Tgo.tsx
@@ -2,7 +2,7 @@ import {
   useOpenNewTgoPackageDialogMutation,
   useOpenTgoInfoDialogMutation,
 } from "../../api/liberationApi";
-import { Tgo as TgoModel } from "../../api/tgo";
+import { Tgo as TgoModel } from "../../api/liberationApi";
 import SplitLines from "../splitlines/SplitLines";
 import { Icon, Point } from "leaflet";
 import { Symbol as MilSymbol } from "milsymbol";
diff --git a/client/src/components/waypointmarker/WaypointMarker.tsx b/client/src/components/waypointmarker/WaypointMarker.tsx
index c53150c5..3047f5ff 100644
--- a/client/src/components/waypointmarker/WaypointMarker.tsx
+++ b/client/src/components/waypointmarker/WaypointMarker.tsx
@@ -1,6 +1,6 @@
 import backend from "../../api/backend";
-import { Flight } from "../../api/flight";
-import { Waypoint } from "../../api/waypoint";
+import { Flight } from "../../api/liberationApi";
+import { Waypoint } from "../../api/liberationApi";
 import { Icon } from "leaflet";
 import { Marker as LMarker } from "leaflet";
 import icon from "leaflet/dist/images/marker-icon.png";