diff --git a/.gitignore b/.gitignore
index fcd5c096c..057809847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,19 @@
-.idea/
+# JS stuff
 .nyc_output/
 dist/
 lib/
 node_modules/
-
 tsconfig.tsbuildinfo
 
-*.swp
-
-yarn-error.log
-
-npm-packages-offline-cache/
-
+# GNU-style build system
 /configure
 build-system/config.mk
 
-
+# Editor files
 \#*\#
 *~
+*.swp
+.idea/
 
 # old folder
 build-scripts/
diff --git a/articles/ui/figs/bitcoin.pdf b/articles/ui/figs/bitcoin.pdf
deleted file mode 100644
index c1c9b9ca3..000000000
Binary files a/articles/ui/figs/bitcoin.pdf and /dev/null differ
diff --git a/articles/ui/figs/cc3ds.pdf b/articles/ui/figs/cc3ds.pdf
deleted file mode 100644
index ffca04646..000000000
Binary files a/articles/ui/figs/cc3ds.pdf and /dev/null differ
diff --git a/articles/ui/figs/contract.pdf b/articles/ui/figs/contract.pdf
deleted file mode 100644
index e83162109..000000000
Binary files a/articles/ui/figs/contract.pdf and /dev/null differ
diff --git a/articles/ui/figs/paypal.pdf b/articles/ui/figs/paypal.pdf
deleted file mode 100644
index d1ee29218..000000000
Binary files a/articles/ui/figs/paypal.pdf and /dev/null differ
diff --git a/articles/ui/figs/taler-pay.pdf b/articles/ui/figs/taler-pay.pdf
deleted file mode 100644
index 0856fa859..000000000
Binary files a/articles/ui/figs/taler-pay.pdf and /dev/null differ
diff --git a/articles/ui/figs/taler-withdraw.pdf b/articles/ui/figs/taler-withdraw.pdf
deleted file mode 100644
index d1cd720d2..000000000
Binary files a/articles/ui/figs/taler-withdraw.pdf and /dev/null differ
diff --git a/articles/ui/ui_short-submit.pdf b/articles/ui/ui_short-submit.pdf
deleted file mode 100644
index 5e6d05d29..000000000
Binary files a/articles/ui/ui_short-submit.pdf and /dev/null differ
diff --git a/Makefile b/build-system/Makefile
similarity index 100%
rename from Makefile
rename to build-system/Makefile
diff --git a/build-system/configure.py b/build-system/configure.py
index 4595aae10..32b32602c 100644
--- a/build-system/configure.py
+++ b/build-system/configure.py
@@ -6,6 +6,7 @@
 
 import talerbuildconfig as tbc
 import sys
+import shutil
 
 if getattr(tbc, "serialversion", 0) < 2:
     print("talerbuildconfig outdated, please update the build-common submodule and/or bootstrap")
@@ -18,3 +19,6 @@ b.add_tool(tbc.PosixTool("find"))
 b.add_tool(tbc.NodeJsTool(version_spec=">=12"))
 b.add_tool(tbc.YarnTool())
 b.run()
