diff --git a/Tests/AmiiboService/Tests/Public/Services/AmiiboServiceLiveTests.swift b/Tests/AmiiboService/Cases/Public/Services/AmiiboServiceLiveTests.swift
similarity index 100%
rename from Tests/AmiiboService/Tests/Public/Services/AmiiboServiceLiveTests.swift
rename to Tests/AmiiboService/Cases/Public/Services/AmiiboServiceLiveTests.swift
diff --git a/Tests/AmiiboService/Types/Clients/AmiiboMockClient.swift b/Tests/AmiiboService/Helpers/Clients/AmiiboMockClient.swift
similarity index 100%
rename from Tests/AmiiboService/Types/Clients/AmiiboMockClient.swift
rename to Tests/AmiiboService/Helpers/Clients/AmiiboMockClient.swift
diff --git a/Tests/AmiiboService/Types/Extensions/Tag+Customs.swift b/Tests/AmiiboService/Helpers/Extensions/Tag+Customs.swift
similarity index 100%
rename from Tests/AmiiboService/Types/Extensions/Tag+Customs.swift
rename to Tests/AmiiboService/Helpers/Extensions/Tag+Customs.swift