make class a module.
Merge branch 'develop'