Use newResource instead of the obsolete addResource.  Rename collections so we don't have stupid plurals.  Closes #1