Upgraded many instance classes to use new comment/organization style