pnp · erwinvanhunen · Feb 5, 2018 · Feb 5, 2018 · Feb 5, 2018
diff --git a/Documentation/MSDN/PnP-PowerShell-Overview.md b/Documentation/MSDN/PnP-PowerShell-Overview.md
diff --git a/Documentation/Set-PnPSiteScript.md b/Documentation/Set-PnPSiteScript.md
@@ -31,7 +31,7 @@ Updates an existing Site Script and changes the title.
 ### ------------------EXAMPLE 2------------------
 ```powershell
 PS:> $script = Get-PnPSiteScript -Identity f1d55d9b-b116-4f54-bc00-164a51e7e47f 
-PS:> Set-PnPSiteScript -Identity = $script -Title "My Site Script"
+PS:> Set-PnPSiteScript -Identity $script -Title "My Site Script"
 ```
 
 Updates an existing Site Script and changes the title.

diff --git a/Documentation/MSDN/Apps-category.md → ...onceptual/sharepoint-pnp/Apps-category.md b/Documentation/MSDN/Apps-category.md → ...onceptual/sharepoint-pnp/Apps-category.md
diff --git a/Documentation/MSDN/BaseCmdlets-category.md → ...al/sharepoint-pnp/BaseCmdlets-category.md b/Documentation/MSDN/BaseCmdlets-category.md → ...al/sharepoint-pnp/BaseCmdlets-category.md
diff --git a/Documentation/MSDN/Branding-category.md → ...ptual/sharepoint-pnp/Branding-category.md b/Documentation/MSDN/Branding-category.md → ...ptual/sharepoint-pnp/Branding-category.md
diff --git a/...ntation/MSDN/Client-SidePages-category.md → ...arepoint-pnp/Client-SidePages-category.md b/...ntation/MSDN/Client-SidePages-category.md → ...arepoint-pnp/Client-SidePages-category.md
diff --git a/Documentation/MSDN/ContentTypes-category.md → ...l/sharepoint-pnp/ContentTypes-category.md b/Documentation/MSDN/ContentTypes-category.md → ...l/sharepoint-pnp/ContentTypes-category.md
diff --git a/...ation/MSDN/Diagnosticutilites-category.md → ...epoint-pnp/Diagnosticutilites-category.md b/...ation/MSDN/Diagnosticutilites-category.md → ...epoint-pnp/Diagnosticutilites-category.md
diff --git a/Documentation/MSDN/DocumentSets-category.md → ...l/sharepoint-pnp/DocumentSets-category.md b/Documentation/MSDN/DocumentSets-category.md → ...l/sharepoint-pnp/DocumentSets-category.md
diff --git a/...mentation/MSDN/EventReceivers-category.md → ...sharepoint-pnp/EventReceivers-category.md b/...mentation/MSDN/EventReceivers-category.md → ...sharepoint-pnp/EventReceivers-category.md
diff --git a/Documentation/MSDN/Features-category.md → ...ptual/sharepoint-pnp/Features-category.md b/Documentation/MSDN/Features-category.md → ...ptual/sharepoint-pnp/Features-category.md
diff --git a/Documentation/MSDN/Fields-category.md → ...ceptual/sharepoint-pnp/Fields-category.md b/Documentation/MSDN/Fields-category.md → ...ceptual/sharepoint-pnp/Fields-category.md
diff --git a/...entation/MSDN/FilesandFolders-category.md → ...harepoint-pnp/FilesandFolders-category.md b/...entation/MSDN/FilesandFolders-category.md → ...harepoint-pnp/FilesandFolders-category.md
diff --git a/...on/MSDN/InformationManagement-category.md → ...int-pnp/InformationManagement-category.md b/...on/MSDN/InformationManagement-category.md → ...int-pnp/InformationManagement-category.md
diff --git a/Documentation/MSDN/Lists-category.md → ...nceptual/sharepoint-pnp/Lists-category.md b/Documentation/MSDN/Lists-category.md → ...nceptual/sharepoint-pnp/Lists-category.md
diff --git a/...mentation/MSDN/MicrosoftGraph-category.md → ...sharepoint-pnp/MicrosoftGraph-category.md b/...mentation/MSDN/MicrosoftGraph-category.md → ...sharepoint-pnp/MicrosoftGraph-category.md
diff --git a/Documentation/MSDN/Provisioning-category.md → ...l/sharepoint-pnp/Provisioning-category.md b/Documentation/MSDN/Provisioning-category.md → ...l/sharepoint-pnp/Provisioning-category.md
diff --git a/Documentation/MSDN/Publishing-category.md → ...ual/sharepoint-pnp/Publishing-category.md b/Documentation/MSDN/Publishing-category.md → ...ual/sharepoint-pnp/Publishing-category.md
diff --git a/...tation/MSDN/RecordsManagement-category.md → ...repoint-pnp/RecordsManagement-category.md b/...tation/MSDN/RecordsManagement-category.md → ...repoint-pnp/RecordsManagement-category.md
diff --git a/Documentation/MSDN/Search-category.md → ...ceptual/sharepoint-pnp/Search-category.md b/Documentation/MSDN/Search-category.md → ...ceptual/sharepoint-pnp/Search-category.md
diff --git a/...ion/MSDN/SharePointRecycleBin-category.md → ...oint-pnp/SharePointRecycleBin-category.md b/...ion/MSDN/SharePointRecycleBin-category.md → ...oint-pnp/SharePointRecycleBin-category.md
diff --git a/...ation/MSDN/SharePointWebHooks-category.md → ...epoint-pnp/SharePointWebHooks-category.md b/...ation/MSDN/SharePointWebHooks-category.md → ...epoint-pnp/SharePointWebHooks-category.md
diff --git a/Documentation/MSDN/Sites-category.md → ...nceptual/sharepoint-pnp/Sites-category.md b/Documentation/MSDN/Sites-category.md → ...nceptual/sharepoint-pnp/Sites-category.md
diff --git a/Documentation/MSDN/TOC.md → ...ion/docs-conceptual/sharepoint-pnp/TOC.md b/Documentation/MSDN/TOC.md → ...ion/docs-conceptual/sharepoint-pnp/TOC.md
diff --git a/Documentation/MSDN/Taxonomy-category.md → ...ptual/sharepoint-pnp/Taxonomy-category.md b/Documentation/MSDN/Taxonomy-category.md → ...ptual/sharepoint-pnp/Taxonomy-category.md
diff --git a/...ion/MSDN/TenantAdministration-category.md → ...oint-pnp/TenantAdministration-category.md b/...ion/MSDN/TenantAdministration-category.md → ...oint-pnp/TenantAdministration-category.md
diff --git a/Documentation/MSDN/UserProfiles-category.md → ...l/sharepoint-pnp/UserProfiles-category.md b/Documentation/MSDN/UserProfiles-category.md → ...l/sharepoint-pnp/UserProfiles-category.md
diff --git a/...n/MSDN/Userandgroupmanagement-category.md → ...nt-pnp/Userandgroupmanagement-category.md b/...n/MSDN/Userandgroupmanagement-category.md → ...nt-pnp/Userandgroupmanagement-category.md
diff --git a/Documentation/MSDN/Utilities-category.md → ...tual/sharepoint-pnp/Utilities-category.md b/Documentation/MSDN/Utilities-category.md → ...tual/sharepoint-pnp/Utilities-category.md
diff --git a/Documentation/MSDN/WebParts-category.md → ...ptual/sharepoint-pnp/WebParts-category.md b/Documentation/MSDN/WebParts-category.md → ...ptual/sharepoint-pnp/WebParts-category.md
diff --git a/Documentation/MSDN/Webs-category.md → ...onceptual/sharepoint-pnp/Webs-category.md b/Documentation/MSDN/Webs-category.md → ...onceptual/sharepoint-pnp/Webs-category.md
diff --git a/Documentation/MSDN/Workflows-category.md → ...tual/sharepoint-pnp/Workflows-category.md b/Documentation/MSDN/Workflows-category.md → ...tual/sharepoint-pnp/Workflows-category.md
diff --git a/Documentation/docs-conceptual/sharepoint-pnp/sharepoint-pnp-cmdlets.md b/Documentation/docs-conceptual/sharepoint-pnp/sharepoint-pnp-cmdlets.md
diff --git a/ModuleFilesGenerator/MarkDownGenerator.cs b/ModuleFilesGenerator/MarkDownGenerator.cs
@@ -335,14 +335,14 @@ private void GenerateMSDNTOC()
             var originalTocMd = string.Empty;
             var newTocMd = string.Empty;
 
