diff --git a/AdditionsForToricVarieties/PackageInfo.g b/AdditionsForToricVarieties/PackageInfo.g
index 7dd86305..a47aea12 100644
--- a/AdditionsForToricVarieties/PackageInfo.g
+++ b/AdditionsForToricVarieties/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/AdditionsForToricVarieties/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/AdditionsForToricVarieties",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "AdditionsForToricVarieties provides additional structures for toric varieties required to compute sheaf cohomologies",
 
diff --git a/CoherentSheavesOnToricVarieties/PackageInfo.g b/CoherentSheavesOnToricVarieties/PackageInfo.g
index a8a1dbbe..66e51f3a 100644
--- a/CoherentSheavesOnToricVarieties/PackageInfo.g
+++ b/CoherentSheavesOnToricVarieties/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/CoherentSheavesOnToricVarieties/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/CoherentSheavesOnToricVarieties",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "CoherentSheavesOnToricVarieties models coherent toric sheaves as elements in a Serre quotient category",
 
diff --git a/H0Approximator/PackageInfo.g b/H0Approximator/PackageInfo.g
index 89c26c70..2f245b91 100644
--- a/H0Approximator/PackageInfo.g
+++ b/H0Approximator/PackageInfo.g
@@ -66,11 +66,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/H0Approximator/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/H0Approximator",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "H0Approximator allows to estimate global sections of a line bundle on curves in dP3 and H2",
 
diff --git a/QSMExplorer/PackageInfo.g b/QSMExplorer/PackageInfo.g
index 26711918..24a9c083 100644
--- a/QSMExplorer/PackageInfo.g
+++ b/QSMExplorer/PackageInfo.g
@@ -66,11 +66,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://homalg-project.github.io/ToricVarieties_project/QSMExplorer",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/QSMExplorer",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "QSMExplorer allows to investigate one Quadrillion F-theory Standard Models quickly and efficiently",
 
diff --git a/SheafCohomologyOnToricVarieties/PackageInfo.g b/SheafCohomologyOnToricVarieties/PackageInfo.g
index fd403be1..2575e6a1 100644
--- a/SheafCohomologyOnToricVarieties/PackageInfo.g
+++ b/SheafCohomologyOnToricVarieties/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/SheafCohomologyOnToricVarieties/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/SheafCohomologyOnToricVarieties",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := 
   Concatenation( "SheafCohomologyOnToricVarieties provides an extension of the ToricVarieties package",
diff --git a/SparseMatrices/PackageInfo.g b/SparseMatrices/PackageInfo.g
index 15b81feb..d70f5bba 100644
--- a/SparseMatrices/PackageInfo.g
+++ b/SparseMatrices/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/SparseMatrices",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/SparseMatrices",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "SparseMatrices enables to handle sparse matrices in gap",
 
diff --git a/SpasmInterface/PackageInfo.g b/SpasmInterface/PackageInfo.g
index 86a9a458..eec3cc5d 100644
--- a/SpasmInterface/PackageInfo.g
+++ b/SpasmInterface/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/SpasmInterface/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/SpasmInterface",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "SpasmInterface enables to communicate with software Spasm via gap",
 
diff --git a/ToolsForFPGradedModules/PackageInfo.g b/ToolsForFPGradedModules/PackageInfo.g
index 8dc79d9a..1600eea4 100644
--- a/ToolsForFPGradedModules/PackageInfo.g
+++ b/ToolsForFPGradedModules/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/ToolsForFPGradedModules/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/ToolsForFPGradedModules",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "ToolsForFPGradedModules provides additional structures and tools for FPGradedModules",
 
diff --git a/TopcomInterface/PackageInfo.g b/TopcomInterface/PackageInfo.g
index f31c3beb..93e47e75 100644
--- a/TopcomInterface/PackageInfo.g
+++ b/TopcomInterface/PackageInfo.g
@@ -46,11 +46,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/HereAround/TopcomInterface",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/TopcomInterface",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "TopcomInterface enables to communicate with software Topcom via gap",
 
diff --git a/ToricVarieties/PackageInfo.g b/ToricVarieties/PackageInfo.g
index bb5d89e7..57b6289e 100644
--- a/ToricVarieties/PackageInfo.g
+++ b/ToricVarieties/PackageInfo.g
@@ -61,16 +61,19 @@ rec(
 ],
 
 Status := "deposited",
+
 SourceRepository := rec(
-  Type := "git",
-  URL := "https://homalg-project.github.io/ToricVarieties_project/ToricVarieties"
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
 ),
 IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
-PackageWWWHome := "https://homalg-project.github.io/ToricVarieties_project/ToricVarieties/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/ToricVarieties",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := 
   Concatenation( "ToricVarieties provides data structures to handle toric varieties by their commutative algebra ",
diff --git a/TruncationsOfFPGradedModules/PackageInfo.g b/TruncationsOfFPGradedModules/PackageInfo.g
index b2d95194..29a60525 100644
--- a/TruncationsOfFPGradedModules/PackageInfo.g
+++ b/TruncationsOfFPGradedModules/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/TruncationsOfFPGradedModules/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/TruncationsOfFPGradedModules",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "TruncationsOfFPGradedModules provides methods to compute truncations of FPGradedModules",
 
diff --git a/cohomCalgInterface/PackageInfo.g b/cohomCalgInterface/PackageInfo.g
index 505d2191..096c8cc0 100644
--- a/cohomCalgInterface/PackageInfo.g
+++ b/cohomCalgInterface/PackageInfo.g
@@ -45,11 +45,19 @@ rec(
 ],
 
 Status := "dev",
-PackageWWWHome := "https://github.com/homalg-project/ToricVarieties_project/tree/master/cohomCalgInterface/",
-ArchiveFormats := ".tar.gz .zip",
-ArchiveURL     := "https://github.com/homalg-project/ToricVarieties_project/releases/download/2022-03-04/cohomCalgInterface",
-README_URL     := Concatenation( ~.PackageWWWHome, "README" ),
-PackageInfoURL := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
+
+SourceRepository := rec(
+    Type := "git",
+    URL := "https://github.com/homalg-project/ToricVarieties_project",
+),
+IssueTrackerURL := Concatenation( ~.SourceRepository.URL, "/issues" ),
+PackageWWWHome  := Concatenation( "https://homalg-project.github.io/ToricVarieties_project/", ~.PackageName ),
+ArchiveFormats  := ".tar.gz .zip",
+ArchiveURL      := Concatenation( ~.SourceRepository.URL,
+                                 "/releases/download/", ReplacedString( ~.Version, ".", "-"),
+                                 "/", ~.PackageName, "-", ~.Version ),
+README_URL      := Concatenation( ~.PackageWWWHome, "README" ),
+PackageInfoURL  := Concatenation( ~.PackageWWWHome, "PackageInfo.g" ),
 
 AbstractHTML := "cohomCalgInterface enables to communicate with software cohomCalg via gap",