Updated this sample from latest source.
Updated remainder of modules to use single, sectioned var block layout for top level vars.