diff --git a/src/UdmCws/IUdmApi.cs b/src/UdmCws/Interfaces/IUdmApi.cs
similarity index 100%
rename from src/UdmCws/IUdmApi.cs
rename to src/UdmCws/Interfaces/IUdmApi.cs
diff --git a/src/UdmCws/CustomProperties.cs b/src/UdmCws/Models/CustomProperties.cs
similarity index 100%
rename from src/UdmCws/CustomProperties.cs
rename to src/UdmCws/Models/CustomProperties.cs
diff --git a/src/UdmCws/DeviceStatus.cs b/src/UdmCws/Models/DeviceStatus.cs
similarity index 100%
rename from src/UdmCws/DeviceStatus.cs
rename to src/UdmCws/Models/DeviceStatus.cs
diff --git a/src/UdmCws/RoomResponse.cs b/src/UdmCws/Models/RoomResponse.cs
similarity index 100%
rename from src/UdmCws/RoomResponse.cs
rename to src/UdmCws/Models/RoomResponse.cs
diff --git a/src/UdmCws/StandardProperties.cs b/src/UdmCws/Models/StandardProperties.cs
similarity index 100%
rename from src/UdmCws/StandardProperties.cs
rename to src/UdmCws/Models/StandardProperties.cs
diff --git a/src/UdmCws/StatusProperties.cs b/src/UdmCws/Models/StatusProperties.cs
similarity index 100%
rename from src/UdmCws/StatusProperties.cs
rename to src/UdmCws/Models/StatusProperties.cs