diff --git a/Package.swift b/Package.swift
index ff2b9ba9..b6c95af7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -49,6 +49,6 @@ let package = Package(
 
 enum MarvelService {
     static let package = "marvel-service"
-    static let target = "AmiiboMarvelService"
+    static let target = "MarvelService"
     static let test = "\(MarvelService.target)Tests"
 }
\ No newline at end of file
diff --git a/Sources/MarvelService/marvel_service.swift b/Sources/MarvelService/Public/marvel_service.swift
similarity index 100%
rename from Sources/MarvelService/marvel_service.swift
rename to Sources/MarvelService/Public/marvel_service.swift
diff --git a/Tests/MarvelService/marvel_serviceTests.swift b/Tests/MarvelService/Cases/marvel_serviceTests.swift
similarity index 100%
rename from Tests/MarvelService/marvel_serviceTests.swift
rename to Tests/MarvelService/Cases/marvel_serviceTests.swift