Lots of renaming, syntax changes, & addon grouping