+
+print("copying Makefile")
+shutil.copyfile("build-system/Makefile", "Makefile")
diff --git a/articles/spending.txt b/contrib/articles/spending.txt
similarity index 100%
rename from articles/spending.txt
rename to contrib/articles/spending.txt
diff --git a/articles/ui/.gitignore b/contrib/articles/ui/.gitignore
similarity index 100%
rename from articles/ui/.gitignore
rename to contrib/articles/ui/.gitignore
diff --git a/articles/ui/btc.bib b/contrib/articles/ui/btc.bib
similarity index 100%
rename from articles/ui/btc.bib
rename to contrib/articles/ui/btc.bib
diff --git a/articles/ui/figs/Makefile b/contrib/articles/ui/figs/Makefile
similarity index 100%
rename from articles/ui/figs/Makefile
rename to contrib/articles/ui/figs/Makefile
diff --git a/articles/ui/figs/bank0a.png b/contrib/articles/ui/figs/bank0a.png
similarity index 100%
rename from articles/ui/figs/bank0a.png
rename to contrib/articles/ui/figs/bank0a.png
diff --git a/articles/ui/figs/bank1.png b/contrib/articles/ui/figs/bank1.png
similarity index 100%
rename from articles/ui/figs/bank1.png
rename to contrib/articles/ui/figs/bank1.png
diff --git a/articles/ui/figs/bank1a.png b/contrib/articles/ui/figs/bank1a.png
similarity index 100%
rename from articles/ui/figs/bank1a.png
rename to contrib/articles/ui/figs/bank1a.png
diff --git a/articles/ui/figs/bank1b.png b/contrib/articles/ui/figs/bank1b.png
similarity index 100%
rename from articles/ui/figs/bank1b.png
rename to contrib/articles/ui/figs/bank1b.png
diff --git a/articles/ui/figs/bank2.png b/contrib/articles/ui/figs/bank2.png
similarity index 100%
rename from articles/ui/figs/bank2.png
rename to contrib/articles/ui/figs/bank2.png
diff --git a/articles/ui/figs/bank2a.png b/contrib/articles/ui/figs/bank2a.png
similarity index 100%
rename from articles/ui/figs/bank2a.png
rename to contrib/articles/ui/figs/bank2a.png
diff --git a/articles/ui/figs/bank2b.png b/contrib/articles/ui/figs/bank2b.png
similarity index 100%
rename from articles/ui/figs/bank2b.png
rename to contrib/articles/ui/figs/bank2b.png
diff --git a/articles/ui/figs/bank3.png b/contrib/articles/ui/figs/bank3.png
similarity index 100%
rename from articles/ui/figs/bank3.png
rename to contrib/articles/ui/figs/bank3.png
diff --git a/articles/ui/figs/bank3a.png b/contrib/articles/ui/figs/bank3a.png
similarity index 100%
rename from articles/ui/figs/bank3a.png
rename to contrib/articles/ui/figs/bank3a.png
diff --git a/articles/ui/figs/bank3b.png b/contrib/articles/ui/figs/bank3b.png
similarity index 100%
rename from articles/ui/figs/bank3b.png
rename to contrib/articles/ui/figs/bank3b.png
diff --git a/articles/ui/figs/bank4.png b/contrib/articles/ui/figs/bank4.png
similarity index 100%
rename from articles/ui/figs/bank4.png
rename to contrib/articles/ui/figs/bank4.png
diff --git a/articles/ui/figs/bank4a.png b/contrib/articles/ui/figs/bank4a.png
similarity index 100%
rename from articles/ui/figs/bank4a.png
rename to contrib/articles/ui/figs/bank4a.png
diff --git a/articles/ui/figs/bank4b.png b/contrib/articles/ui/figs/bank4b.png
similarity index 100%
rename from articles/ui/figs/bank4b.png
rename to contrib/articles/ui/figs/bank4b.png
diff --git a/articles/ui/figs/bitcoin.pml b/contrib/articles/ui/figs/bitcoin.pml
similarity index 100%
rename from articles/ui/figs/bitcoin.pml
rename to contrib/articles/ui/figs/bitcoin.pml
diff --git a/articles/ui/figs/bitcoin.svg b/contrib/articles/ui/figs/bitcoin.svg
similarity index 100%
rename from articles/ui/figs/bitcoin.svg
rename to contrib/articles/ui/figs/bitcoin.svg
diff --git a/articles/ui/figs/cart.png b/contrib/articles/ui/figs/cart.png
similarity index 100%
rename from articles/ui/figs/cart.png
rename to contrib/articles/ui/figs/cart.png
diff --git a/articles/ui/figs/cc3ds.pml b/contrib/articles/ui/figs/cc3ds.pml
similarity index 100%
rename from articles/ui/figs/cc3ds.pml
rename to contrib/articles/ui/figs/cc3ds.pml
diff --git a/articles/ui/figs/cc3ds.svg b/contrib/articles/ui/figs/cc3ds.svg
similarity index 100%
rename from articles/ui/figs/cc3ds.svg
rename to contrib/articles/ui/figs/cc3ds.svg
diff --git a/articles/ui/figs/contract.pml b/contrib/articles/ui/figs/contract.pml
similarity index 100%
rename from articles/ui/figs/contract.pml
rename to contrib/articles/ui/figs/contract.pml
diff --git a/articles/ui/figs/fulfillment.png b/contrib/articles/ui/figs/fulfillment.png
similarity index 100%
rename from articles/ui/figs/fulfillment.png
rename to contrib/articles/ui/figs/fulfillment.png
diff --git a/articles/ui/figs/pay.png b/contrib/articles/ui/figs/pay.png
similarity index 100%
rename from articles/ui/figs/pay.png
rename to contrib/articles/ui/figs/pay.png
diff --git a/articles/ui/figs/paypal.pml b/contrib/articles/ui/figs/paypal.pml
similarity index 100%
rename from articles/ui/figs/paypal.pml
rename to contrib/articles/ui/figs/paypal.pml
diff --git a/articles/ui/figs/paypal.svg b/contrib/articles/ui/figs/paypal.svg
similarity index 100%
rename from articles/ui/figs/paypal.svg
rename to contrib/articles/ui/figs/paypal.svg
diff --git a/articles/ui/figs/taler-contract.html b/contrib/articles/ui/figs/taler-contract.html
similarity index 100%
rename from articles/ui/figs/taler-contract.html
rename to contrib/articles/ui/figs/taler-contract.html
diff --git a/articles/ui/figs/taler-pay.pml b/contrib/articles/ui/figs/taler-pay.pml
similarity index 100%
rename from articles/ui/figs/taler-pay.pml
rename to contrib/articles/ui/figs/taler-pay.pml
diff --git a/articles/ui/figs/taler-pay.svg b/contrib/articles/ui/figs/taler-pay.svg
similarity index 100%
rename from articles/ui/figs/taler-pay.svg
rename to contrib/articles/ui/figs/taler-pay.svg
diff --git a/articles/ui/figs/taler-presence-js.html b/contrib/articles/ui/figs/taler-presence-js.html
similarity index 100%
rename from articles/ui/figs/taler-presence-js.html
rename to contrib/articles/ui/figs/taler-presence-js.html
diff --git a/articles/ui/figs/taler-withdraw.pml b/contrib/articles/ui/figs/taler-withdraw.pml
similarity index 100%
rename from articles/ui/figs/taler-withdraw.pml
rename to contrib/articles/ui/figs/taler-withdraw.pml
diff --git a/articles/ui/figs/taler-withdraw.png b/contrib/articles/ui/figs/taler-withdraw.png
similarity index 100%
rename from articles/ui/figs/taler-withdraw.png
rename to contrib/articles/ui/figs/taler-withdraw.png
diff --git a/articles/ui/figs/taler-withdraw.svg b/contrib/articles/ui/figs/taler-withdraw.svg
similarity index 100%
rename from articles/ui/figs/taler-withdraw.svg
rename to contrib/articles/ui/figs/taler-withdraw.svg
diff --git a/articles/ui/hotcrp-review-28A.txt b/contrib/articles/ui/hotcrp-review-28A.txt
similarity index 100%
rename from articles/ui/hotcrp-review-28A.txt
rename to contrib/articles/ui/hotcrp-review-28A.txt
diff --git a/articles/ui/llncs.cls b/contrib/articles/ui/llncs.cls
similarity index 100%
rename from articles/ui/llncs.cls
rename to contrib/articles/ui/llncs.cls
diff --git a/articles/ui/rfc.bib b/contrib/articles/ui/rfc.bib
similarity index 100%
rename from articles/ui/rfc.bib
rename to contrib/articles/ui/rfc.bib
diff --git a/articles/ui/sigalternate.cls b/contrib/articles/ui/sigalternate.cls
similarity index 100%
rename from articles/ui/sigalternate.cls
rename to contrib/articles/ui/sigalternate.cls
diff --git a/articles/ui/soups.cls b/contrib/articles/ui/soups.cls
similarity index 100%
rename from articles/ui/soups.cls
rename to contrib/articles/ui/soups.cls
diff --git a/articles/ui/splncs03.bst b/contrib/articles/ui/splncs03.bst
similarity index 100%
rename from articles/ui/splncs03.bst
rename to contrib/articles/ui/splncs03.bst
diff --git a/articles/ui/taler.bib b/contrib/articles/ui/taler.bib
similarity index 100%
rename from articles/ui/taler.bib
rename to contrib/articles/ui/taler.bib
diff --git a/articles/ui/ui-cameraready.tex b/contrib/articles/ui/ui-cameraready.tex
similarity index 100%
rename from articles/ui/ui-cameraready.tex
rename to contrib/articles/ui/ui-cameraready.tex
diff --git a/articles/ui/ui-outline.tex b/contrib/articles/ui/ui-outline.tex
similarity index 100%
rename from articles/ui/ui-outline.tex
rename to contrib/articles/ui/ui-outline.tex
diff --git a/articles/ui/ui.bib b/contrib/articles/ui/ui.bib
similarity index 100%
rename from articles/ui/ui.bib
rename to contrib/articles/ui/ui.bib
diff --git a/articles/ui/ui.tex b/contrib/articles/ui/ui.tex
similarity index 100%
rename from articles/ui/ui.tex
rename to contrib/articles/ui/ui.tex
diff --git a/articles/ui/ui_short.tex b/contrib/articles/ui/ui_short.tex
similarity index 100%
rename from articles/ui/ui_short.tex
rename to contrib/articles/ui/ui_short.tex