diff --git a/kairo-common/src/influxdb_models/mod.rs b/kairo-common/src/influxdb_models/mod.rs
deleted file mode 100644
index 2ae90bf..0000000
--- a/kairo-common/src/influxdb_models/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// pub mod multiple_measures;
-mod beacon_measure;
-mod device_status;
-// mod known_position;
-
-// Renaming types for ease of use outside the scope of this module
-pub const BEACONMEASURE_TIME_WINDOW: u64 = 4;
-pub type BeaconMeasure = beacon_measure::BeaconMeasure;
-// pub type KnownPosition = known_position::KnownPosition;
-pub type DeviceStatus = device_status::DeviceStatus;
diff --git a/kairo-common/src/lib.rs b/kairo-common/src/lib.rs
index b664c4e..1147b6e 100644
--- a/kairo-common/src/lib.rs
+++ b/kairo-common/src/lib.rs
@@ -1,18 +1,17 @@
 #![allow(confusable_idents)]
 #![allow(mixed_script_confusables)]
+#![allow(non_upper_case_globals)]
 
 pub mod helper;
-pub mod influxdb_models;
 pub mod unit_conversion;
 
 mod types;
 pub type Point = types::point::Point;
 pub type MAC = types::mac::MAC;
 
-
 mod models;
 pub type Antenna = models::antenna::Antenna;
-pub type DeviceReport =  models::DeviceReport;
+pub type DeviceReport = models::DeviceReport;
 pub type KnownPosition = models::known_position::KnownPosition;
-
-
+pub type DeviceStatus = models::device_status::DeviceStatus;
+pub type BeaconMeasure = models::beacon_measure::BeaconMeasure;
diff --git a/kairo-common/src/models/antenna.rs b/kairo-common/src/models/antenna.rs
index 902c7c0..9bf6ca9 100644
--- a/kairo-common/src/models/antenna.rs
+++ b/kairo-common/src/models/antenna.rs
@@ -12,7 +12,6 @@ pub struct Antenna {
 impl Antenna {
     const C: f64 = 2.99e8;
     const F: f64 = 2.4e9;
-    #[allow(non_upper_case_globals)]
     const λ: f64 = Self::C / Self::F;
 
     pub fn new(id: &str, tssi: f64, coord: Point) -> Antenna {
diff --git a/kairo-common/src/influxdb_models/beacon_measure.rs b/kairo-common/src/models/beacon_measure.rs
similarity index 97%
rename from kairo-common/src/influxdb_models/beacon_measure.rs
rename to kairo-common/src/models/beacon_measure.rs
index 5be25f8..f894d9a 100644
--- a/kairo-common/src/influxdb_models/beacon_measure.rs
+++ b/kairo-common/src/models/beacon_measure.rs
@@ -3,7 +3,7 @@ use influxdb::{InfluxDbWriteable, ReadQuery};
 use serde::{Deserialize, Serialize};
 
 use crate::helper::for_async::get_influx_cli;
-use crate::influxdb_models::BEACONMEASURE_TIME_WINDOW;
+use crate::models::BEACONMEASURE_TIME_WINDOW;
 use crate::MAC;
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, InfluxDbWriteable)]
diff --git a/kairo-common/src/influxdb_models/device_status.rs b/kairo-common/src/models/device_status.rs
similarity index 100%
rename from kairo-common/src/influxdb_models/device_status.rs
rename to kairo-common/src/models/device_status.rs
diff --git a/kairo-common/src/models/known_position.rs b/kairo-common/src/models/known_position.rs
index d22deb6..0fc8a64 100644
--- a/kairo-common/src/models/known_position.rs
+++ b/kairo-common/src/models/known_position.rs
@@ -3,7 +3,7 @@ use influxdb::{InfluxDbWriteable, ReadQuery};
 use serde::{Deserialize, Serialize};
 
 use crate::helper::for_async::get_influx_cli;
-use crate::{Point,MAC};
+use crate::{Point, MAC};
 
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, InfluxDbWriteable)]
 pub struct KnownPosition {
diff --git a/kairo-common/src/models/mod.rs b/kairo-common/src/models/mod.rs
index eb76ba9..4a6455a 100644
--- a/kairo-common/src/models/mod.rs
+++ b/kairo-common/src/models/mod.rs
@@ -1,8 +1,11 @@
 pub mod antenna;
+pub mod beacon_measure;
+pub mod device_status;
 pub mod known_position;
 
+pub const BEACONMEASURE_TIME_WINDOW: u64 = 4;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize)]
 pub struct DeviceReport {
-    pub data: Vec<crate::influxdb_models::BeaconMeasure>,
+    pub data: Vec<crate::models::beacon_measure::BeaconMeasure>,
 }
diff --git a/kairo-common/src/types/mod.rs b/kairo-common/src/types/mod.rs
index a14478f..d663aeb 100644
--- a/kairo-common/src/types/mod.rs
+++ b/kairo-common/src/types/mod.rs
@@ -1,2 +1,2 @@
 pub mod mac;
-pub mod point;
\ No newline at end of file
+pub mod point;
diff --git a/simulation-tools/src/nav_dev/main.rs b/simulation-tools/src/nav_dev/main.rs
index df47a8c..b65d94f 100644
--- a/simulation-tools/src/nav_dev/main.rs
+++ b/simulation-tools/src/nav_dev/main.rs
@@ -4,7 +4,7 @@ use std::{thread, time};
 mod error_report;
 
 use kairo_common::helper::for_sync::{get_mqtt_cli, mqtt_pub};
-use kairo_common::{influxdb_models::BeaconMeasure, Antenna, DeviceReport, KnownPosition, Point};
+use kairo_common::{Antenna, BeaconMeasure, DeviceReport, KnownPosition, Point};
 
 #[derive(Clone)]
 pub struct Config {
diff --git a/xyz-engine/src/handler.rs b/xyz-engine/src/handler.rs
index 704dfc1..d69522a 100644
--- a/xyz-engine/src/handler.rs
+++ b/xyz-engine/src/handler.rs
@@ -1,5 +1,5 @@
 pub mod device {
-    use kairo_common::influxdb_models::BeaconMeasure;
+    use kairo_common::BeaconMeasure;
     use kairo_common::{unit_conversion::UnitsConversion, DeviceReport, MAC};
 
     use crate::position_solver::solve_for;
diff --git a/xyz-engine/src/position_solver.rs b/xyz-engine/src/position_solver.rs
index a9787e4..a81ded9 100644
--- a/xyz-engine/src/position_solver.rs
+++ b/xyz-engine/src/position_solver.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use std::collections::HashMap;
 
-use kairo_common::{influxdb_models::BeaconMeasure, Antenna, KnownPosition, Point, MAC};
+use kairo_common::{Antenna, BeaconMeasure, KnownPosition, Point, MAC};
 struct KnownDistance {
     point: Point,
     dist: f64,