Fixing Data structure for handlebars
Cleaning up project for beta release