diff --git a/Sources/ElixxirDAppsSDK/AuthCallbacks.swift b/Sources/ElixxirDAppsSDK/Callbacks/AuthCallbacks.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/AuthCallbacks.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/AuthCallbacks.swift
diff --git a/Sources/ElixxirDAppsSDK/ClientErrorCallback.swift b/Sources/ElixxirDAppsSDK/Callbacks/ClientErrorCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ClientErrorCallback.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/ClientErrorCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/HealthCallback.swift b/Sources/ElixxirDAppsSDK/Callbacks/HealthCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/HealthCallback.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/HealthCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/LogWriter.swift b/Sources/ElixxirDAppsSDK/Callbacks/LogWriter.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LogWriter.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/LogWriter.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageDeliveryCallback.swift b/Sources/ElixxirDAppsSDK/Callbacks/MessageDeliveryCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageDeliveryCallback.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/MessageDeliveryCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/MessageListener.swift b/Sources/ElixxirDAppsSDK/Callbacks/MessageListener.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/MessageListener.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/MessageListener.swift
diff --git a/Sources/ElixxirDAppsSDK/RestlikeCallback.swift b/Sources/ElixxirDAppsSDK/Callbacks/RestlikeCallback.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/RestlikeCallback.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/RestlikeCallback.swift
diff --git a/Sources/ElixxirDAppsSDK/ServiceProcessor.swift b/Sources/ElixxirDAppsSDK/Callbacks/ServiceProcessor.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/ServiceProcessor.swift
rename to Sources/ElixxirDAppsSDK/Callbacks/ServiceProcessor.swift
diff --git a/Sources/ElixxirDAppsSDK/Environment.swift b/Sources/ElixxirDAppsSDK/Models/Environment.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/Environment.swift
rename to Sources/ElixxirDAppsSDK/Models/Environment.swift
diff --git a/Sources/ElixxirDAppsSDK/LogLevel.swift b/Sources/ElixxirDAppsSDK/Models/LogLevel.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/LogLevel.swift
rename to Sources/ElixxirDAppsSDK/Models/LogLevel.swift
diff --git a/Sources/ElixxirDAppsSDK/NetworkFollowerStatus.swift b/Sources/ElixxirDAppsSDK/Models/NetworkFollowerStatus.swift
similarity index 100%
rename from Sources/ElixxirDAppsSDK/NetworkFollowerStatus.swift
rename to Sources/ElixxirDAppsSDK/Models/NetworkFollowerStatus.swift