Moved dirs, some fixes, new "templates" page