diff --git a/orgas/.gitignore b/by_json/.gitignore
similarity index 100%
rename from orgas/.gitignore
rename to by_json/.gitignore
diff --git a/by_json/Makefile b/by_json/Makefile
new file mode 100644
index 0000000..1079603
--- /dev/null
+++ b/by_json/Makefile
@@ -0,0 +1,11 @@
+all: orgas.svg
+
+# All .dot files are generated by gen_%.sh file (gen_orgas.sh for example)
+%.dot: gen_%.sh
+	bash "$<" "$@"
+
+%.svg: %.dot
+	dot -Tsvg "$<" -o "$@"
+
+clean:
+	rm -f *.svg *.dot
diff --git a/orgas/README.md b/by_json/README.md
similarity index 100%
rename from orgas/README.md
rename to by_json/README.md
diff --git a/orgas/TODO b/by_json/TODO
similarity index 100%
rename from orgas/TODO
rename to by_json/TODO
diff --git a/orgas/commons.sh b/by_json/commons.sh
similarity index 100%
rename from orgas/commons.sh
rename to by_json/commons.sh
diff --git a/orgas/filters/libraries b/by_json/filters/libraries
similarity index 100%
rename from orgas/filters/libraries
rename to by_json/filters/libraries
diff --git a/orgas/filters/organisations b/by_json/filters/organisations
similarity index 100%
rename from orgas/filters/organisations
rename to by_json/filters/organisations
diff --git a/orgas/filters/patron_types b/by_json/filters/patron_types
similarity index 100%
rename from orgas/filters/patron_types
rename to by_json/filters/patron_types
diff --git a/orgas/filters/users b/by_json/filters/users
similarity index 100%
rename from orgas/filters/users
rename to by_json/filters/users
diff --git a/orgas/gen.sh b/by_json/gen_orgas.sh
similarity index 100%
rename from orgas/gen.sh
rename to by_json/gen_orgas.sh
diff --git a/orgas/templates/footer.tmpl b/by_json/templates/footer.tmpl
similarity index 100%
rename from orgas/templates/footer.tmpl
rename to by_json/templates/footer.tmpl
diff --git a/orgas/templates/gizmo.tmpl b/by_json/templates/gizmo.tmpl
similarity index 100%
rename from orgas/templates/gizmo.tmpl
rename to by_json/templates/gizmo.tmpl
diff --git a/orgas/templates/header.tmpl b/by_json/templates/header.tmpl
similarity index 100%
rename from orgas/templates/header.tmpl
rename to by_json/templates/header.tmpl
diff --git a/orgas/templates/label_default.tmpl b/by_json/templates/label_default.tmpl
similarity index 100%
rename from orgas/templates/label_default.tmpl
rename to by_json/templates/label_default.tmpl
diff --git a/orgas/templates/label_patron_types.tmpl b/by_json/templates/label_patron_types.tmpl
similarity index 100%
rename from orgas/templates/label_patron_types.tmpl
rename to by_json/templates/label_patron_types.tmpl
diff --git a/orgas/templates/label_users.tmpl b/by_json/templates/label_users.tmpl
similarity index 100%
rename from orgas/templates/label_users.tmpl
rename to by_json/templates/label_users.tmpl
diff --git a/orgas/templates/link.tmpl b/by_json/templates/link.tmpl
similarity index 100%
rename from orgas/templates/link.tmpl
rename to by_json/templates/link.tmpl
diff --git a/orgas/Makefile b/orgas/Makefile
deleted file mode 100644
index 910c999..0000000
--- a/orgas/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-all: organisations.svg
-
-
-graph.dot: gen.sh
-	bash gen.sh graph.dot
-
-
-organisations.svg: graph.dot
-	dot -Tsvg graph.dot -o organisations.svg
-
-clean:
-	rm -f organisations.svg graph.dot