Better module importing.

Closes #23