Menu

Improves menu markup, improves naming and organisation
of the "functions" directory