From 426666e9f07ff5283e3c80533bbac26da1dc03b3 Mon Sep 17 00:00:00 2001
From: Timur Ismagilov <bouncepaw2@ya.ru>
Date: Tue, 30 Jun 2020 23:13:46 +0500
Subject: [PATCH] Make hypha names case and space insensitive (testing to be
 done)

---
 cfg/config.go                                 |   8 +-
 fs/data.go                                    |   5 +-
 fs/fs.go                                      |   3 -
 fs/genealogy.go                               |  13 ++-
 fs/html.go                                    |   3 +-
 fs/hypha.go                                   |   4 +-
 render/render.go                              |   5 +-
 util/util.go                                  |  33 ++++++
 .../default-light/edit/index.html/1.html      |  11 --
 .../default-light/edit/sidebar.html/1.html    |  21 ----
 w/m/{Fruit => fruit}/1.md                     |   0
 w/m/{Fruit => fruit}/2.md                     |   0
 w/m/{Fruit => fruit}/3.markdown               |   6 +-
 w/m/{Fruit => fruit}/4.markdown               |   0
 w/m/{Fruit => fruit}/5.markdown               |   0
 w/m/{Fruit/Apple => fruit/apple}/1.jpg        | Bin
 w/m/{Fruit/Apple => fruit/apple}/1.txt        |   0
 w/m/{Fruit/Apple => fruit/apple}/2.jpg        | Bin
 w/m/{Fruit/Apple => fruit/apple}/2.txt        |   4 +-
 w/m/{Fruit/Apple => fruit/apple}/3.txt        |  10 +-
 w/m/{Fruit/Apple => fruit/apple}/4.jpg        | Bin
 w/m/{Fruit/Apple => fruit/apple}/4.txt        |   2 +-
 w/m/{Fruit/Apple => fruit/apple}/meta.json    |   0
 w/m/{Fruit => fruit}/meta.json                |   0
 w/m/{Fruit/Pear => fruit/pear}/1.markdown     |   4 +-
 w/m/{Fruit/Pear => fruit/pear}/meta.json      |   0
 .../Pineapple => fruit/pineapple}/1.html      |   0
 .../Pineapple => fruit/pineapple}/meta.json   |   0
 w/m/{Fungus => fungus}/1.markdown             |   0
 .../amanita_muscaria}/1.markdown              |   4 +-
 .../amanita_muscaria}/2.markdown              |   6 +-
 .../amanita_muscaria}/3.markdown              |   8 +-
 .../amanita_muscaria}/4.markdown              |  10 +-
 .../amanita_muscaria}/meta.json               |   0
 .../amanita_regalis}/1.jpeg                   | Bin
 .../amanita_regalis}/1.markdown               |  12 +-
 .../amanita_regalis}/meta.json                |   0
 w/m/{Fungus => fungus}/meta.json              |   0
 w/m/help/1.markdown                           |   1 +
 w/m/help/meta.json                            |  21 ++++
 w/m/{Templates => templates}/1.markdown       |   0
 .../default-light/base.html/1.html            |  50 ++++-----
 .../default-light/base.html/meta.json         |   0
 .../default-light/edit/header.html/1.html     |   0
 .../default-light/edit/header.html/meta.json  |   0
 .../default-light/edit/index.html/1.html      |  11 ++
 .../default-light/edit/index.html/meta.json   |   0
 .../default-light/edit/sidebar.html/1.html    |  22 ++++
 .../default-light/edit/sidebar.html/meta.json |   0
 .../default-light/main.css/1.css              | 106 +++++++++---------
 .../default-light/main.css/meta.json          |   0
 .../default-light/main.js/1.mjs               |  22 ++--
 .../default-light/main.js/meta.json           |   0
 .../default-light/update_ok.html}/1.html      |  16 +--
 .../default-light/update_ok.html}/meta.json   |   4 +-
 .../default-light/view/404.html/1.html        |   0
 .../default-light/view/404.html/meta.json     |   0
 .../default-light/view/index.html/1.html      |   0
 .../default-light/view/index.html/meta.json   |   0
 .../default-light/view/sidebar.html/1.html    |   2 +-
 .../default-light/view/sidebar.html/meta.json |   0
 w/m/{Templates => templates}/meta.json        |   0
 w/m/{TestMd => testmd}/1.markdown             |   0
 w/m/{TestMd => testmd}/meta.json              |   0
 64 files changed, 244 insertions(+), 183 deletions(-)
 create mode 100644 util/util.go
 delete mode 100644 w/m/Templates/default-light/edit/index.html/1.html
 delete mode 100644 w/m/Templates/default-light/edit/sidebar.html/1.html
 rename w/m/{Fruit => fruit}/1.md (100%)
 rename w/m/{Fruit => fruit}/2.md (100%)
 rename w/m/{Fruit => fruit}/3.markdown (98%)
 rename w/m/{Fruit => fruit}/4.markdown (100%)
 rename w/m/{Fruit => fruit}/5.markdown (100%)
 rename w/m/{Fruit/Apple => fruit/apple}/1.jpg (100%)
 rename w/m/{Fruit/Apple => fruit/apple}/1.txt (100%)
 rename w/m/{Fruit/Apple => fruit/apple}/2.jpg (100%)
 rename w/m/{Fruit/Apple => fruit/apple}/2.txt (99%)
 rename w/m/{Fruit/Apple => fruit/apple}/3.txt (98%)
 rename w/m/{Fruit/Apple => fruit/apple}/4.jpg (100%)
 rename w/m/{Fruit/Apple => fruit/apple}/4.txt (99%)
 rename w/m/{Fruit/Apple => fruit/apple}/meta.json (100%)
 rename w/m/{Fruit => fruit}/meta.json (100%)
 rename w/m/{Fruit/Pear => fruit/pear}/1.markdown (99%)
 rename w/m/{Fruit/Pear => fruit/pear}/meta.json (100%)
 rename w/m/{Fruit/Pineapple => fruit/pineapple}/1.html (100%)
 rename w/m/{Fruit/Pineapple => fruit/pineapple}/meta.json (100%)
 rename w/m/{Fungus => fungus}/1.markdown (100%)
 rename w/m/{Fungus/Amanita Muscaria => fungus/amanita_muscaria}/1.markdown (99%)
 rename w/m/{Fungus/Amanita Muscaria => fungus/amanita_muscaria}/2.markdown (99%)
 rename w/m/{Fungus/Amanita Muscaria => fungus/amanita_muscaria}/3.markdown (99%)
 rename w/m/{Fungus/Amanita Muscaria => fungus/amanita_muscaria}/4.markdown (99%)
 rename w/m/{Fungus/Amanita Muscaria => fungus/amanita_muscaria}/meta.json (100%)
 rename w/m/{Fungus/Amanita Regalis => fungus/amanita_regalis}/1.jpeg (100%)
 rename w/m/{Fungus/Amanita Regalis => fungus/amanita_regalis}/1.markdown (99%)
 rename w/m/{Fungus/Amanita Regalis => fungus/amanita_regalis}/meta.json (100%)
 rename w/m/{Fungus => fungus}/meta.json (100%)
 create mode 100644 w/m/help/1.markdown
 create mode 100644 w/m/help/meta.json
 rename w/m/{Templates => templates}/1.markdown (100%)
 rename w/m/{Templates => templates}/default-light/base.html/1.html (96%)
 rename w/m/{Templates => templates}/default-light/base.html/meta.json (100%)
 rename w/m/{Templates => templates}/default-light/edit/header.html/1.html (100%)
 rename w/m/{Templates => templates}/default-light/edit/header.html/meta.json (100%)
 create mode 100644 w/m/templates/default-light/edit/index.html/1.html
 rename w/m/{Templates => templates}/default-light/edit/index.html/meta.json (100%)
 create mode 100644 w/m/templates/default-light/edit/sidebar.html/1.html
 rename w/m/{Templates => templates}/default-light/edit/sidebar.html/meta.json (100%)
 rename w/m/{Templates => templates}/default-light/main.css/1.css (97%)
 rename w/m/{Templates => templates}/default-light/main.css/meta.json (100%)
 rename w/m/{Templates => templates}/default-light/main.js/1.mjs (96%)
 rename w/m/{Templates => templates}/default-light/main.js/meta.json (100%)
 rename w/m/{Templates/default-light/updateOk.html => templates/default-light/update_ok.html}/1.html (94%)
 rename w/m/{Templates/default-light/updateOk.html => templates/default-light/update_ok.html}/meta.json (90%)
 rename w/m/{Templates => templates}/default-light/view/404.html/1.html (100%)
 rename w/m/{Templates => templates}/default-light/view/404.html/meta.json (100%)
 rename w/m/{Templates => templates}/default-light/view/index.html/1.html (100%)
 rename w/m/{Templates => templates}/default-light/view/index.html/meta.json (100%)
 rename w/m/{Templates => templates}/default-light/view/sidebar.html/1.html (78%)
 rename w/m/{Templates => templates}/default-light/view/sidebar.html/meta.json (100%)
 rename w/m/{Templates => templates}/meta.json (100%)
 rename w/m/{TestMd => testmd}/1.markdown (100%)
 rename w/m/{TestMd => testmd}/meta.json (100%)

