Rename "Asterisk" to "Star"
Some rearranging