Some updates to less structure, html files and grunt