-            var msdnDocPath = $"{_solutionDir}\\Documentation\\MSDN";
+            var msdnDocPath = $"{_solutionDir}\\Documentation\\docs-conceptual\\sharepoint-pnp";
             if (!Directory.Exists(msdnDocPath))
             {
                 Directory.CreateDirectory(msdnDocPath);
             }
 
             // Generate the landing page
-            var landingPagePath = $"{msdnDocPath}\\PnP-PowerShell-Overview.{extension}";
+            var landingPagePath = $"{msdnDocPath}\\sharepoint-pnp-cmdlets.{extension}";
             GenerateMSDNLandingPage(landingPagePath);
 
             // TOC.md generation
@@ -425,7 +425,7 @@ private void GenerateMSDNLandingPage(string landingPagePath)
                 foreach (var cmdletInfo in categoryCmdlets)
                 {
                     var description = cmdletInfo.Description != null ? cmdletInfo.Description.Replace("\r\n", " ") : "";
-                    docBuilder.AppendFormat("**[{0}]({1}-{2}.md)** |{3}|{4}{5}", cmdletInfo.FullCommand.Replace("-", "&#8209;"), cmdletInfo.Verb, cmdletInfo.Noun, description, cmdletInfo.Platform, Environment.NewLine);
+                    docBuilder.AppendFormat("**[{0}](../../sharepoint-ps/sharepoint-pnp/{1}-{2}.md)** |{3}|{4}{5}", cmdletInfo.FullCommand.Replace("-", "&#8209;"), cmdletInfo.Verb, cmdletInfo.Noun, description, cmdletInfo.Platform, Environment.NewLine);
                 }
             }
 

