diff --git a/dap-tool-core/src/main/java/io/shinhanlife/dap/lib/util/ToolScaffolder.java b/dap-tool-core/src/main/java/io/shinhanlife/dap/lib/util/ToolScaffolder.java
index 54cf8b38..e719b54b 100644
--- a/dap-tool-core/src/main/java/io/shinhanlife/dap/lib/util/ToolScaffolder.java
+++ b/dap-tool-core/src/main/java/io/shinhanlife/dap/lib/util/ToolScaffolder.java
@@ -104,7 +104,7 @@ public class ToolScaffolder {
             clientPkgSuffix = clientPrefix.substring(0, 3) + "." + clientPrefix.substring(3, 4);
             clientPrefixCap = toPascalCase(clientSystemCode);
             mciGroupPath = "infra/itrf/mci/" + clientPrefix.substring(0, 3) + "/" + clientPrefix.substring(3, 4);
-            mciClientDir = rootDir.resolve(Paths.get(moduleName, BASE_PACKAGE_PATH, mciGroupPath, "client"));
+            mciClientDir = rootDir.resolve(Paths.get(moduleName, BASE_PACKAGE_PATH, mciGroupPath));
         }
 
         Path mciIoDir = rootDir.resolve(Paths.get(moduleName, BASE_PACKAGE_PATH, mciGroupPath, "io"));
@@ -241,7 +241,7 @@ public class ToolScaffolder {
                 import lombok.RequiredArgsConstructor;
                 import lombok.extern.slf4j.Slf4j;
                 import java.util.Map;
-                import %s.converter.%sLegacyConverter;
+                import %s.converter.%sConverter;
                 import %s.%s.io.%s_I;
 %s
 
@@ -265,7 +265,7 @@ public class ToolScaffolder {
                 public class %sUseCaseImpl implements %sUseCase {
 
 %s
-                    private final %sLegacyConverter converter;
+                    private final %sConverter converter;
 
                     @Override
                     public Object execute(%sRequest req) {
@@ -293,9 +293,8 @@ public class ToolScaffolder {
                     bizPackage, baseName,
                     bizPackage, baseName,
                     bizPackage, baseName,
-                    bizPackage, baseName,
                     BASE_PACKAGE, mciGroupPath.replace("/", "."), interfaceId,
-                    (clientPrefixCap.isEmpty() ? "" : "                import " + BASE_PACKAGE + "." + mciGroupPath.replace("/", ".") + ".client.Mci" + clientPrefixCap + "Client;\n"),
+                    (clientPrefixCap.isEmpty() ? "" : "                import " + BASE_PACKAGE + "." + mciGroupPath.replace("/", ".") + ".Mci" + clientPrefixCap + "Client;\n"),
                     bizPackage,
                     baseName,
                     author,
@@ -318,7 +317,7 @@ public class ToolScaffolder {
                 import %s.dto.%sResponse;
                 import %s.usecase.%sUseCase;
                 import io.shinhanlife.dap.mcc.usecase.AbstractMcpToolUseCase;
-                import %s.converter.%sLegacyConverter;
+                import %s.converter.%sConverter;
                 import org.springframework.stereotype.Service;
                 import lombok.RequiredArgsConstructor;
                 import lombok.extern.slf4j.Slf4j;
@@ -342,7 +341,7 @@ public class ToolScaffolder {
                 @RequiredArgsConstructor
                 public class %sUseCaseImpl extends AbstractMcpToolUseCase implements %sUseCase {
 
-                    private final %sLegacyConverter converter;
+                    private final %sConverter converter;
 
                     @Override
                     public Object execute(%sRequest req) {
@@ -444,7 +443,7 @@ public class ToolScaffolder {
 
                 /**
                  * @package %s.converter
-                 * @className %sLegacyConverter
+                 * @className %sConverter
                  * @description AX HUB 시스템 처리 클래스
                  * @author %s
                  * @create %s
@@ -457,7 +456,7 @@ public class ToolScaffolder {
                  * </pre>
                  */
                 @Mapper(componentModel = "spring")
-                public interface %sLegacyConverter {
+                public interface %sConverter {
 
                     @Mapping(source = "phoneNumber", target = "phone")
                     @Mapping(source = "message", target = "content")
@@ -491,11 +490,11 @@ public class ToolScaffolder {
             log.append("[Response DTO] ").append(dtoDir.resolve(baseName + "Response.java")).append("\n");
             log.append("[MCI Request IO] ").append(mciIoDir.resolve(interfaceId + "_I.java")).append("\n");
             log.append("[MCI Response IO] ").append(mciIoDir.resolve(interfaceId + "_O.java")).append("\n");
-            log.append("[MCI Converter] ").append(converterDir.resolve(baseName + "LegacyConverter.java")).append("\n");
+            log.append("[MCI Converter] ").append(converterDir.resolve(baseName + "Converter.java")).append("\n");
 
             if (!clientPrefixCap.isEmpty()) {
                 String mciClientContent = """
-                    package %s.%s.client;
+                    package %s.%s;
                     
                     import org.springframework.stereotype.Component;
                     import lombok.RequiredArgsConstructor;
@@ -503,7 +502,7 @@ public class ToolScaffolder {
                     import io.shinhanlife.glow.communication.dto.Transfer;
                     
                     /**
-                     * @package %s.%s.client
+                     * @package %s.%s
                      * @className Mci%sClient
                      * @description AX HUB 시스템 처리 클래스
                      * @author %s
@@ -607,7 +606,7 @@ public class ToolScaffolder {
 
                 /**
                  * @package %s.converter
-                 * @className %sLegacyConverter
+                 * @className %sConverter
                  * @description AX HUB 시스템 처리 클래스
                  * @author %s
                  * @create %s
@@ -620,7 +619,7 @@ public class ToolScaffolder {
                  * </pre>
                  */
                 @Mapper(componentModel = "spring")
-                public interface %sLegacyConverter {
+                public interface %sConverter {
 
                     @Mapping(source = "phoneNumber", target = "phone")
                     @Mapping(source = "message", target = "content")
@@ -641,7 +640,7 @@ public class ToolScaffolder {
                     bizPackage, baseName, author, createDate, createDate, author,
                     baseName, baseName, baseName, baseName, baseName, baseName, baseName
                 );
-            Files.writeString(converterDir.resolve(baseName + "LegacyConverter.java"), converterContent);
+            Files.writeString(converterDir.resolve(baseName + "Converter.java"), converterContent);
 
             log.append("\n=========================================\n");
             log.append(" Scaffolding Complete! (Routing: " + routingType + ")\n");
@@ -652,7 +651,7 @@ public class ToolScaffolder {
             log.append("[Response DTO] ").append(dtoDir.resolve(baseName + "Response.java")).append("\n");
             log.append("[Legacy Request DTO] ").append(legacyDtoDir.resolve(baseName + "LegacyRequest.java")).append("\n");
             log.append("[Legacy Response DTO] ").append(legacyDtoDir.resolve(baseName + "LegacyResponse.java")).append("\n");
-            log.append("[Legacy Converter] ").append(converterDir.resolve(baseName + "LegacyConverter.java")).append("\n");
+            log.append("[Legacy Converter] ").append(converterDir.resolve(baseName + "Converter.java")).append("\n");
         }
         log.append("\n Tip: ").append(interfaceId).append(" 목업 데이터를 mock-responses.json에 추가하세요.\n");