diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs
index 6e67ca406f..3dafc685f8 100644
--- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs
+++ b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs
@@ -75,6 +75,7 @@ namespace Volo.Abp.Studio.Solution
             if (folderName.Contains("/") && parentFolderId == null)
             {
                 var parents = folderName.Split("/").SkipLast(1).JoinAsString("/");
+                folderName = folderName.Split("/").Last();
 
                 parentFolderId = await GetOrAddFolderIdAsync(solutionFile, parents);
             }
diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs
index 3705c0a94f..18db782c5d 100644
--- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs
+++ b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs
@@ -15,8 +15,8 @@ namespace Volo.Abp.Studio.ModuleInstalling.Steps
             var moduleSrcFolder = Path.Combine(context.GetTargetSourceCodeFolder(), "src");
             var moduleTestFolder = Path.Combine(context.GetTargetSourceCodeFolder(), "test");
 
-            await AddProjectsUnderDirectoryToSolutionFile(context, slnFile, moduleSrcFolder, $"modules/{context.ModuleName}/src");
-            await AddProjectsUnderDirectoryToSolutionFile(context, slnFile, moduleTestFolder, $"test/{context.ModuleName}");
+            await AddProjectsUnderDirectoryToSolutionFile(context, slnFile, moduleSrcFolder, $"modules/{context.ModuleName}");
+            await AddProjectsUnderDirectoryToSolutionFile(context, slnFile, moduleTestFolder, $"test/{context.ModuleName}.Tests");
         }
 
         private static async Task AddProjectsUnderDirectoryToSolutionFile(
diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs
index e74987c5e1..ac506263b7 100644
--- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs
+++ b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs
@@ -42,7 +42,8 @@ namespace Volo.Abp.Studio.ModuleInstalling.Steps
             if (context.WithSourceCode)
             {
                 var referenceProjectPath = Directory.GetFiles(context.GetTargetSourceCodeFolder(),
-                    $"{referencePackage.Name}.csproj").FirstOrDefault();
+                    $"*{referencePackage.Name}.csproj",
+                    SearchOption.AllDirectories).FirstOrDefault();
 
                 await _csprojFileManager.AddProjectReferenceAsync(
                     csprojFilePath,