diff --git a/data/plz.py b/data/plz.py
index 041a433..a540bb0 100755
--- a/data/plz.py
+++ b/data/plz.py
@@ -14,8 +14,8 @@ import PyPDF2
 PLZ_URL = 'https://www.post.at/g/c/postlexikon'
 PLZ_BUTTON = re.compile(r'title="PLZ Bestimmungsort" href="(.*?)"')
 
-KGV_URL = 'https://www.bev.gv.at/portal/page?_pageid=713,2601283&_dad=portal&_schema=PORTAL'
-KGV_LINK = re.compile(r'<a\s+href="(.*?)"\s*>')
+KGV_URL = 'https://www.bev.gv.at/Services/Downloads/Produktbezogene-Downloads/Unentgeltliche-Produkte/Kataster-Verzeichnisse/Katastralgemeindenverzeichnis.html'
+KGV_LINK = re.compile(r'<a\s+href="(.*?)".*?>Katastral')
 
 OV_URL = 'https://statistik.gv.at/fileadmin/publications/Ortsverzeichnis_2001__{}.pdf'
 OV_NAMES = ['Burgenland', 'Niederoesterreich', 'Wien']
@@ -251,7 +251,7 @@ def write_sql(plz_rows: List[PlzRow], kgv_rows: List[KgvRow], ov_rows: List[OvRo
     gemeinden = {gkz: (gem_name, [], []) for kgnr, kg_name, gkz, gem_name in kgv_rows}
 
     pr = set()
-    with open('plz.sql', 'wb') as f:
+    with open('90.plz.sql', 'wb') as f:
         f.write(b"\nINSERT INTO AT_gem VALUES\n")
         for gkz, (name, _, _) in gemeinden.items():
             f.write(f"({gkz:5}, '{name}'),\n".encode('utf8'))
@@ -332,6 +332,6 @@ if __name__ == '__main__':
     plz_data = download_plz()
     print('Downloading Katastralgemeindenverzeichnis from www.bev.gv.at')
     kgv_data = download_kgv()
-    print('Generating plz.sql')
+    print('Generating 90.plz.sql')
     write_sql(plz_data, kgv_data, ov_data)
-    print('Successfully created plz.sql!')
+    print('Successfully created 90.plz.sql!')
diff --git a/sql/01.plz-fix.sql b/sql/91.plz-fix.sql
similarity index 100%
rename from sql/01.plz-fix.sql
rename to sql/91.plz-fix.sql
diff --git a/sql/v01/01.create.sql b/sql/v01/10.create.sql
similarity index 100%
rename from sql/v01/01.create.sql
rename to sql/v01/10.create.sql
diff --git a/sql/v01/02.view.sql b/sql/v01/20.view.sql
similarity index 100%
rename from sql/v01/02.view.sql
rename to sql/v01/20.view.sql
diff --git a/sql/v01/03.base.sql b/sql/v01/50.base.sql
similarity index 100%
rename from sql/v01/03.base.sql
rename to sql/v01/50.base.sql
diff --git a/sql/02.wb_gem.sql b/sql/v01/92.wb_gem.sql
similarity index 100%
rename from sql/02.wb_gem.sql
rename to sql/v01/92.wb_gem.sql
diff --git a/sqlite.sh b/sqlite.sh
index 692a0d1..dabfe00 100755
--- a/sqlite.sh
+++ b/sqlite.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 dir="."
 sqlite3 -box \
-  -cmd ".read $dir/sql/v01/01.create.sql" \
-  -cmd ".read $dir/sql/v01/02.view.sql" \
-  -cmd ".read $dir/sql/v01/03.base.sql" \
-  -cmd ".read $dir/data/plz.sql" \
-  -cmd ".read $dir/sql/01.plz-fix.sql" \
-  -cmd ".read $dir/sql/02.wb_gem.sql"
+  -cmd ".read $dir/sql/v01/10.create.sql" \
+  -cmd ".read $dir/sql/v01/20.view.sql" \
+  -cmd ".read $dir/sql/v01/50.base.sql" \
+  -cmd ".read $dir/data/90.plz.sql" \
+  -cmd ".read $dir/sql/91.plz-fix.sql" \
+  -cmd ".read $dir/sql/v01/92.wb_gem.sql"
   -cmd ".read $dir/sql/sample.sql" \
   $@