diff --git a/cfg/config.go b/cfg/config.go
index f5e6251..348d8d9 100644
--- a/cfg/config.go
+++ b/cfg/config.go
@@ -38,12 +38,10 @@ func InitConfig(wd string) bool {
 
 	if _, err := os.Stat(configJsonPath); os.IsNotExist(err) {
 		log.Println("config.json not found, using default values")
-	} else {
-		log.Println("config.json found, overriding default values...")
-		return readConfig()
+		return false
 	}
-
-	return true
+	log.Println("config.json found, overriding default values...")
+	return readConfig()
 }
 
 func readConfig() bool {
diff --git a/fs/data.go b/fs/data.go
index 0eb142d..5c88f4a 100644
--- a/fs/data.go
+++ b/fs/data.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/bouncepaw/mycorrhiza/cfg"
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 func (h *Hypha) MetaJsonPath() string {
@@ -17,7 +18,7 @@ func (h *Hypha) MetaJsonPath() string {
 }
 
 func (h *Hypha) Path() string {
-	return filepath.Join(cfg.WikiDir, h.FullName)
+	return filepath.Join(cfg.WikiDir, util.UrlToCanonical(h.FullName))
 }
 
 func (h *Hypha) TextPath() string {
@@ -25,7 +26,7 @@ func (h *Hypha) TextPath() string {
 }
 
 func (h *Hypha) parentName() string {
-	return filepath.Dir(h.FullName)
+	return filepath.Dir(util.UrlToCanonical(h.FullName))
 }
 
 // hasBinaryData returns true if the revision has any binary data associated.
diff --git a/fs/fs.go b/fs/fs.go
index b10dc74..3d1488a 100644
--- a/fs/fs.go
+++ b/fs/fs.go
@@ -54,6 +54,3 @@ func (s *Storage) indexHyphae(path string) {
 		}
 	}
 }
-
-func (h *Hypha) Close() {
-}
diff --git a/fs/genealogy.go b/fs/genealogy.go
index 1bc3adb..96da25a 100644
--- a/fs/genealogy.go
+++ b/fs/genealogy.go
@@ -6,6 +6,8 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 func (s *Storage) RenderHypha(h *Hypha) {
@@ -24,6 +26,7 @@ type Tree struct {
 // It can also generate trees for non-existent hyphae, that's why we use `name string` instead of making it a method on `Hypha`.
 // In `root` is `false`, siblings will not be fetched.
 func (s *Storage) GetTree(name string, root bool) *Tree {
+	name = util.UrlToCanonical(name)
 	t := &Tree{Name: name, Root: root}
 	for hyphaName, _ := range s.paths {
 		s.compareNamesAndAppend(t, hyphaName)
@@ -65,14 +68,14 @@ func (t *Tree) AsHtml() (html string) {
 	html += `<ul class="navitree__node">`
 	if t.Root {
 		for _, ancestor := range t.Ancestors {
-			html += navitreeEntry(ancestor, "navitree__ancestor")
+			html += navitreeEntry(util.CanonicalToDisplay(ancestor), "navitree__ancestor")
 		}
 		for _, siblingName := range t.Siblings {
-			html += navitreeEntry(siblingName, "navitree__sibling")
+			html += navitreeEntry(util.CanonicalToDisplay(siblingName), "navitree__sibling")
 		}
-		html += navitreeEntry(t.Name, "navitree__pagename")
+		html += navitreeEntry(util.CanonicalToDisplay(t.Name), "navitree__pagename")
 	} else {
-		html += navitreeEntry(t.Name, "navitree__name")
+		html += navitreeEntry(util.CanonicalToDisplay(t.Name), "navitree__name")
 	}
 
 	for _, subtree := range t.Descendants {
@@ -89,5 +92,5 @@ func navitreeEntry(name, class string) string {
 	return fmt.Sprintf(`<li class="navitree__entry %s">
 	<a class="navitree__link" href="/%s">%s</a>
 </li>
-`, class, name, filepath.Base(name))
+`, class, util.DisplayToCanonical(name), filepath.Base(name))
 }
diff --git a/fs/html.go b/fs/html.go
index 1b997d8..0289988 100644
--- a/fs/html.go
+++ b/fs/html.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 
+	"github.com/bouncepaw/mycorrhiza/util"
 	"gopkg.in/russross/blackfriday.v2"
 )
 
@@ -20,7 +21,7 @@ func (h *Hypha) asHtml() (string, error) {
 `
 	// What about using <figure>?
 	if h.hasBinaryData() {
-		ret += fmt.Sprintf(`<img src="/%s?action=binary&rev=%d" class="page__amnt"/>`, rev.FullName, rev.Id)
+		ret += fmt.Sprintf(`<img src="/%s?action=binary&rev=%d" class="page__amnt"/>`, util.DisplayToCanonical(rev.FullName), rev.Id)
 	}
 
 	contents, err := ioutil.ReadFile(rev.TextPath)
diff --git a/fs/hypha.go b/fs/hypha.go
index fb401d5..20f0255 100644
--- a/fs/hypha.go
+++ b/fs/hypha.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/bouncepaw/mycorrhiza/cfg"
+	"github.com/bouncepaw/mycorrhiza/util"
 )
 
 type Hypha struct {
@@ -33,9 +34,10 @@ func (h *Hypha) Invalidate(err error) *Hypha {
 }
 
 func (s *Storage) Open(name string) *Hypha {
+	name = util.UrlToCanonical(name)
 	h := &Hypha{
 		Exists:   true,
-		FullName: name,
+		FullName: util.CanonicalToDisplay(name),
 	}
 	path, ok := s.paths[name]
 	// This hypha does not exist yet
diff --git a/render/render.go b/render/render.go
index 44a6d4d..3ae982c 100644
--- a/render/render.go
+++ b/render/render.go
@@ -29,7 +29,7 @@ func HyphaEdit(h *fs.Hypha) []byte { //
 
 // HyphaUpdateOk is used to inform that update was successful.
 func HyphaUpdateOk(h *fs.Hypha) []byte { //
-	return layout("updateOk").
+	return layout("update_ok").
 		withMap(map[string]string{"Name": h.FullName}).
 		Bytes()
 }
@@ -56,6 +56,9 @@ func hyphaGeneric(name, content, templateName string) []byte {
 
 // wrapInBase is used to wrap layouts in things that are present on all pages.
 func (lyt *Layout) wrapInBase(keys map[string]string) []byte {
+	if lyt.invalid {
+		return lyt.Bytes()
+	}
 	page := map[string]string{
 		"Title":     cfg.SiteTitle,
 		"Main":      "",
diff --git a/util/util.go b/util/util.go
new file mode 100644
index 0000000..de78835
--- /dev/null
+++ b/util/util.go
@@ -0,0 +1,33 @@
+package util
+
+import (
+	"strings"
+	"unicode"
+)
+
+func UrlToCanonical(name string) string {
+	return strings.ToLower(strings.ReplaceAll(name, " ", "_"))
+}
+
+func DisplayToCanonical(name string) string {
+	return strings.ToLower(strings.ReplaceAll(name, " ", "_"))
+}
+
+func CanonicalToDisplay(name string) (res string) {
+	tmp := strings.Title(name)
+	var afterPoint bool
+	for _, ch := range tmp {
+		if afterPoint {
+			afterPoint = false
+			ch = unicode.ToLower(ch)
+		}
+		switch ch {
+		case '.':
+			afterPoint = true
+		case '_':
+			ch = ' '
+		}
+		res += string(ch)
+	}
+	return res
+}
diff --git a/w/m/Templates/default-light/edit/index.html/1.html b/w/m/Templates/default-light/edit/index.html/1.html
deleted file mode 100644
index 63b8b47..0000000
--- a/w/m/Templates/default-light/edit/index.html/1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="naviwrapper">
-	<form class="naviwrapper__edit edit-box"
-	      method="POST"
-	      enctype="multipart/form-data"
-	      action="?action=update">
-		<h4>Edit box</h4>
-		<!-- It is important that there is no indent ↓ -->
-		<textarea class="edit-box__text" name="text">
-{{ .Text }}</textarea>
-	</form>
-</div>
diff --git a/w/m/Templates/default-light/edit/sidebar.html/1.html b/w/m/Templates/default-light/edit/sidebar.html/1.html
deleted file mode 100644
index 846af1c..0000000
--- a/w/m/Templates/default-light/edit/sidebar.html/1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div style=""><h4>Text MIME-type</h4>
-<p>Good types are <code>text/markdown</code> and <code>text/plain</code></p>
-<input type="text" name="text_mime" value="{{ .TextMime }}" form="edit-form"/>
-
-<h4>Revision comment</h4>
-<p>Please make your comment helpful</p>
-<input type="text" name="comment" value="Update {{ .Name }}" form="edit-form"/>
-
-<h4>Edit tags</h4>
-<p>Tags are separated by commas, whitespace is ignored</p>
-<input type="text" name="tags" value="{{ .Tags }}" form="edit-form"/>
-
-<h4>Upload file</h4>
-<p>If this hypha has a file like that, the text above is meant to be a description of it</p>
-<input type="file" name="binary" form="edit-form"/>
-
-<p>
-	<input type="submit" value="update" form="edit-form"/>
-	<a href="?">Cancel</a>
-</p>
-</div>
diff --git a/w/m/Fruit/1.md b/w/m/fruit/1.md
similarity index 100%
rename from w/m/Fruit/1.md
rename to w/m/fruit/1.md
diff --git a/w/m/Fruit/2.md b/w/m/fruit/2.md
similarity index 100%
rename from w/m/Fruit/2.md
rename to w/m/fruit/2.md
diff --git a/w/m/Fruit/3.markdown b/w/m/fruit/3.markdown
similarity index 98%
rename from w/m/Fruit/3.markdown
rename to w/m/fruit/3.markdown
index e99cd53..f0d9e17 100644
--- a/w/m/Fruit/3.markdown
+++ b/w/m/fruit/3.markdown
@@ -1,4 +1,4 @@
-According to real *scientists*, fruit is a type of fetus. Most of them are tasty and cool, though some of them are really sour and depressing. Be careful when choosing fruit. Best ones are:
-
-* [Apple](Apple)
+According to real *scientists*, fruit is a type of fetus. Most of them are tasty and cool, though some of them are really sour and depressing. Be careful when choosing fruit. Best ones are:
+
+* [Apple](Apple)
 * [Pear](Pear)
\ No newline at end of file
diff --git a/w/m/Fruit/4.markdown b/w/m/fruit/4.markdown
similarity index 100%
rename from w/m/Fruit/4.markdown
rename to w/m/fruit/4.markdown
diff --git a/w/m/Fruit/5.markdown b/w/m/fruit/5.markdown
similarity index 100%
rename from w/m/Fruit/5.markdown
rename to w/m/fruit/5.markdown
diff --git a/w/m/Fruit/Apple/1.jpg b/w/m/fruit/apple/1.jpg
similarity index 100%
rename from w/m/Fruit/Apple/1.jpg
rename to w/m/fruit/apple/1.jpg
diff --git a/w/m/Fruit/Apple/1.txt b/w/m/fruit/apple/1.txt
similarity index 100%
rename from w/m/Fruit/Apple/1.txt
rename to w/m/fruit/apple/1.txt
diff --git a/w/m/Fruit/Apple/2.jpg b/w/m/fruit/apple/2.jpg
similarity index 100%
rename from w/m/Fruit/Apple/2.jpg
rename to w/m/fruit/apple/2.jpg
diff --git a/w/m/Fruit/Apple/2.txt b/w/m/fruit/apple/2.txt
similarity index 99%
rename from w/m/Fruit/Apple/2.txt
rename to w/m/fruit/apple/2.txt
index 77b6494..64ad8c8 100644
--- a/w/m/Fruit/Apple/2.txt
+++ b/w/m/fruit/apple/2.txt
@@ -1,3 +1,3 @@
-Красное яблоко. Для съёмки использовалась белая бумага позади и над яблоком, и фотовспышка SB-600 в 1/4 мощности.
-
+Красное яблоко. Для съёмки использовалась белая бумага позади и над яблоком, и фотовспышка SB-600 в 1/4 мощности.
+
 Source: https://commons.wikimedia.org/wiki/File:Red_Apple.jpg
\ No newline at end of file
diff --git a/w/m/Fruit/Apple/3.txt b/w/m/fruit/apple/3.txt
similarity index 98%
rename from w/m/Fruit/Apple/3.txt
rename to w/m/fruit/apple/3.txt
index 84903ab..c00151c 100644
--- a/w/m/Fruit/Apple/3.txt
+++ b/w/m/fruit/apple/3.txt
@@ -1,6 +1,6 @@
-Mycorrhiza is pure happiness
-
-Красное яблоко. Для съёмки использовалась белая бумага позади и над яблоком, и фотовспышка SB-600 в 1/4 мощности.
-
-Source: https://commons.wikimedia.org/wiki/File:Red_Apple.jpg
+Mycorrhiza is pure happiness
+
+Красное яблоко. Для съёмки использовалась белая бумага позади и над яблоком, и фотовспышка SB-600 в 1/4 мощности.
+
+Source: https://commons.wikimedia.org/wiki/File:Red_Apple.jpg
 			
\ No newline at end of file
diff --git a/w/m/Fruit/Apple/4.jpg b/w/m/fruit/apple/4.jpg
similarity index 100%
rename from w/m/Fruit/Apple/4.jpg
rename to w/m/fruit/apple/4.jpg
diff --git a/w/m/Fruit/Apple/4.txt b/w/m/fruit/apple/4.txt
similarity index 99%
rename from w/m/Fruit/Apple/4.txt
rename to w/m/fruit/apple/4.txt
index 4cfa047..4281d69 100644
--- a/w/m/Fruit/Apple/4.txt
+++ b/w/m/fruit/apple/4.txt
@@ -1,2 +1,2 @@
-Я́блоко — сочный плод яблони, который употребляется в пищу в свежем виде, служит сырьём в кулинарии и для приготовления напитков. Наибольшее распространение получила яблоня домашняя, реже выращивают яблоню сливолистную. Размер красных, зелёных или жёлтых шаровидных плодов 5—13 см в диаметре. Происходит из Центральной Азии, где до сих пор произрастает дикорастущий предок яблони домашней — яблоня Сиверса. На сегодняшний день существует множество сортов этого вида яблони, произрастающих в различных климатических условиях. По времени созревания отличают летние, осенние и зимние сорта, более поздние сорта отличаются хорошей стойкостью.
+Я́блоко — сочный плод яблони, который употребляется в пищу в свежем виде, служит сырьём в кулинарии и для приготовления напитков. Наибольшее распространение получила яблоня домашняя, реже выращивают яблоню сливолистную. Размер красных, зелёных или жёлтых шаровидных плодов 5—13 см в диаметре. Происходит из Центральной Азии, где до сих пор произрастает дикорастущий предок яблони домашней — яблоня Сиверса. На сегодняшний день существует множество сортов этого вида яблони, произрастающих в различных климатических условиях. По времени созревания отличают летние, осенние и зимние сорта, более поздние сорта отличаются хорошей стойкостью.
 			
\ No newline at end of file
diff --git a/w/m/Fruit/Apple/meta.json b/w/m/fruit/apple/meta.json
similarity index 100%
rename from w/m/Fruit/Apple/meta.json
rename to w/m/fruit/apple/meta.json
diff --git a/w/m/Fruit/meta.json b/w/m/fruit/meta.json
similarity index 100%
rename from w/m/Fruit/meta.json
rename to w/m/fruit/meta.json
diff --git a/w/m/Fruit/Pear/1.markdown b/w/m/fruit/pear/1.markdown
similarity index 99%
rename from w/m/Fruit/Pear/1.markdown
rename to w/m/fruit/pear/1.markdown
index 93010b8..0ec9c6b 100644
--- a/w/m/Fruit/Pear/1.markdown
+++ b/w/m/fruit/pear/1.markdown
@@ -1,3 +1,3 @@
-A **pear** is a sweet fruit, usually with a green skin and a lot of juice, that has a round base and is slightly pointed towards the stem.
-
+A **pear** is a sweet fruit, usually with a green skin and a lot of juice, that has a round base and is slightly pointed towards the stem.
+
 Source of info: [cambridge dict](https://dictionary.cambridge.org/ru/словарь/английский/pear)
\ No newline at end of file
diff --git a/w/m/Fruit/Pear/meta.json b/w/m/fruit/pear/meta.json
similarity index 100%
rename from w/m/Fruit/Pear/meta.json
rename to w/m/fruit/pear/meta.json
diff --git a/w/m/Fruit/Pineapple/1.html b/w/m/fruit/pineapple/1.html
similarity index 100%
rename from w/m/Fruit/Pineapple/1.html
rename to w/m/fruit/pineapple/1.html
diff --git a/w/m/Fruit/Pineapple/meta.json b/w/m/fruit/pineapple/meta.json
similarity index 100%
rename from w/m/Fruit/Pineapple/meta.json
rename to w/m/fruit/pineapple/meta.json
diff --git a/w/m/Fungus/1.markdown b/w/m/fungus/1.markdown
similarity index 100%
rename from w/m/Fungus/1.markdown
rename to w/m/fungus/1.markdown
diff --git a/w/m/Fungus/Amanita Muscaria/1.markdown b/w/m/fungus/amanita_muscaria/1.markdown
similarity index 99%
rename from w/m/Fungus/Amanita Muscaria/1.markdown
rename to w/m/fungus/amanita_muscaria/1.markdown
index 2516173..60438ef 100644
--- a/w/m/Fungus/Amanita Muscaria/1.markdown	
+++ b/w/m/fungus/amanita_muscaria/1.markdown
@@ -1,3 +1,3 @@
-Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
-
+Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
+
 It is not an [](Apple)!
\ No newline at end of file
diff --git a/w/m/Fungus/Amanita Muscaria/2.markdown b/w/m/fungus/amanita_muscaria/2.markdown
similarity index 99%
rename from w/m/Fungus/Amanita Muscaria/2.markdown
rename to w/m/fungus/amanita_muscaria/2.markdown
index 2399b27..a1ed53d 100644
--- a/w/m/Fungus/Amanita Muscaria/2.markdown	
+++ b/w/m/fungus/amanita_muscaria/2.markdown
@@ -1,4 +1,4 @@
-Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
-
-It is not an [Apple](Apple)!
+Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
+
+It is not an [Apple](Apple)!
 			
\ No newline at end of file
diff --git a/w/m/Fungus/Amanita Muscaria/3.markdown b/w/m/fungus/amanita_muscaria/3.markdown
similarity index 99%
rename from w/m/Fungus/Amanita Muscaria/3.markdown
rename to w/m/fungus/amanita_muscaria/3.markdown
index ffeae56..a20fcfa 100644
--- a/w/m/Fungus/Amanita Muscaria/3.markdown	
+++ b/w/m/fungus/amanita_muscaria/3.markdown
@@ -1,5 +1,5 @@
-Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
-
-It is not an [Apple](/Apple)!
-			
+Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
+
+It is not an [Apple](/Apple)!
+			
 			
\ No newline at end of file
diff --git a/w/m/Fungus/Amanita Muscaria/4.markdown b/w/m/fungus/amanita_muscaria/4.markdown
similarity index 99%
rename from w/m/Fungus/Amanita Muscaria/4.markdown
rename to w/m/fungus/amanita_muscaria/4.markdown
index 51eeda9..2d1edd4 100644
--- a/w/m/Fungus/Amanita Muscaria/4.markdown	
+++ b/w/m/fungus/amanita_muscaria/4.markdown
@@ -1,6 +1,6 @@
-Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
-
-It is not an [Apple](/Fruit/Apple)!
-			
-			
+Amanita muscaria, commonly known as the fly agaric or fly amanita, is a basidiomycete of the genus Amanita. It is also a muscimol mushroom. Native throughout the temperate and boreal regions of the Northern Hemisphere, Amanita muscaria has been unintentionally introduced to many countries in the Southern Hemisphere, generally as a symbiont with pine and birch plantations, and is now a true cosmopolitan species. It associates with various deciduous and coniferous trees.
+
+It is not an [Apple](/Fruit/Apple)!
+			
+			
 			
\ No newline at end of file
diff --git a/w/m/Fungus/Amanita Muscaria/meta.json b/w/m/fungus/amanita_muscaria/meta.json
similarity index 100%
rename from w/m/Fungus/Amanita Muscaria/meta.json
rename to w/m/fungus/amanita_muscaria/meta.json
diff --git a/w/m/Fungus/Amanita Regalis/1.jpeg b/w/m/fungus/amanita_regalis/1.jpeg
similarity index 100%
rename from w/m/Fungus/Amanita Regalis/1.jpeg
rename to w/m/fungus/amanita_regalis/1.jpeg
diff --git a/w/m/Fungus/Amanita Regalis/1.markdown b/w/m/fungus/amanita_regalis/1.markdown
similarity index 99%
rename from w/m/Fungus/Amanita Regalis/1.markdown
rename to w/m/fungus/amanita_regalis/1.markdown
index 7ea6c4c..e9bd635 100644
--- a/w/m/Fungus/Amanita Regalis/1.markdown	
+++ b/w/m/fungus/amanita_regalis/1.markdown
@@ -1,7 +1,7 @@
-Шляпка 7—16(20) см в диаметре, полушаровидная, раскрывающаяся до выпуклой и почти плоской со слабо вдавленным центром, с радиально разлинованным краем. Окраска тёмно-умброво-коричневая, оливково-охристая, охристо-коричневая, иногда серо-жёлтая, в центре более интенсивная. Общее покрывало на молодых грибах опушённое, ярко-жёлтое, затем остаётся в виде легко смываемых обрывков, на солнце белеющих, а к старости иногда становящихся серо-жёлтыми.
-
-
-Пластинки частые, сначала узко-приросшие к ножке, затем свободные от неё, кремовые, с многочисленными пластиночками разной длины.
-
-
+Шляпка 7—16(20) см в диаметре, полушаровидная, раскрывающаяся до выпуклой и почти плоской со слабо вдавленным центром, с радиально разлинованным краем. Окраска тёмно-умброво-коричневая, оливково-охристая, охристо-коричневая, иногда серо-жёлтая, в центре более интенсивная. Общее покрывало на молодых грибах опушённое, ярко-жёлтое, затем остаётся в виде легко смываемых обрывков, на солнце белеющих, а к старости иногда становящихся серо-жёлтыми.
+
+
+Пластинки частые, сначала узко-приросшие к ножке, затем свободные от неё, кремовые, с многочисленными пластиночками разной длины.
+
+
 Ножка достигает 9—20 см в высоту и 1—2,5 см в поперечнике, утончающаяся кверху, в основании с яйцевидным или шаровидным утолщением. Поверхность ножки волокнисто-бархатистая, белая или беловатая, при прикосновении иногда слабо буреющая. Кольцо в верхней части ножки, беловатое, перепончатое, не разлинованное. Остатки общего покрывала в виде нескольких поясков желтоватых бородавчатых хлопьев на утолщении ножки.
\ No newline at end of file
diff --git a/w/m/Fungus/Amanita Regalis/meta.json b/w/m/fungus/amanita_regalis/meta.json
similarity index 100%
rename from w/m/Fungus/Amanita Regalis/meta.json
rename to w/m/fungus/amanita_regalis/meta.json
diff --git a/w/m/Fungus/meta.json b/w/m/fungus/meta.json
similarity index 100%
rename from w/m/Fungus/meta.json
rename to w/m/fungus/meta.json
diff --git a/w/m/help/1.markdown b/w/m/help/1.markdown
new file mode 100644
index 0000000..7581886
--- /dev/null
+++ b/w/m/help/1.markdown
@@ -0,0 +1 @@
+# Help
\ No newline at end of file
diff --git a/w/m/help/meta.json b/w/m/help/meta.json
new file mode 100644
index 0000000..354427e
--- /dev/null
+++ b/w/m/help/meta.json
@@ -0,0 +1,21 @@
+{
+	"views": 0,
+	"deleted": false,
+	"revisions": {
+		"1": {
+			"tags": [
+				""
+			],
+			"name": "Help",
+			"comment": "Update Help",
+			"author": "",
+			"time": 1593540573,
+			"text_mime": "text/markdown",
+			"binary_mime": "",
+			"text_name": "1.markdown",
+			"binary_name": ""
+		}
+	},
+	"Invalid": false,
+	"Err": null
+}
\ No newline at end of file
diff --git a/w/m/Templates/1.markdown b/w/m/templates/1.markdown
similarity index 100%
rename from w/m/Templates/1.markdown
rename to w/m/templates/1.markdown
diff --git a/w/m/Templates/default-light/base.html/1.html b/w/m/templates/default-light/base.html/1.html
similarity index 96%
rename from w/m/Templates/default-light/base.html/1.html
rename to w/m/templates/default-light/base.html/1.html
index aa9175c..264b677 100644
--- a/w/m/Templates/default-light/base.html/1.html
+++ b/w/m/templates/default-light/base.html/1.html
@@ -1,25 +1,25 @@
-<html>
-	<head>
-		<title>{{ .Title }}</title>
-		<link rel="stylesheet" href="/Templates/default-light/main.css?action=raw">
-	</head>
-	<body>
-		<header class="header">
-			<!-- Site title is fetched from your config.json. Set your title in "site-title" field. You can add more things to the header here. -->
-			<h1 class="header__site-title">
-				<a href="/">{{ .SiteTitle }}</a>
-			</h1>
-			<button class="sidebar-controller" id="shroomburger">
-				≡
-			</button>
-		</header>
-		<aside class="sidebar hidden_mobile" id="sidebar">
-			{{ .Sidebar }}
-		</aside>
-		<main class="main">{{ .Main }}</main>
-		<footer>
-			<p>This website runs <a href='https://github.com/bouncepaw/mycorrhiza'>MycorrhizaWiki</a></p>
-		</footer>
-		<script src="/Templates/default-light/main.js?action=raw"></script>
-	</body>
-</html>
+<html>
+	<head>
+		<title>{{ .Title }}</title>
+		<link rel="stylesheet" href="/Templates/default-light/main.css?action=raw">
+	</head>
+	<body>
+		<header class="header">
+			<!-- Site title is fetched from your config.json. Set your title in "site-title" field. You can add more things to the header here. -->
+			<h1 class="header__site-title">
+				<a href="/">{{ .SiteTitle }}</a>
+			</h1>
+			<button class="sidebar-controller" id="shroomburger">
+				≡
+			</button>
+		</header>
+		<aside class="sidebar hidden_mobile" id="sidebar">
+			{{ .Sidebar }}
+		</aside>
+		<main class="main">{{ .Main }}</main>
+		<footer>
+			<p>This website runs <a href='https://github.com/bouncepaw/mycorrhiza'>MycorrhizaWiki</a></p>
+		</footer>
+		<script src="/Templates/default-light/main.js?action=raw"></script>
+	</body>
+</html>
diff --git a/w/m/Templates/default-light/base.html/meta.json b/w/m/templates/default-light/base.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/base.html/meta.json
rename to w/m/templates/default-light/base.html/meta.json
diff --git a/w/m/Templates/default-light/edit/header.html/1.html b/w/m/templates/default-light/edit/header.html/1.html
similarity index 100%
rename from w/m/Templates/default-light/edit/header.html/1.html
rename to w/m/templates/default-light/edit/header.html/1.html
diff --git a/w/m/Templates/default-light/edit/header.html/meta.json b/w/m/templates/default-light/edit/header.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/edit/header.html/meta.json
rename to w/m/templates/default-light/edit/header.html/meta.json
diff --git a/w/m/templates/default-light/edit/index.html/1.html b/w/m/templates/default-light/edit/index.html/1.html
new file mode 100644
index 0000000..034a437
--- /dev/null
+++ b/w/m/templates/default-light/edit/index.html/1.html
@@ -0,0 +1,11 @@
+<form class="edit-box"
+      method="POST"
+      enctype="multipart/form-data"
+      action="?action=update"
+      id="edit-form">
+	<h4>Edit box</h4>
+	<!-- It is important that there is no indent ↓ -->
+	<textarea class="edit-box__text" name="text">
+{{ .Text }}</textarea>
+</form>
+
diff --git a/w/m/Templates/default-light/edit/index.html/meta.json b/w/m/templates/default-light/edit/index.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/edit/index.html/meta.json
rename to w/m/templates/default-light/edit/index.html/meta.json
diff --git a/w/m/templates/default-light/edit/sidebar.html/1.html b/w/m/templates/default-light/edit/sidebar.html/1.html
new file mode 100644
index 0000000..54feb61
--- /dev/null
+++ b/w/m/templates/default-light/edit/sidebar.html/1.html
@@ -0,0 +1,22 @@
+<div>
+	<h4>Text MIME-type</h4>
+	<p>Good types are <code>text/markdown</code> and <code>text/plain</code></p>
+	<input type="text" name="text_mime" value="{{ .TextMime }}" form="edit-form"/>
+
+	<h4>Revision comment</h4>
+	<p>Please make your comment helpful</p>
+	<input type="text" name="comment" value="Update {{ .Name }}" form="edit-form"/>
+
+	<h4>Edit tags</h4>
+	<p>Tags are separated by commas, whitespace is ignored</p>
+<input type="text" name="tags" value="{{ .Tags }}" form="edit-form"/>
+
+	<h4>Upload file</h4>
+	<p>If this hypha has a file like that, the text above is meant to be a description of it</p>
+	<input type="file" name="binary" form="edit-form"/>
+
+	<p>
+		<input type="submit" value="update" form="edit-form"/>
+		<a href="?">Cancel</a>
+	</p>
+</div>
diff --git a/w/m/Templates/default-light/edit/sidebar.html/meta.json b/w/m/templates/default-light/edit/sidebar.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/edit/sidebar.html/meta.json
rename to w/m/templates/default-light/edit/sidebar.html/meta.json
diff --git a/w/m/Templates/default-light/main.css/1.css b/w/m/templates/default-light/main.css/1.css
similarity index 97%
rename from w/m/Templates/default-light/main.css/1.css
rename to w/m/templates/default-light/main.css/1.css
index e209dc8..4b9380e 100644
--- a/w/m/Templates/default-light/main.css/1.css
+++ b/w/m/templates/default-light/main.css/1.css
@@ -1,53 +1,53 @@
-*, *::before, *::after { box-sizing: border-box; }
-html { height: 100%; }
-body { font: 15px/1.5 'PT Sans', system-ui, sans-serif;
-	min-height: 100%; padding: 0; margin:0; }
-.msg { background-color: #f4f4f4; padding: 1rem; border-radius: 1rem; }
-a { color: #44e; } 
-a:visited { color: #44a; }
-header { margin: 0 2rem; }
-header * { display: inline; }
-header h1 { margin: 0; font-size: 1rem; }
-header a, header a:visited { color: black; text-decoration:none; }
-header a:active, header a:hover { color: #005f87; }
-
-h1, h2, h3, h4, h5, h6 { margin: 0.5em 0 0.25em; }
-.page { line-height: 1.666; max-width: 40rem; hyphens: auto; }
-.page img { max-width:100%; }
-.page pre { white-space: break-spaces; }
-.page__title { font-size: 2rem; margin: 0; }
-
-footer { padding: 1rem 0; font-size: .8rem; bottom: 0; position: absolute; }
-footer a, footer a:visited { color: black; }
-/* Sidebar section */
-.sidebar { padding: 1rem 0; background: #f4f4f4; }
-.sidebar div { margin-left: 1rem; }
-.sidebar-controller { font: inherit; padding: .25rem 1rem;
-font-size: 2rem; float: right; }
-
-.hypha-actions ul { margin: 0; padding: 0; }
-.hypha-actions li { list-style: none; }
-.hypha-actions a { display: block; padding: .25rem 1rem; font: inherit;
-text-decoration: none; color: black; }
-.hypha-actions a:hover { background: #eaeaea; }
-
-.navitree__node { padding-left: 2rem; }
-.navitree__entry { margin-bottom: .5rem; }
-.navitree__link, .navitree__link:visited { color:black; text-decoration:none; }
-.navitree__link:hover, .navitree__link:active { text-decoration:underline; }
-.navitree__ancestor { list-style: none; margin-left: -1rem; }
-.navitree__pagename a { font-weight: bold; }
-
-@media (max-width: 950px) {
-	.hidden_mobile { display: none; }
-	aside { height: 100%; }
-	main, footer, header { margin: 0 1rem; }
-	header, header * { display:inline; }
-	.edit-box__text { width: 100%; height: 70%; }
-}
-@media (min-width: 950px) {
-	.sidebar-controller { display: none; }
-	aside { float:right; width: 300px; padding: 0; }
-	main, footer { margin: 0 0 auto 2rem; }
-	.edit-box__text { min-width: 600px; height: 70%; }
-}
+*, *::before, *::after { box-sizing: border-box; }
+html { height: 100%; }
+body { font: 15px/1.5 'PT Sans', system-ui, sans-serif;
+	min-height: 100%; padding: 0; margin:0; }
+.msg { background-color: #f4f4f4; padding: 1rem; border-radius: 1rem; }
+a { color: #44e; } 
+a:visited { color: #44a; }
+header { margin: 0 2rem; }
+header * { display: inline; }
+header h1 { margin: 0; font-size: 1rem; }
+header a, header a:visited { color: black; text-decoration:none; }
+header a:active, header a:hover { color: #005f87; }
+
+h1, h2, h3, h4, h5, h6 { margin: 0.5em 0 0.25em; }
+.page { line-height: 1.666; max-width: 40rem; hyphens: auto; }
+.page img { max-width:100%; }
+.page pre { white-space: break-spaces; }
+.page__title { font-size: 2rem; margin: 0; }
+
+footer { padding: 1rem 0; font-size: .8rem; bottom: 0; position: absolute; }
+footer a, footer a:visited { color: black; }
+/* Sidebar section */
+.sidebar { padding: 1rem 0; background: #f4f4f4; }
+.sidebar div { margin-left: 1rem; }
+.sidebar-controller { font: inherit; padding: .25rem 1rem;
+font-size: 2rem; float: right; }
+
+.hypha-actions ul { margin: 0; padding: 0; }
+.hypha-actions li { list-style: none; }
+.hypha-actions a { display: block; padding: .25rem 1rem; font: inherit;
+text-decoration: none; color: black; }
+.hypha-actions a:hover { background: #eaeaea; }
+
+.navitree__node { padding-left: 2rem; }
+.navitree__entry { margin-bottom: .5rem; }
+.navitree__link, .navitree__link:visited { color:black; text-decoration:none; }
+.navitree__link:hover, .navitree__link:active { text-decoration:underline; }
+.navitree__ancestor { list-style: none; margin-left: -1rem; }
+.navitree__pagename a { font-weight: bold; }
+
+@media (max-width: 950px) {
+	.hidden_mobile { display: none; }
+	aside { height: 100%; }
+	main, footer, header { margin: 0 1rem; }
+	header, header * { display:inline; }
+	.edit-box__text { width: 100%; height: 70%; }
+}
+@media (min-width: 950px) {
+	.sidebar-controller { display: none; }
+	aside { float:right; width: 300px; padding: 0; }
+	main, footer { margin: 0 0 auto 2rem; }
+	.edit-box__text { min-width: 600px; height: 70%; }
+}
diff --git a/w/m/Templates/default-light/main.css/meta.json b/w/m/templates/default-light/main.css/meta.json
similarity index 100%
rename from w/m/Templates/default-light/main.css/meta.json
rename to w/m/templates/default-light/main.css/meta.json
diff --git a/w/m/Templates/default-light/main.js/1.mjs b/w/m/templates/default-light/main.js/1.mjs
similarity index 96%
rename from w/m/Templates/default-light/main.js/1.mjs
rename to w/m/templates/default-light/main.js/1.mjs
index 5f130ca..bf9b3a5 100644
--- a/w/m/Templates/default-light/main.js/1.mjs
+++ b/w/m/templates/default-light/main.js/1.mjs
@@ -1,11 +1,11 @@
-var isOpen = false
-var sidebar = document.getElementById('sidebar')
-var btn = document.getElementById('shroomburger')
-btn.addEventListener('click', function() {
-	if (isOpen) {
-		sidebar.classList.add('hidden_mobile')
-	} else {
-		sidebar.classList.remove('hidden_mobile')
-	}
-	isOpen = !isOpen
-})
+var isOpen = false
+var sidebar = document.getElementById('sidebar')
+var btn = document.getElementById('shroomburger')
+btn.addEventListener('click', function() {
+	if (isOpen) {
+		sidebar.classList.add('hidden_mobile')
+	} else {
+		sidebar.classList.remove('hidden_mobile')
+	}
+	isOpen = !isOpen
+})
diff --git a/w/m/Templates/default-light/main.js/meta.json b/w/m/templates/default-light/main.js/meta.json
similarity index 100%
rename from w/m/Templates/default-light/main.js/meta.json
rename to w/m/templates/default-light/main.js/meta.json
diff --git a/w/m/Templates/default-light/updateOk.html/1.html b/w/m/templates/default-light/update_ok.html/1.html
similarity index 94%
rename from w/m/Templates/default-light/updateOk.html/1.html
rename to w/m/templates/default-light/update_ok.html/1.html
index f4ddcde..f64067d 100644
--- a/w/m/Templates/default-light/updateOk.html/1.html
+++ b/w/m/templates/default-light/update_ok.html/1.html
@@ -1,8 +1,8 @@
-<html>
-	<head>
-		<title>Saved {{ .Name }}</title>
-	</head>
-	<body>
-		<p>Saved successfully. <a href="/{{ .Name }}">Go back</a></p>
-	</body>
-</html>
+<html>
+	<head>
+		<title>Saved {{ .Name }}</title>
+	</head>
+	<body>
+		<p>Saved successfully. <a href="/{{ .Name }}">Go back</a></p>
+	</body>
+</html>
diff --git a/w/m/Templates/default-light/updateOk.html/meta.json b/w/m/templates/default-light/update_ok.html/meta.json
similarity index 90%
rename from w/m/Templates/default-light/updateOk.html/meta.json
rename to w/m/templates/default-light/update_ok.html/meta.json
index 5662fd2..b1ac640 100644
--- a/w/m/Templates/default-light/updateOk.html/meta.json
+++ b/w/m/templates/default-light/update_ok.html/meta.json
@@ -4,7 +4,7 @@
 	"revisions": {
 		"1": {
 			"tags": null,
-			"name": "updateOk.html",
+			"name": "update_ok.html",
 			"comment": "Create Templates/default-light/updateOk.html",
 			"author": "",
 			"time": 1592996644,
@@ -14,4 +14,4 @@
 			"binary_name": ""
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/w/m/Templates/default-light/view/404.html/1.html b/w/m/templates/default-light/view/404.html/1.html
similarity index 100%
rename from w/m/Templates/default-light/view/404.html/1.html
rename to w/m/templates/default-light/view/404.html/1.html
diff --git a/w/m/Templates/default-light/view/404.html/meta.json b/w/m/templates/default-light/view/404.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/view/404.html/meta.json
rename to w/m/templates/default-light/view/404.html/meta.json
diff --git a/w/m/Templates/default-light/view/index.html/1.html b/w/m/templates/default-light/view/index.html/1.html
similarity index 100%
rename from w/m/Templates/default-light/view/index.html/1.html
rename to w/m/templates/default-light/view/index.html/1.html
diff --git a/w/m/Templates/default-light/view/index.html/meta.json b/w/m/templates/default-light/view/index.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/view/index.html/meta.json
rename to w/m/templates/default-light/view/index.html/meta.json
diff --git a/w/m/Templates/default-light/view/sidebar.html/1.html b/w/m/templates/default-light/view/sidebar.html/1.html
similarity index 78%
rename from w/m/Templates/default-light/view/sidebar.html/1.html
rename to w/m/templates/default-light/view/sidebar.html/1.html
index 7e361d4..b85536f 100644
--- a/w/m/Templates/default-light/view/sidebar.html/1.html
+++ b/w/m/templates/default-light/view/sidebar.html/1.html
@@ -1,7 +1,7 @@
 <div class="hypha-actions">
 	<ul>
 		<li><a href="?action=edit">Edit</a></li>
-		<li><a href="?action=getBinary">Download</a></li>
+		<li><a href="?action=binary">Download</a></li>
 		<li><a href="?action=zen">Zen mode</a></li>
 		<li><a href="?action=raw">View raw</a></li>
 	</ul>
diff --git a/w/m/Templates/default-light/view/sidebar.html/meta.json b/w/m/templates/default-light/view/sidebar.html/meta.json
similarity index 100%
rename from w/m/Templates/default-light/view/sidebar.html/meta.json
rename to w/m/templates/default-light/view/sidebar.html/meta.json
diff --git a/w/m/Templates/meta.json b/w/m/templates/meta.json
similarity index 100%
rename from w/m/Templates/meta.json
rename to w/m/templates/meta.json
diff --git a/w/m/TestMd/1.markdown b/w/m/testmd/1.markdown
similarity index 100%
rename from w/m/TestMd/1.markdown
rename to w/m/testmd/1.markdown
diff --git a/w/m/TestMd/meta.json b/w/m/testmd/meta.json
similarity index 100%
rename from w/m/TestMd/meta.json
rename to w/m/testmd/meta.json