Modules imported properly (resolves #4)

Modules are now imported properly so that new objects get created with
less code.