Reorganize views into subfolders and update the folderToHTML lib to reflect the change
Add blocks and note elements