diff --git a/Tests/ElixxirDAppsSDKTests/FactTests.swift b/Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
similarity index 100%
rename from Tests/ElixxirDAppsSDKTests/FactTests.swift
rename to Tests/ElixxirDAppsSDKTests/Models/FactTests.swift
diff --git a/Tests/ElixxirDAppsSDKTests/MessageSendReportTests.swift b/Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift
similarity index 100%
rename from Tests/ElixxirDAppsSDKTests/MessageSendReportTests.swift
rename to Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift
diff --git a/Tests/ElixxirDAppsSDKTests/MessageTests.swift b/Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
similarity index 100%
rename from Tests/ElixxirDAppsSDKTests/MessageTests.swift
rename to Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift
diff --git a/Tests/ElixxirDAppsSDKTests/ReceptionIdentityTests.swift b/Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
similarity index 100%
rename from Tests/ElixxirDAppsSDKTests/ReceptionIdentityTests.swift
rename to Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift
diff --git a/Tests/ElixxirDAppsSDKTests/RestlikeMessageTests.swift b/Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift
similarity index 100%
rename from Tests/ElixxirDAppsSDKTests/RestlikeMessageTests.swift
rename to Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift