Change folder names
Update csproj files