Closes issue #22 by implementing module class suffix