Use classes for modules instead of just objects