Tweaks to sample code needed after module reorg moved classes