CMS-3918 Clean up module resource classes to simplify usage.