Add observer.  rename package-local struct to lower case