2.2.2 Release

Restructures templates and moves HTML from the plugin files to templates.