update STYLE to conform to the Types/ reorganization
Merge pull request #578 from mikeshulman/stylereorg

update STYLE to conform to the Types/ reorganization