diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json
index 52fe110c92..45486d0079 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/project.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/project.json
@@ -10,31 +10,39 @@
         "warningsAsErrors": true,
         "allowUnsafe": true,
         "copyToOutput": {
-            "include": [
-                "Modules",
-                "../Modules",
+            "mappings": {
+                "Modules/" : {
+                    "include": [
+                        "../Modules/Full",
+                        "../Modules/Shared"
+                    ],
+                    "exclude": [
+                        "../Modules/Shared/Pester/.git"
+                    ]
+                }
+            },
+            "include" : [
                 "powershell.exe",
                 "../../powershell.version"
-            ],
-            "exclude": [
-                "../Modules/Pester/.git",
-                "../Modules/map.json",
-                "Modules/map.json"
             ]
         }
     },
 
     "publishOptions": {
-        "include": [
-            "Modules",
-            "../Modules",
+        "mappings": {
+            "Modules/" : {
+                "include": [
+                    "../Modules/Full",
+                    "../Modules/Shared"
+                ],
+                "exclude": [
+                    "../Modules/Shared/Pester/.git"
+                ]
+            }
+        },
+        "include" : [
             "powershell.exe",
             "../../powershell.version"
-        ],
-        "exclude": [
-            "../Modules/Pester/.git",
-            "../Modules/map.json",
-            "Modules/map.json"
         ]
     },
 
diff --git a/src/powershell/project.json b/src/powershell/project.json
index 45d9c74072..da0f261c71 100644
--- a/src/powershell/project.json
+++ b/src/powershell/project.json
@@ -8,34 +8,42 @@
         "allowUnsafe": true,
         "emitEntryPoint": true,
         "copyToOutput": {
+            "mappings": {
+                "Modules/" : {
+                    "include": [
+                        "../Modules/Core",
+                        "../Modules/Shared"
+                    ],
+                    "exclude": [
+                        "../Modules/Shared/Pester/.git"
+                    ]
+                }
+            },
             "include": [
-                "Modules",
-                "../Modules",
                 "*.so",
                 "*.dylib",
                 "../../powershell.version"
             ],
-            "exclude": [
-                "../Modules/Pester/.git",
-                "../Modules/map.json",
-                "Modules/map.json"
-            ]
         }
     },
 
     "publishOptions": {
+        "mappings": {
+            "Modules/" : {
+                "include": [
+                    "../Modules/Core",
+                    "../Modules/Shared"
+                ],
+                "exclude": [
+                    "../Modules/Shared/Pester/.git"
+                ]
+            }
+        },
         "include": [
-            "Modules",
-            "../Modules",
             "*.so",
             "*.dylib",
             "../../powershell.version"
         ],
-        "exclude": [
-            "../Modules/Pester/.git",
-            "../Modules/map.json",
-            "Modules/map.json"
-        ]
     },
 
     "dependencies": {