restructuring so it's easier to send updates to repo
new icons