diff --git a/ModuleFilesGenerator/landingpage.md b/ModuleFilesGenerator/landingpage.md
@@ -11,7 +11,7 @@ _**Applies to:** SharePoint Online | SharePoint 2016 | SharePoint 2013_
 There are 3 ways to install the cmdlets. We recommend, where possible, to install them from the [PowerShell Gallery](https://www.powershellgallery.com). Alternatively you can download the setup files or run a PowerShell script to download the PowerShellGet module and install the cmdlets subsequently.
 
 ### PowerShell Gallery ###
-If you main OS is Windows 10, of if you have [PowerShellGet](https://github.com/powershell/powershellget) installed, you can run the following commands to install the PowerShell cmdlets:
+If you main OS is Windows 10, or if you have [PowerShellGet](https://github.com/powershell/powershellget) installed, you can run the following commands to install the PowerShell cmdlets:
 
 |**SharePoint Version**|**Command to install**|
 |------------------|------------------|
@@ -25,15 +25,15 @@ If you main OS is Windows 10, of if you have [PowerShellGet](https://github.com/
 In order to install the cmdlets when you get this error specify the -SkipPublisherCheck switch with the Install-Module cmdlet, e.g. ```Install-Module SharePointPnPPowerShellOnline -SkipPublisherCheck -AllowClobber```
 
 ### Setup files ##
-You can download setup files from the [releases](https://github.com/officedev/pnp-powershell/releases) section of the PnP PowerShell repository. These files will up be updated on a monthly basis. Run the install and restart any open instances of PowerShell to use the cmdlets.
+You can download setup files from the [releases](https://github.com/sharepoint/pnp-powershell/releases) section of the PnP PowerShell repository. These files will up be updated on a monthly basis. Run the install and restart any open instances of PowerShell to use the cmdlets.
 
 ### Installation script ##
 This is an alternative for installation on machines that have at least PowerShell v3 installed. You can find the version of PowerShell  by opening PowerShell and running ```$PSVersionTable.PSVersion```. The value for ```Major``` should be above 3.
 
 To install the cmdlets you can run the below command which will install PowerShell Package Management and then install the PowerShell Modules from the PowerShell Gallery.
 
 ```powershell
-Invoke-Expression (New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/OfficeDev/PnP-PowerShell/master/Samples/Modules.Install/Install-SharePointPnPPowerShell.ps1')
+Invoke-Expression (New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/sharepoint/PnP-PowerShell/master/Samples/Modules.Install/Install-SharePointPnPPowerShell.ps1')
 ```
 
 ## Updating ##
@@ -74,7 +74,7 @@ At the following links you will find a few videos on how to get started with the
 * https://channel9.msdn.com/blogs/OfficeDevPnP/PnP-Webcast-PnP-PowerShell-Getting-started-with-latest-updates
 
 ### Setting up credentials ##
-See this [wiki page](https://github.com/OfficeDev/PnP-PowerShell/wiki/How-to-use-the-Windows-Credential-Manager-to-ease-authentication-with-PnP-PowerShell) for more information on how to use the Windows Credential Manager to setup credentials that you can use in unattended scripts
+See this [wiki page](https://github.com/SharePoint/PnP-PowerShell/wiki/How-to-use-the-Windows-Credential-Manager-to-ease-authentication-with-PnP-PowerShell) for more information on how to use the Windows Credential Manager to setup credentials that you can use in unattended scripts
 
 ## Cmdlet overview
 ---cmdletdata---