Tidy up and add Bootstrap
Re-organize a bit, tidy up somewhat, bump version