Merge CM tree changes

Changes to use hw_get_module_by_class
Merge pull request #6 from Ultrax5/master

Merge CM tree changes