handlebars added and files cleaned up