Fixed problems with importing modules (final package should import fine now).