diff --git a/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx b/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Pushback/PushbackMap.tsx
similarity index 98%
rename from hsim-common/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx
rename to hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Pushback/PushbackMap.tsx
index 26c0160f..a3027ed9 100644
--- a/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/PushbackMap.tsx
+++ b/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Pushback/PushbackMap.tsx
@@ -19,7 +19,7 @@ import {
     setCenterPlaneMode,
     setMapRange,
 } from '../../../Store/features/pushback';
-import { AicraftLength } from './Pushback/Constants';
+import { AicraftLength } from './Constants';
 interface TurningRadiusIndicatorProps {
     turningRadius: number;
 }
@@ -66,8 +66,6 @@ const TurningRadiusIndicator = ({ turningRadius }: TurningRadiusIndicatorProps)
 export const PushbackMap = () => {
     const dispatch = useAppDispatch();
 
-    const [airframe] = useState(getAirframeType());
-
     const [planeHeadingTrue] = useSimVar('PLANE HEADING DEGREES TRUE', 'degrees', 50);
     const [planeLatitude] = useSimVar('A:PLANE LATITUDE', 'degrees latitude', 50);
     const [planeLongitude] = useSimVar('A:PLANE LONGITUDE', 'degrees longitude', 50);
@@ -99,8 +97,8 @@ export const PushbackMap = () => {
     // Aircraft wheelbase in meters
     // Source: https://www.airbus.com/sites/g/files/jlcbta136/files/2021-11/Airbus-Commercial-Aircraft-AC-A320.pdf
     // Source: https://www.airbus.com/sites/g/files/jlcbta136/files/2022-02/Airbus-A380-Facts-and-Figures-February-2022.pdf
-    const aircraftWheelBase = getAirframeType() === 12.64;
-    const aircraftLengthMeter = AicraftLength[airframe];
+    const aircraftWheelBase = 12.64;
+    const aircraftLengthMeter = AicraftLength[getAirframeType()];
 
     // Map
     const [mouseDown, setMouseDown] = useState(false);
diff --git a/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/PushbackPage.tsx b/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Pushback/PushbackPage.tsx
similarity index 100%
rename from hsim-common/src/systems/instruments/src/EFB/Ground/Pages/PushbackPage.tsx
rename to hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Pushback/PushbackPage.tsx
diff --git a/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx b/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Services/ServicesPage.tsx
similarity index 85%
rename from hsim-common/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx
rename to hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Services/ServicesPage.tsx
index c1dcb07f..da2f4af1 100644
--- a/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/ServicesPage.tsx
+++ b/hsim-common/src/systems/instruments/src/EFB/Ground/Pages/Services/ServicesPage.tsx
@@ -3,10 +3,10 @@
 // SPDX-License-Identifier: GPL-3.0
 import { getAirframeType } from '@flybywiresim/flypad';
 import React, { useState } from 'react';
-import { A318Services } from './Services/A318_100/A318Services';
-import { A319Services } from './Services/A319_100/A319Services';
-import { A320Services } from './Services/A320_200/A320Services';
-import { A321Services } from './Services/A321_200/A321Services';
+import { A318Services } from './A318_100/A318Services';
+import { A319Services } from './A319_100/A319Services';
+import { A320Services } from './A320_200/A320Services';
+import { A321Services } from './A321_200/A321Services';
 
 
 export const ServicesPage = () => {