Improve comments slightly
Rename files and folders, add handlebars
Cleanup of old code