Module to class

@seuros i'm fairly happy with this.

WDYT?