Convert to Module

Closes #1