diff --git a/.github/workflows/CSharpBuild.yml b/.github/workflows/CSharpBuild.yml
index ebc874807..1f6f46f8d 100644
--- a/.github/workflows/CSharpBuild.yml
+++ b/.github/workflows/CSharpBuild.yml
@@ -26,5 +26,5 @@ jobs:
         
     - name: Build AngouriMath
       run: |
-        cd Sources/AngouriMath/AngouriMath
+        cd Sources/AngouriMath
         dotnet build
diff --git a/.github/workflows/EverythingBuild.yml b/.github/workflows/EverythingBuild.yml
index efb903b10..4fa0012da 100644
--- a/.github/workflows/EverythingBuild.yml
+++ b/.github/workflows/EverythingBuild.yml
@@ -24,7 +24,7 @@ jobs:
         dotnet-quality: 'preview'
 
     - name: Build AM
-      run: dotnet build Sources/AngouriMath/AngouriMath/AngouriMath.csproj
+      run: dotnet build Sources/AngouriMath/AngouriMath.csproj
 
     - name: Build FSharp
       run: dotnet build Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj
diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml
index dfb0c3661..cfa5fbf48 100644
--- a/.github/workflows/IntegrationTest.yml
+++ b/.github/workflows/IntegrationTest.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   package_version: 99.99.99
-  packed_path: D:\a\AngouriMath\AngouriMath\Sources\AngouriMath\AngouriMath\bin\release
+  packed_path: D:\a\AngouriMath\AngouriMath\Sources\AngouriMath\bin\release
   
   library_version: 33.33.33
   library_packed_path: D:\a\AngouriMath\AngouriMath\testlib\bin\release
@@ -27,7 +27,7 @@ jobs:
           
       - name: 'Pack AngouriMath'
         run: |
-          cd Sources/AngouriMath/AngouriMath
+          cd Sources/AngouriMath
           dotnet restore AngouriMath.csproj
           dotnet build AngouriMath.csproj -c release
           dotnet pack AngouriMath.csproj -c release -p:PackageVersion=${{ env.package_version }}
@@ -69,7 +69,7 @@ jobs:
           
       - name: 'Pack AngouriMath'
         run: |
-          cd Sources/AngouriMath/AngouriMath
+          cd Sources/AngouriMath
           dotnet restore AngouriMath.csproj
           dotnet build AngouriMath.csproj -c release
           dotnet pack AngouriMath.csproj -c release -p:PackageVersion=${{ env.package_version }}
diff --git a/.github/workflows/Nuget.yml b/.github/workflows/Nuget.yml
index 071d80e10..ac2265a33 100644
--- a/.github/workflows/Nuget.yml
+++ b/.github/workflows/Nuget.yml
@@ -30,7 +30,7 @@ jobs:
           echo "name is $name"
           
           # AngouriMath
-          cd AngouriMath/AngouriMath
+          cd AngouriMath
           dotnet restore AngouriMath.csproj
           dotnet build AngouriMath.csproj -c release
           dotnet pack AngouriMath.csproj -c release -p:PackageVersion=$name
diff --git a/Sources/AngouriMath.sln b/Sources/AngouriMath.sln
index 4bcbc41eb..e983a6a63 100644
--- a/Sources/AngouriMath.sln
+++ b/Sources/AngouriMath.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.1.11312.151 d18.0
+VisualStudioVersion = 18.1.11312.151
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AngouriMath", "AngouriMath", "{F604DFEB-8939-4B4F-8E37-1FDC06E26D5A}"
 EndProject
@@ -50,6 +50,12 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AngouriMath.Terminal.Lib", "Terminal\AngouriMath.Terminal.Lib\AngouriMath.Terminal.Lib.fsproj", "{405E214B-17A6-83E0-90A1-4F8B7213954F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{DC3A3E46-854E-403D-8FA5-561DF66277D4}"
+	ProjectSection(SolutionItems) = preProject
+		Utils\antlr_rerun.bat = Utils\antlr_rerun.bat
+		Utils\generate_additional_extensions.bat = Utils\generate_additional_extensions.bat
+		Utils\generate_additional_extensions_tests.bat = Utils\generate_additional_extensions_tests.bat
+		Utils\generate_exports.bat = Utils\generate_exports.bat
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils\Utils.csproj", "{9E733914-18F8-CD3A-EDB8-F32FFEF4A3DA}"
 EndProject
diff --git a/Sources/AngouriMath/AngouriMath.csproj b/Sources/AngouriMath/AngouriMath.csproj
index e4ed482c5..7b2d7e46e 100644
--- a/Sources/AngouriMath/AngouriMath.csproj
+++ b/Sources/AngouriMath/AngouriMath.csproj
@@ -44,7 +44,7 @@
 
     <!--Project dependencies-->
     <PackageReference Include="HonkSharp" Version="1.0.3" />
-    <PackageReference Include="Antlr4.Runtime.Standard" Version="4.9.2" />
+    <PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
     <PackageReference Include="GenericTensor" Version="1.0.4" />
     <PackageReference Include="PeterO.Numbers" Version="1.8.0" />
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
diff --git a/Sources/Utils/antlr_rerun.bat b/Sources/Utils/antlr_rerun.bat
index f79589399..cb2a1b0c2 100644
--- a/Sources/Utils/antlr_rerun.bat
+++ b/Sources/Utils/antlr_rerun.bat
@@ -3,7 +3,7 @@ cd ../AngouriMath/Core/Antlr
 :;# AngouriMath.Core.Antlr is the namespace of the generated lexer and parser source files
 java -jar ./antlr-4.13.1-complete.jar -package AngouriMath.Core.Antlr ./AngouriMath.g
 
-cd ../../../../Utils
+cd ../../../Utils
 
 :;# Antlr's generated classes should be internal, not public
 dotnet run --project Utils -c release AntlrPostProcessorReplacePublicWithInternal